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

apiserver: fix incorrect path to admission plugins config files #11779

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

VannTen
Copy link
Contributor

@VannTen VannTen commented Dec 10, 2024

What type of PR is this?
/kind bug

Which issue(s) this PR fixes:
Fixes #11733

Does this PR introduce a user-facing change?:

Fix usage of admission plugins configuration.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 10, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: VannTen

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

The pull request process is described 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

@VannTen
Copy link
Contributor Author

VannTen commented Dec 10, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. labels Dec 10, 2024
@VannTen
Copy link
Contributor Author

VannTen commented Dec 11, 2024

/cherrypick release-2.26
/cherrypick release-2.25
/cherrypick release-2.24

@k8s-infra-cherrypick-robot

@VannTen: once the present PR merges, I will cherry-pick it on top of release-2.24, release-2.25, release-2.26 in new PRs and assign them to you.

In response to this:

/cherrypick release-2.26
/cherrypick release-2.25
/cherrypick release-2.24

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.

@yankay
Copy link
Member

yankay commented Dec 16, 2024

Thanks @VannTen
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 16, 2024
@k8s-ci-robot k8s-ci-robot merged commit 742409e into kubernetes-sigs:master Dec 16, 2024
41 checks passed
@k8s-infra-cherrypick-robot

@VannTen: new pull request created: #11800

In response to this:

/cherrypick release-2.26
/cherrypick release-2.25
/cherrypick release-2.24

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-infra-cherrypick-robot

@VannTen: new pull request created: #11801

In response to this:

/cherrypick release-2.26
/cherrypick release-2.25
/cherrypick release-2.24

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-infra-cherrypick-robot

@VannTen: new pull request created: #11802

In response to this:

/cherrypick release-2.26
/cherrypick release-2.25
/cherrypick release-2.24

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.

@@ -4,6 +4,6 @@ plugins:
{% for plugin in kube_apiserver_enable_admission_plugins %}
{% if plugin in kube_apiserver_admission_plugins_needs_configuration %}
- name: {{ plugin }}
path: {{ kube_config_dir }}/{{ plugin | lower }}.yaml
path: {{ kube_config_dir }}/admission-controls/{{ item | lower }}.yaml.yaml
Copy link
Member

Choose a reason for hiding this comment

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

I think item is undefined, shouldn't that still be plugin? I'm not sure that .yaml.yaml was intentional either.

Also, did this path really need to be updated to fix anything? I believe the following extraVolumes mount configuration is configured in the kubeadm-config files for the admission-controls hostPath directory, which mounted the plugin files in {{ kube_config_dir }}/{{ plugin | lower }}.yaml within the kube-apiserver container before this PR was merged:

  - name: admission-control-configs
    hostPath: {{ kube_config_dir }}/admission-controls
    mountPath: {{ kube_config_dir }}
    readOnly: false
    pathType: DirectoryOrCreate

I think configuring {{ kube_config_dir }}/admission-controls/ is a worthwhile change, but the extraVolumes entry would also need to be updated for this to work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, you're perfectly right. I totally forgot that the control plane was in pods, when doing that, + the double extension is obviously wrong...

Should have added a reproducer first 😬

Copy link
Member

Choose a reason for hiding this comment

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

Thanks @chadswen

k8s-infra-cherrypick-robot pushed a commit to k8s-infra-cherrypick-robot/kubespray that referenced this pull request Dec 18, 2024
k8s-infra-cherrypick-robot pushed a commit to k8s-infra-cherrypick-robot/kubespray that referenced this pull request Dec 18, 2024
k8s-infra-cherrypick-robot pushed a commit to k8s-infra-cherrypick-robot/kubespray that referenced this pull request Dec 18, 2024
k8s-ci-robot pushed a commit that referenced this pull request Dec 18, 2024
k8s-ci-robot pushed a commit that referenced this pull request Dec 18, 2024
kpoxo6op pushed a commit to kpoxo6op/kubespray that referenced this pull request Dec 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong AdmissionConfiguration path in admission-controls.yaml.j2
5 participants