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

Conversation

ideapark
Copy link

@ideapark ideapark commented Jun 20, 2024

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

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>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 20, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @ideapark!

It looks like this is your first PR to kubernetes-sigs/secrets-store-csi-driver 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/secrets-store-csi-driver has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 20, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @ideapark. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ideapark
Once this PR has been reviewed and has the lgtm label, please assign aramase for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants