Skip to content

Commit

Permalink
fix: update chart with new maas api token name (#406)
Browse files Browse the repository at this point in the history
## Issue

## Description
In the process of updating the MAAS plugin to support inline auth, the
key for the API token was changed from `maasApiToken` to `apiToken`.
This PR updates the charts to support this.

Additionally some plugins have had recent releases, this bumps all their
versions in the charts to the latest.
  • Loading branch information
arturshadnik authored Aug 27, 2024
1 parent 5d13607 commit 4641279
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build
2 changes: 1 addition & 1 deletion chart/validator/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chart/validator/templates/plugin-secret-maas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ kind: Secret
metadata:
name: {{ required ".Values.pluginSecrets.maas.secretName is required!" .Values.pluginSecrets.maas.secretName }}
stringData:
{{ required ".Values.pluginSecrets.maas.tokenKey is required!" .Values.pluginSecrets.maas.tokenKey }}: {{ required ".Values.pluginSecrets.maas.maasApiToken is required!" .Values.pluginSecrets.maas.maasApiToken | quote }}
{{ required ".Values.pluginSecrets.maas.tokenKey is required!" .Values.pluginSecrets.maas.tokenKey }}: {{ required ".Values.pluginSecrets.maas.apiToken is required!" .Values.pluginSecrets.maas.apiToken | quote }}
{{- end }}
26 changes: 13 additions & 13 deletions chart/validator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ pluginSecrets:
#
maas: {} # Don't forget to delete these curly braces if you're specifying credentials here!
# secretName: maas-creds # ensure this matches the MAAS plugin values below
# maasApiToken: ""
# apiToken: ""
# tokenKey: MAAS_API_KEY

network:
Expand Down Expand Up @@ -216,7 +216,7 @@ plugins:
- chart:
name: validator-plugin-azure
repository: validator-plugin-azure
version: v0.0.18
version: v0.0.20
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -251,7 +251,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-azure
tag: v0.0.18
tag: v0.0.20
resources:
limits:
cpu: 500m
Expand Down Expand Up @@ -288,7 +288,7 @@ plugins:
- chart:
name: validator-plugin-oci
repository: validator-plugin-oci
version: v0.3.1
version: v0.3.2
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -323,7 +323,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-oci
tag: v0.3.1
tag: v0.3.2
resources:
limits:
cpu: 500m
Expand Down Expand Up @@ -410,7 +410,7 @@ plugins:
- chart:
name: validator-plugin-aws
repository: validator-plugin-aws
version: v0.1.6
version: v0.1.7
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -445,7 +445,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-aws
tag: v0.1.6
tag: v0.1.7
resources:
limits:
cpu: 500m
Expand All @@ -471,7 +471,7 @@ plugins:
- chart:
name: validator-plugin-network
repository: validator-plugin-network
version: v0.0.25
version: v0.0.26
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -508,7 +508,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-network
tag: v0.0.25
tag: v0.0.26
resources:
limits:
cpu: 500m
Expand All @@ -530,7 +530,7 @@ plugins:
- chart:
name: validator-plugin-maas
repository: validator-plugin-maas
version: v0.0.10
version: v0.0.12
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -565,7 +565,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-maas
tag: v0.0.10
tag: v0.0.12
resources:
limits:
cpu: 500m
Expand All @@ -587,7 +587,7 @@ plugins:
- chart:
name: validator-plugin-vsphere
repository: validator-plugin-vsphere
version: v0.0.33
version: v0.0.34
values: |-
controllerManager:
kubeRbacProxy:
Expand Down Expand Up @@ -623,7 +623,7 @@ plugins:
- ALL
image:
repository: quay.io/validator-labs/validator-plugin-vsphere
tag: v0.0.33
tag: v0.0.34
resources:
limits:
cpu: 500m
Expand Down
2 changes: 1 addition & 1 deletion hack/chart/values-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ pluginSecrets:
#
maas: {} # Don't forget to delete these curly braces if you're specifying credentials here!
# secretName: maas-creds # ensure this matches the MAAS plugin values below
# maasApiToken: ""
# apiToken: ""
# tokenKey: MAAS_API_KEY

network:
Expand Down
24 changes: 12 additions & 12 deletions hauler-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ metadata:
spec:
images:
- name: quay.io/validator-labs/validator:v0.1.8 # x-release-please-version
- name: quay.io/validator-labs/validator-plugin-aws:v0.1.6
- name: quay.io/validator-labs/validator-plugin-azure:v0.0.18
- name: quay.io/validator-labs/validator-plugin-aws:v0.1.7
- name: quay.io/validator-labs/validator-plugin-azure:v0.0.20
- name: quay.io/validator-labs/validator-plugin-kubescape:v0.0.4
- name: quay.io/validator-labs/validator-plugin-maas:v0.0.10
- name: quay.io/validator-labs/validator-plugin-network:v0.0.25
- name: quay.io/validator-labs/validator-plugin-oci:v0.3.1
- name: quay.io/validator-labs/validator-plugin-vsphere:v0.0.33
- name: quay.io/validator-labs/validator-plugin-maas:v0.0.12
- name: quay.io/validator-labs/validator-plugin-network:v0.0.26
- name: quay.io/validator-labs/validator-plugin-oci:v0.3.2
- name: quay.io/validator-labs/validator-plugin-vsphere:v0.0.34
- name: quay.io/validator-labs/validator-certs-init:1.0.0
- name: gcr.io/spectro-images-public/release/spectro-cleanup:1.2.0
- name: kindest/node:v1.30.2
Expand All @@ -30,25 +30,25 @@ spec:
version: 0.1.8 # x-release-please-version
- name: validator-plugin-aws
repoURL: https://validator-labs.github.io/validator-plugin-aws
version: 0.1.6
version: 0.1.7
- name: validator-plugin-azure
repoURL: https://validator-labs.github.io/validator-plugin-azure
version: 0.0.18
version: 0.0.20
- name: validator-plugin-kubescape
repoURL: https://validator-labs.github.io/validator-plugin-kubescape
version: 0.0.4
- name: validator-plugin-maas
repoURL: https://validator-labs.github.io/validator-plugin-maas
version: 0.0.10
version: 0.0.12
- name: validator-plugin-network
repoURL: https://validator-labs.github.io/validator-plugin-network
version: 0.0.25
version: 0.0.26
- name: validator-plugin-oci
repoURL: https://validator-labs.github.io/validator-plugin-oci
version: 0.3.1
version: 0.3.2
- name: validator-plugin-vsphere
repoURL: https://validator-labs.github.io/validator-plugin-vsphere
version: 0.0.33
version: 0.0.34
---
apiVersion: content.hauler.cattle.io/v1alpha1
kind: Files
Expand Down

0 comments on commit 4641279

Please sign in to comment.