opendatahub-io / opendatahub-operator

Open Data Hub operator to manage ODH component integrations
https://opendatahub.io
Apache License 2.0
60 stars 139 forks source link

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

Closed zdtsw closed 2 months ago

zdtsw commented 2 months ago

Description

How Has This Been Tested?

Screenshot or short clip

Merge criteria

ykaliuta commented 2 months ago

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 commented 2 months ago

BTW, wondering how namespace and name works without it

zdtsw commented 2 months ago

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 commented 2 months ago

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 commented 2 months ago

Let's do it separately

openshift-ci[bot] commented 2 months ago

[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: - ~~[OWNERS](https://github.com/opendatahub-io/opendatahub-operator/blob/incubation/OWNERS)~~ [ykaliuta] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
zdtsw commented 2 months ago

/retest-required