chore(spinnaker): Update version of spinnaker to deploy (#272)

armory · Jan 5, 2024 · d92e680 · d92e680
1 parent 289b760
commit d92e680
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,17 +2,18 @@ package interfaces
 
 import (
 	"context"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
-	"testing"
 )
 
 func TestGetHalconfigObjectArray(t *testing.T) {
 	hc := map[string]interface{}{}
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,7 @@ spec:
         enabled: true
   spinnakerConfig:
     config:
-      version: 1.23.0
+      version: 1.28.1
       providers:
         aws:
           accounts: