From d92e68045855fd44396a2239d877599179d40fbc Mon Sep 17 00:00:00 2001 From: ichi0915 Date: Fri, 5 Jan 2024 11:28:10 -0600 Subject: [PATCH] chore(spinnaker): Update version of spinnaker to deploy (#272) --- deploy/spinnaker/basic/spinnakerservice.yml | 2 +- deploy/spinnaker/complete/spinnakerservice.yml | 2 +- deploy/spinnaker/kustomize/config-patch.yml | 2 +- deploy/spinnaker/kustomize/spinnakerservice.yml | 2 +- doc/options.md | 6 +++--- integration_tests/integration_test.go | 2 +- .../testdata/spinnaker/base/spinnakerservice.yml | 2 +- .../testdata/spinnaker/overlay_duplicate/spinnaker2.yml | 2 +- .../testdata/spinnaker/overlay_upgrade/spinnakerservice.yml | 2 +- pkg/apis/spinnaker/interfaces/config_test.go | 5 +++-- pkg/controller/spinnakerservice/testdata/spinsvc.yml | 2 +- .../expose_ingress/testdata/spinsvc_expose_ingress.yml | 2 +- .../spindeploy/expose_service/testdata/spinsvc_expose.yml | 2 +- .../expose_service/testdata/spinsvc_expose_publicPort.yml | 2 +- .../spindeploy/expose_service/testdata/spinsvc_minimal.yml | 2 +- pkg/deploy/spindeploy/transformer/testdata/halconfig.yml | 2 +- .../spindeploy/transformer/testdata/spinsvc_expose.yml | 2 +- .../transformer/testdata/spinsvc_expose_ingress.yml | 2 +- .../spindeploy/transformer/testdata/spinsvc_minimal.yml | 2 +- .../spindeploy/transformer/testdata/spinsvc_profile.yml | 2 +- pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml | 2 +- pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml | 2 +- pkg/validate/testdata/spinvc_aws.yml | 2 +- 23 files changed, 27 insertions(+), 26 deletions(-) diff --git a/deploy/spinnaker/basic/spinnakerservice.yml b/deploy/spinnaker/basic/spinnakerservice.yml index a1725c8a..e0d74b59 100644 --- a/deploy/spinnaker/basic/spinnakerservice.yml +++ b/deploy/spinnaker/basic/spinnakerservice.yml @@ -5,7 +5,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.17.1 # the version of Spinnaker to be deployed + version: 1.28.1 # the version of Spinnaker to be deployed persistentStorage: persistentStoreType: s3 s3: diff --git a/deploy/spinnaker/complete/spinnakerservice.yml b/deploy/spinnaker/complete/spinnakerservice.yml index d3e64815..08034052 100644 --- a/deploy/spinnaker/complete/spinnakerservice.yml +++ b/deploy/spinnaker/complete/spinnakerservice.yml @@ -7,7 +7,7 @@ spec: spinnakerConfig: # spec.spinnakerConfig.config - This section contains the contents of a deployment found in a halconfig .deploymentConfigurations[0] config: - version: 1.17.1 # the version of Spinnaker to be deployed + version: 1.28.1 # the version of Spinnaker to be deployed persistentStorage: persistentStoreType: s3 s3: diff --git a/deploy/spinnaker/kustomize/config-patch.yml b/deploy/spinnaker/kustomize/config-patch.yml index a5832a33..c520593b 100644 --- a/deploy/spinnaker/kustomize/config-patch.yml +++ b/deploy/spinnaker/kustomize/config-patch.yml @@ -7,7 +7,7 @@ spec: spinnakerConfig: # spec.spinnakerConfig.config - This section contains the contents of a deployment found in a halconfig .deploymentConfigurations[0] config: - version: 1.17.1 # the version of Spinnaker to be deployed + version: 1.28.1 # the version of Spinnaker to be deployed persistentStorage: persistentStoreType: s3 s3: diff --git a/deploy/spinnaker/kustomize/spinnakerservice.yml b/deploy/spinnaker/kustomize/spinnakerservice.yml index a0d0a334..1e2d166b 100644 --- a/deploy/spinnaker/kustomize/spinnakerservice.yml +++ b/deploy/spinnaker/kustomize/spinnakerservice.yml @@ -7,7 +7,7 @@ spec: spinnakerConfig: # spec.spinnakerConfig.config - This section contains the contents of a deployment found in a halconfig .deploymentConfigurations[0] config: - version: 1.17.1 # the version of Spinnaker to be deployed + version: 1.28.1 # the version of Spinnaker to be deployed persistentStorage: persistentStoreType: s3 s3: diff --git a/doc/options.md b/doc/options.md index a13b0e2a..003eec60 100644 --- a/doc/options.md +++ b/doc/options.md @@ -12,7 +12,7 @@ spec: spinnakerConfig: # spec.spinnakerConfig.config - This section contains the contents of a deployment found in a halconfig .deploymentConfigurations[0]. config: - version: 1.17.1 # - The version of Spinnaker that gets deployed. + version: 1.28.1 # - The version of Spinnaker that gets deployed. persistentStorage: persistentStoreType: s3 s3: @@ -137,7 +137,7 @@ For instance, given the following: currentDeployment: default deploymentConfigurations: - name: default - version: 1.17.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: @@ -151,7 +151,7 @@ We get the following `spec.spinnakerConfig`: spec: spinnakerConfig: config: - version: 1.17.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/integration_tests/integration_test.go b/integration_tests/integration_test.go index 2c8c4af8..64fb4491 100644 --- a/integration_tests/integration_test.go +++ b/integration_tests/integration_test.go @@ -105,7 +105,7 @@ func KubernetesAndUpgradeOverlay(t *testing.T) { } time.Sleep(20 * time.Second) v = RunCommandAndAssert(fmt.Sprintf("%s -n %s get spinsvc %s -o=jsonpath='{.status.version}'", e.KubectlPrefix(), ns, SpinServiceName), t) - if t.Failed() || !assert.Equal(t, "1.17.1", strings.TrimSpace(v)) { + if t.Failed() || !assert.Equal(t, "1.28.1", strings.TrimSpace(v)) { return } LogMainStep(t, "Upgrade successful") diff --git a/integration_tests/testdata/spinnaker/base/spinnakerservice.yml b/integration_tests/testdata/spinnaker/base/spinnakerservice.yml index 3619323c..6d5ef689 100644 --- a/integration_tests/testdata/spinnaker/base/spinnakerservice.yml +++ b/integration_tests/testdata/spinnaker/base/spinnakerservice.yml @@ -5,7 +5,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.20.5 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/integration_tests/testdata/spinnaker/overlay_duplicate/spinnaker2.yml b/integration_tests/testdata/spinnaker/overlay_duplicate/spinnaker2.yml index a3c73b1a..d92117f9 100644 --- a/integration_tests/testdata/spinnaker/overlay_duplicate/spinnaker2.yml +++ b/integration_tests/testdata/spinnaker/overlay_duplicate/spinnaker2.yml @@ -5,4 +5,4 @@ metadata: spec: spinnakerConfig: config: - version: 1.17.0 + version: 1.28.1 diff --git a/integration_tests/testdata/spinnaker/overlay_upgrade/spinnakerservice.yml b/integration_tests/testdata/spinnaker/overlay_upgrade/spinnakerservice.yml index 6ea75b27..ba63be22 100644 --- a/integration_tests/testdata/spinnaker/overlay_upgrade/spinnakerservice.yml +++ b/integration_tests/testdata/spinnaker/overlay_upgrade/spinnakerservice.yml @@ -5,4 +5,4 @@ metadata: spec: spinnakerConfig: config: - version: 1.17.1 + version: 1.28.1 diff --git a/pkg/apis/spinnaker/interfaces/config_test.go b/pkg/apis/spinnaker/interfaces/config_test.go index dc0518f0..af760ed6 100644 --- a/pkg/apis/spinnaker/interfaces/config_test.go +++ b/pkg/apis/spinnaker/interfaces/config_test.go @@ -2,9 +2,10 @@ package interfaces import ( "context" + "testing" + "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - "testing" ) func TestGetHalconfigObjectArray(t *testing.T) { @@ -12,7 +13,7 @@ func TestGetHalconfigObjectArray(t *testing.T) { ctx := context.TODO() var c = ` name: default - version: 1.14.2 + version: 1.28.1 providers: kubernetes: accounts: diff --git a/pkg/controller/spinnakerservice/testdata/spinsvc.yml b/pkg/controller/spinnakerservice/testdata/spinsvc.yml index 97d6243d..17a5625d 100644 --- a/pkg/controller/spinnakerservice/testdata/spinsvc.yml +++ b/pkg/controller/spinnakerservice/testdata/spinsvc.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/expose_ingress/testdata/spinsvc_expose_ingress.yml b/pkg/deploy/spindeploy/expose_ingress/testdata/spinsvc_expose_ingress.yml index c2061e32..ba3185f3 100644 --- a/pkg/deploy/spindeploy/expose_ingress/testdata/spinsvc_expose_ingress.yml +++ b/pkg/deploy/spindeploy/expose_ingress/testdata/spinsvc_expose_ingress.yml @@ -6,6 +6,6 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 expose: type: ingress diff --git a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose.yml b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose.yml index a14c820c..a209bbf8 100644 --- a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose.yml +++ b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose_publicPort.yml b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose_publicPort.yml index beb04920..aa354117 100644 --- a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose_publicPort.yml +++ b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose_publicPort.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_minimal.yml b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_minimal.yml index 8ecdf2f9..cfc6c71b 100644 --- a/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_minimal.yml +++ b/pkg/deploy/spindeploy/expose_service/testdata/spinsvc_minimal.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/transformer/testdata/halconfig.yml b/pkg/deploy/spindeploy/transformer/testdata/halconfig.yml index ca839727..3cb2bd4f 100644 --- a/pkg/deploy/spindeploy/transformer/testdata/halconfig.yml +++ b/pkg/deploy/spindeploy/transformer/testdata/halconfig.yml @@ -1,5 +1,5 @@ name: default -version: 1.15.1 +version: 1.28.1 providers: appengine: enabled: false diff --git a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose.yml b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose.yml index beb04920..aa354117 100644 --- a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose.yml +++ b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose_ingress.yml b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose_ingress.yml index c2061e32..ba3185f3 100644 --- a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose_ingress.yml +++ b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose_ingress.yml @@ -6,6 +6,6 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 expose: type: ingress diff --git a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_minimal.yml b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_minimal.yml index 8ecdf2f9..cfc6c71b 100644 --- a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_minimal.yml +++ b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_minimal.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_profile.yml b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_profile.yml index 9bc905d3..290aadc8 100644 --- a/pkg/deploy/spindeploy/transformer/testdata/spinsvc_profile.yml +++ b/pkg/deploy/spindeploy/transformer/testdata/spinsvc_profile.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml b/pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml index beb04920..aa354117 100644 --- a/pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml +++ b/pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml b/pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml index 8ecdf2f9..cfc6c71b 100644 --- a/pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml +++ b/pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml @@ -6,7 +6,7 @@ metadata: spec: spinnakerConfig: config: - version: 1.15.1 + version: 1.28.1 persistentStorage: persistentStoreType: s3 s3: diff --git a/pkg/validate/testdata/spinvc_aws.yml b/pkg/validate/testdata/spinvc_aws.yml index 1d882d59..156f6041 100644 --- a/pkg/validate/testdata/spinvc_aws.yml +++ b/pkg/validate/testdata/spinvc_aws.yml @@ -9,7 +9,7 @@ spec: enabled: true spinnakerConfig: config: - version: 1.23.0 + version: 1.28.1 providers: aws: accounts: