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.

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

Charts: Fix imagePullSecrets #1560

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Commits on Jun 20, 2024

  1. Charts: Fix imagePullSecrets

    This PR fixes `imagePullSecrets` rendering did not work as expected,
    the diff between the bug revision and the fixed revision is shown
    below:
    
    diff -y bad.yml good.yml (with some identical sections removed for simplicity)
    
    ---									---
    kind: DaemonSet								kind: DaemonSet
    apiVersion: apps/v1							apiVersion: apps/v1
    spec:									spec:
      template:								  template:
        spec:								    spec:
          serviceAccountName: secrets-store-csi-driver			      serviceAccountName: secrets-store-csi-driver
          imagePullSecrets:							      imagePullSecrets:
                    - ps1						|               - name: ps1
          affinity:								      affinity:
            nodeAffinity:							        nodeAffinity:
              requiredDuringSchedulingIgnoredDuringExecution:		          requiredDuringSchedulingIgnoredDuringExecution:
                nodeSelectorTerms:						            nodeSelectorTerms:
                - matchExpressions:						            - matchExpressions:
                  - key: type						              - key: type
                    operator: NotIn						                operator: NotIn
                    values:							                values:
                    - virtual-kubelet					                - virtual-kubelet
    ---									---
    apiVersion: batch/v1							apiVersion: batch/v1
    kind: Job								kind: Job
    spec:									spec:
      template:								  template:
        spec:								    spec:
          serviceAccountName: release-name-secrets-store-csi-		      serviceAccountName: release-name-secrets-store-csi-
          imagePullSecrets:							      imagePullSecrets:
          - ps1							|               - name: ps1
          restartPolicy: Never						      restartPolicy: Never
          containers:							      containers:
          - name: crds-upgrade						      - name: crds-upgrade
            image: "hiltoncn-registry-vpc.cn-shanghai.cr.aliy		        image: "hiltoncn-registry-vpc.cn-shanghai.cr.aliy
            args:								        args:
            - apply								        - apply
            - -f								        - -f
            - crds/								        - crds/
            imagePullPolicy: IfNotPresent					        imagePullPolicy: IfNotPresent
          nodeSelector:							      nodeSelector:
            kubernetes.io/os: linux						        kubernetes.io/os: linux
          tolerations:							      tolerations:
            - operator: Exists						        - operator: Exists
    ---									---
    apiVersion: batch/v1							apiVersion: batch/v1
    kind: Job								kind: Job
    spec:									spec:
      template:								  template:
        spec:								    spec:
          serviceAccountName: release-name-secrets-store-csi-		      serviceAccountName: release-name-secrets-store-csi-
          imagePullSecrets:							      imagePullSecrets:
          - ps1							|               - name: ps1
          restartPolicy: Never						      restartPolicy: Never
          nodeSelector:							      nodeSelector:
            kubernetes.io/os: linux						        kubernetes.io/os: linux
          tolerations:							      tolerations:
            - operator: Exists						        - operator: Exists
    
    The fixup is a port from hashicorp/vault helm charts when I'm setting
    up csi driver with vault provider. The hashicorp/vault charts work
    well, but csi driver charts works bad. So it's quite obvious that the
    fixup is out there.
    
    hashicorp/vault-helm@64b4d88
    
    Signed-off-by: Park Zhou <ideapark@petalmail.com>
    ideapark committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    96abcfa View commit details
    Browse the repository at this point in the history