Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/spinnaker] update spinnaker dependencies #20917

Merged
merged 6 commits into from
Mar 13, 2020
Merged

[stable/spinnaker] update spinnaker dependencies #20917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e64861c
[stable/spinnaker] update spinnaker dependencies
Feb 20, 2020
9cca2e1
Fix requirements.lock CI error
Feb 20, 2020
e6cc929
Update Minio default values
Feb 21, 2020
83b4bdc
bump version to 2.0.0-rc1
paulczar Mar 13, 2020
e974c14
update spinnaker version to latest patch release
paulczar Mar 13, 2020
2b3dcb0
update halyard config for minio bucket changes
paulczar Mar 13, 2020
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 stable/spinnaker/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
name: spinnaker
version: 1.23.3
version: 2.0.0-rc1
appVersion: 1.16.2
home: http://spinnaker.io/
sources:
Expand Down
8 changes: 4 additions & 4 deletions stable/spinnaker/requirements.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: redis
repository: https://kubernetes-charts.storage.googleapis.com/
version: 3.8.0
version: 10.5.3
- name: minio
repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.6.3
digest: sha256:bccb7348a48817b0c0c654dfecd2f399a64a50b0f677b483a27a76f4ff7ddd89
generated: 2019-01-21T21:59:54.069291+05:30
version: 5.0.9
digest: sha256:106d25a8f1fb7a20ce2e7289bc150dca8c23a45d1e63b27df5b21bd8a6d642bd
generated: "2020-02-20T14:53:08.2196-05:00"
4 changes: 2 additions & 2 deletions stable/spinnaker/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: redis
version: 3.8.0
version: 10.5.3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a massive chart change, did you address the possibility of any core changes in the redis chart? There might have been some variables moved round.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the default in values.yaml (which is all I'm using) the redis service/pod deploys without issue.

repository: https://kubernetes-charts.storage.googleapis.com/
condition: redis.enabled
- name: minio
version: 1.6.3
version: 5.0.9
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a massive chart change, did you address the possibility of any core changes in the mini chart? There might have been some variables moved round.

Copy link
Contributor Author

@rrijkse rrijkse Feb 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your right I had Minio disabled and it does not deploy (I had it turned off on mine). I committed new defaults that worked in a test environment.

Copy link
Contributor Author

@rrijkse rrijkse Feb 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wanted to add: This is the reason I bumped the minor version number of the chart instead of the patch version, this may require a major version bump depending on what your thoughts are. People will have to update their Minio settings and possibly their Redis settings.

repository: https://kubernetes-charts.storage.googleapis.com/
condition: minio.enabled
2 changes: 1 addition & 1 deletion stable/spinnaker/templates/configmap/halyard-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ data:
echo {{ .Values.minio.secretKey }} | $HAL_COMMAND config storage s3 edit \
--endpoint http://{{ .Release.Name }}-minio:9000 \
--access-key-id {{ .Values.minio.accessKey }} \
--secret-access-key --bucket {{ .Values.minio.bucket }} \
--secret-access-key --bucket {{ .Values.minio.defaultBucket.name }} \
--path-style-access true
$HAL_COMMAND config storage edit --type s3
{{ end }}
Expand Down
13 changes: 8 additions & 5 deletions stable/spinnaker/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
halyard:
spinnakerVersion: 1.16.1
spinnakerVersion: 1.16.7
image:
repository: gcr.io/spinnaker-marketplace/halyard
tag: 1.23.2
tag: 1.31.1
pullSecrets: []
# Set to false to disable persistence data volume for halyard
persistence:
Expand Down Expand Up @@ -257,11 +257,14 @@ redis:
minio:
enabled: true
image:
tag: RELEASE.2018-08-25T01-56-38Z
serviceType: ClusterIP
tag: RELEASE.2020-01-03T19-12-21Z
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the tag and service type configs have defaults in the upstream bitnami chart. Do we need these overridden?

service:
type: ClusterIP
accessKey: spinnakeradmin
secretKey: spinnakeradmin
bucket: "spinnaker"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You still need the bucket, otherwise you'll have to change templates/configmap/halyard-configyaml to read from the default bucket name. Also, I think the latest value syntax is defaultBuckets: "spinnaker", not a map. Per https://github.com/bitnami/charts/blob/master/bitnami/minio/values.yaml#L160

defaultBucket:
enabled: true
name: "spinnaker"
nodeSelector: {}
# Uncomment if you don't want to create a PVC for minio
# persistence:
Expand Down