Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(spinnaker): Update version of spinnaker #272

Merged
merged 1 commit into from
Jan 5, 2024
Merged

chore(spinnaker): Update version of spinnaker #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/spinnaker/basic/spinnakerservice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/spinnaker/complete/spinnakerservice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/spinnaker/kustomize/config-patch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/spinnaker/kustomize/spinnakerservice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions doc/options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/testdata/spinnaker/base/spinnakerservice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.20.5
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/testdata/spinnaker/overlay_duplicate/spinnaker2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.17.0
version: 1.28.1
2 changes: 1 addition & 1 deletion integration_tests/testdata/spinnaker/overlay_upgrade/spinnakerservice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.17.1
version: 1.28.1
5 changes: 3 additions & 2 deletions pkg/apis/spinnaker/interfaces/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/spinnakerservice/testdata/spinsvc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/expose_ingress/testdata/spinsvc_expose_ingress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
expose:
type: ingress
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/expose_service/testdata/spinsvc_expose_publicPort.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/expose_service/testdata/spinsvc_minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/transformer/testdata/halconfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: default
version: 1.15.1
version: 1.28.1
providers:
appengine:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/transformer/testdata/spinsvc_expose_ingress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
expose:
type: ingress
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/transformer/testdata/spinsvc_minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/transformer/testdata/spinsvc_profile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/x509/testdata/spinsvc_expose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/spindeploy/x509/testdata/spinsvc_minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
spinnakerConfig:
config:
version: 1.15.1
version: 1.28.1
persistentStorage:
persistentStoreType: s3
s3:
Expand Down
2 changes: 1 addition & 1 deletion pkg/validate/testdata/spinvc_aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
enabled: true
spinnakerConfig:
config:
version: 1.23.0
version: 1.28.1
providers:
aws:
accounts:
Expand Down
Loading