소스 검색

[bitnami/ghost] fix: :lock: Move service-account token auto-mount to pod declaration (#22402)

* [bitnami/ghost] fix: :lock: Move service-account token auto-mount to pod declaration

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

* test: :white_check_mark: Update goss test to reflect new value

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

* test: :white_check_mark: Update goss test to reflect new value

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

* fix: :rewind: Undo changes in fluent-bit

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

---------

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>
Javier J. Salmerón-García 1 년 전
부모
커밋
f6306884b8
6개의 변경된 파일8개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      .vib/ghost/goss/goss.yaml
  2. 1 1
      .vib/ghost/runtime-parameters.yaml
  3. 1 1
      bitnami/ghost/Chart.yaml
  4. 1 0
      bitnami/ghost/README.md
  5. 1 0
      bitnami/ghost/templates/deployment.yaml
  6. 3 0
      bitnami/ghost/values.yaml

+ 1 - 1
.vib/ghost/goss/goss.yaml

@@ -19,7 +19,7 @@ command:
     # or the one randomly defined by openshift (larger values). Otherwise, the chart is still using the default value.
     exec: if [ $(id -u) -lt {{ $uid }} ] || [ $(id -G | awk '{print $2}') -lt {{ $gid }} ]; then exit 1; fi
     exit-status: 0
-  {{ if .Vars.serviceAccount.automountServiceAccountToken }}
+  {{ if .Vars.automountServiceAccountToken }}
   check-sa:
     exec: cat /var/run/secrets/kubernetes.io/serviceaccount/token | cut -d '.' -f 2 | xargs -I '{}' echo '{}====' | fold -w 4 | sed '$ d' | tr -d '\n' | base64 -d
     exit-status: 0

+ 1 - 1
.vib/ghost/runtime-parameters.yaml

@@ -23,4 +23,4 @@ mysql:
     password: bitnami_test_password
 serviceAccount:
   create: true
-  automountServiceAccountToken: true
+automountServiceAccountToken: true

+ 1 - 1
bitnami/ghost/Chart.yaml

@@ -40,4 +40,4 @@ maintainers:
 name: ghost
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/ghost
-version: 19.7.2
+version: 19.8.0

+ 1 - 0
bitnami/ghost/README.md

@@ -127,6 +127,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `priorityClassName`                                 | Ghost pod priority class name                                                             | `""`             |
 | `schedulerName`                                     | Name of the k8s scheduler (other than default)                                            | `""`             |
 | `topologySpreadConstraints`                         | Topology Spread Constraints for pod assignment                                            | `[]`             |
+| `automountServiceAccountToken`                      | Mount Service Account token in pod                                                        | `false`          |
 | `hostAliases`                                       | Ghost pod host aliases                                                                    | `[]`             |
 | `extraVolumes`                                      | Optionally specify extra list of additional volumes for Ghost pods                        | `[]`             |
 | `extraVolumeMounts`                                 | Optionally specify extra list of additional volumeMounts for Ghost container(s)           | `[]`             |

+ 1 - 0
bitnami/ghost/templates/deployment.yaml

@@ -33,6 +33,7 @@ spec:
         {{- end }}
     spec:
       {{- include "ghost.imagePullSecrets" . | nindent 6 }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}

+ 3 - 0
bitnami/ghost/values.yaml

@@ -199,6 +199,9 @@ schedulerName: ""
 ## The value is evaluated as a template
 ##
 topologySpreadConstraints: []
+## @param automountServiceAccountToken Mount Service Account token in pod
+##
+automountServiceAccountToken: false
 ## @param hostAliases Ghost pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##