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

chore: uplift kustomize version for match the one from kyaml #1158

Merged

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Aug 8, 2024

  • this kustomize is internal used for Operator to generate manifests and bundle
  • this would help if we want to local debug component manifests since some are already generated by v5
  • it does not mean we have converted all component manifests to v5 for Operator image to run with

Description

How Has This Been Tested?

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

- this kustomize is internal used for Operator to generate manifests and bundle
- it does not mean we have converted all component manifests to v5

Signed-off-by: Wen Zhou <[email protected]>
@ykaliuta
Copy link
Contributor

ykaliuta commented Aug 8, 2024

Probably autogenerated webhook kustomization should be adjusted as well,

diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml
index 8428859f524d..2bdf5ab1af40 100644
--- a/config/webhook/kustomization.yaml
+++ b/config/webhook/kustomization.yaml
@@ -5,5 +5,3 @@ resources:
 commonAnnotations:
   service.beta.openshift.io/inject-cabundle: "true"
 
-configurations:
-- kustomizeconfig.yaml
diff --git a/config/webhook/kustomizeconfig.yaml b/config/webhook/kustomizeconfig.yaml
deleted file mode 100644
index 25e21e3c963f..000000000000
--- a/config/webhook/kustomizeconfig.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# the following config is for teaching kustomize where to look at when substituting vars.
-# It requires kustomize v2.1.0 or newer to work properly.
-nameReference:
-- kind: Service
-  version: v1
-  fieldSpecs:
-  - kind: MutatingWebhookConfiguration
-    group: admissionregistration.k8s.io
-    path: webhooks/clientConfig/service/name
-  - kind: ValidatingWebhookConfiguration
-    group: admissionregistration.k8s.io
-    path: webhooks/clientConfig/service/name
-
-namespace:
-- kind: MutatingWebhookConfiguration
-  group: admissionregistration.k8s.io
-  path: webhooks/clientConfig/service/namespace
-  create: true
-- kind: ValidatingWebhookConfiguration
-  group: admissionregistration.k8s.io
-  path: webhooks/clientConfig/service/namespace
-  create: true
-
-varReference:
-- path: metadata/annotations

@ykaliuta
Copy link
Contributor

ykaliuta commented Aug 8, 2024

BTW, wondering how namespace and name works without it

@zdtsw
Copy link
Member Author

zdtsw commented Aug 8, 2024

diff --git a/config/webhook/kustomizeconfig.yaml b/config/webhook/kustomizeconfig.yaml

not sure i understand this "diff" part: where the changes come from?

@ykaliuta
Copy link
Contributor

ykaliuta commented Aug 8, 2024

diff --git a/config/webhook/kustomizeconfig.yaml b/config/webhook/kustomizeconfig.yaml

not sure i understand this "diff" part: where the changes come from?

I removed the file and run git diff. But may be just varReference, since it is related to obsoleted vars should be removed. About nameReference and namespace I should check more carefully.

@ykaliuta
Copy link
Contributor

ykaliuta commented Aug 8, 2024

Let's do it separately

Copy link

openshift-ci bot commented Aug 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ykaliuta

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

@openshift-ci openshift-ci bot added the approved label Aug 8, 2024
@zdtsw
Copy link
Member Author

zdtsw commented Aug 8, 2024

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit 42f5323 into opendatahub-io:incubation Aug 8, 2024
8 checks passed
zdtsw added a commit to zdtsw-forking/rhods-operator that referenced this pull request Aug 15, 2024
…ahub-io#1158)

- this kustomize is internal used for Operator to generate manifests and bundle
- it does not mean we have converted all component manifests to v5

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 42f5323)
openshift-merge-bot bot pushed a commit to red-hat-data-services/rhods-operator that referenced this pull request Aug 16, 2024
…ahub-io#1158)

- this kustomize is internal used for Operator to generate manifests and bundle
- it does not mean we have converted all component manifests to v5

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 42f5323)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants