Skip to content

Commit 6cb7029

Browse files
authored
bump rukpak to v0.16.0 (#555)
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
1 parent b13e55c commit 6cb7029

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/operator-framework/catalogd v0.10.0
1111
github.com/operator-framework/deppy v0.1.0
1212
github.com/operator-framework/operator-registry v1.32.0
13-
github.com/operator-framework/rukpak v0.15.0
13+
github.com/operator-framework/rukpak v0.16.0
1414
github.com/spf13/pflag v1.0.5
1515
github.com/stretchr/testify v1.8.4
1616
go.uber.org/zap v1.26.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,8 @@ github.com/operator-framework/deppy v0.1.0 h1:Kj6SgSSMsPTbiWObYe7P1JPsW6CWkuVc+3
694694
github.com/operator-framework/deppy v0.1.0/go.mod h1:3blHej0Hj0M17Ru2q3QrhN9OwB5/MMmFkWUmiInqs6A=
695695
github.com/operator-framework/operator-registry v1.32.0 h1:RNazXYt3vBf5FZ+JrNNjq4bNh3tDwlkwZJnC+kmCeKk=
696696
github.com/operator-framework/operator-registry v1.32.0/go.mod h1:89VshAf6+n0V12vdh43+WOi8i1+XpY+kg6Ao4JO0y6k=
697-
github.com/operator-framework/rukpak v0.15.0 h1:NRByKr3NgtuehLbw1TLEygszSQhruVUcg9/vgFou6hM=
698-
github.com/operator-framework/rukpak v0.15.0/go.mod h1:v3dlRs4NG8cMht5X5shsCDlljVwjl7LX8uWrh53rsUc=
697+
github.com/operator-framework/rukpak v0.16.0 h1:d6iI7lYJbR5fHqw3vnAudB5SevAQ2dnQI7C6iOZyXJU=
698+
github.com/operator-framework/rukpak v0.16.0/go.mod h1:k3Nbp5eGqTI+QvXgPuOWOSV24AJ6waPDPzD+AH5OyDA=
699699
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
700700
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
701701
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=

internal/controllers/operator_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func TestOperatorBundleDeploymentOutOfDate(t *testing.T) {
213213
},
214214
Spec: rukpakv1alpha1.BundleDeploymentSpec{
215215
ProvisionerClassName: "core-rukpak-io-plain",
216-
Template: &rukpakv1alpha1.BundleTemplate{
216+
Template: rukpakv1alpha1.BundleTemplate{
217217
Spec: rukpakv1alpha1.BundleSpec{
218218
ProvisionerClassName: "core-rukpak-io-registry",
219219
Source: rukpakv1alpha1.BundleSource{
@@ -304,7 +304,7 @@ func TestOperatorBundleDeploymentUpToDate(t *testing.T) {
304304
},
305305
Spec: rukpakv1alpha1.BundleDeploymentSpec{
306306
ProvisionerClassName: "core-rukpak-io-plain",
307-
Template: &rukpakv1alpha1.BundleTemplate{
307+
Template: rukpakv1alpha1.BundleTemplate{
308308
Spec: rukpakv1alpha1.BundleSpec{
309309
ProvisionerClassName: "core-rukpak-io-registry",
310310
Source: rukpakv1alpha1.BundleSource{
@@ -566,7 +566,7 @@ func TestOperatorExpectedBundleDeployment(t *testing.T) {
566566
ObjectMeta: metav1.ObjectMeta{Name: opKey.Name},
567567
Spec: rukpakv1alpha1.BundleDeploymentSpec{
568568
ProvisionerClassName: "foo",
569-
Template: &rukpakv1alpha1.BundleTemplate{
569+
Template: rukpakv1alpha1.BundleTemplate{
570570
Spec: rukpakv1alpha1.BundleSpec{
571571
ProvisionerClassName: "bar",
572572
Source: rukpakv1alpha1.BundleSource{

internal/controllers/variable_source_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestVariableSource(t *testing.T) {
8989
},
9090
Spec: rukpakv1alpha1.BundleDeploymentSpec{
9191
ProvisionerClassName: "core-rukpak-io-plain",
92-
Template: &rukpakv1alpha1.BundleTemplate{
92+
Template: rukpakv1alpha1.BundleTemplate{
9393
Spec: rukpakv1alpha1.BundleSpec{
9494
ProvisionerClassName: "core-rukpak-io-registry",
9595
Source: rukpakv1alpha1.BundleSource{

internal/resolution/variablesources/fake_object_utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func fakeBundleDeployment(name, bundleImage string, owner *operatorsv1alpha1.Ope
3333
},
3434
Spec: rukpakv1alpha1.BundleDeploymentSpec{
3535
ProvisionerClassName: "core-rukpak-io-plain",
36-
Template: &rukpakv1alpha1.BundleTemplate{
36+
Template: rukpakv1alpha1.BundleTemplate{
3737
Spec: rukpakv1alpha1.BundleSpec{
3838
ProvisionerClassName: "core-rukpak-io-plain",
3939
Source: rukpakv1alpha1.BundleSource{

internal/resolution/variablesources/installed_package.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ func MakeInstalledPackageVariables(
4848
continue
4949
}
5050

51-
if bundleDeployment.Spec.Template == nil {
52-
continue
53-
}
5451
sourceImage := bundleDeployment.Spec.Template.Spec.Source.Image
5552
if sourceImage == nil || sourceImage.Ref == "" {
5653
continue

0 commit comments

Comments
 (0)