Upgrade manifests kustomize v5

ray-project · Sep 25, 2024 · e4b1863 · e4b1863
1 parent 73e6c5d
commit e4b1863
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/apiserver/Makefile b/apiserver/Makefile
@@ -210,7 +210,7 @@ GOBINDATA ?= $(REPO_ROOT_BIN)/go-bindata
 
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v3.8.7
+KUSTOMIZE_VERSION ?= v5.4.3
 GOFUMPT_VERSION ?= v0.3.1
 GOIMPORTS_VERSION ?= v0.14.0
 GOLANGCI_LINT_VERSION ?= v1.54.1

diff --git a/apiserver/deploy/base/insecure/kustomization.yaml b/apiserver/deploy/base/insecure/kustomization.yaml
@@ -6,9 +6,10 @@ namespace: ray-system
 resources:
 - apiserver.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-apiserver
+labels:
+  - pairs:
+      app.kubernetes.io/name: kuberay
+      app.kubernetes.io/part-of: kuberay-apiserver
 images:
 - name: kuberay/apiserver
   newName: kuberay/apiserver

diff --git a/apiserver/deploy/base/secure/kustomization.yaml b/apiserver/deploy/base/secure/kustomization.yaml
@@ -6,9 +6,10 @@ namespace: ray-system
 resources:
 - apiserver.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-apiserver
+labels:
+  - pairs:
+      app.kubernetes.io/name: kuberay
+      app.kubernetes.io/part-of: kuberay-apiserver
 images:
 - name: kuberay/apiserver
   newName: kuberay/apiserver

diff --git a/apiserver/deploy/local/insecure/kustomization.yaml b/apiserver/deploy/local/insecure/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 resources:
 - ../../base/insecure
 namespace: ray-system
-patchesJson6902:
+patches:
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy

diff --git a/apiserver/deploy/local/secure/kustomization.yaml b/apiserver/deploy/local/secure/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 resources:
 - ../../base/secure
 namespace: ray-system
-patchesJson6902:
+patches:
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy

diff --git a/ray-operator/config/default-with-webhooks/kustomization.yaml b/ray-operator/config/default-with-webhooks/kustomization.yaml
@@ -9,7 +9,7 @@ namespace: ray-system
 #namePrefix: ray-operator-
 
 # Labels to add to all resources and selectors.
-#commonLabels:
+#labels:
 #  someName: someValue
 
 #- ../prometheus
@@ -19,9 +19,9 @@ images:
   newName: quay.io/kuberay/operator
   newTag: nightly
 
-patchesStrategicMerge:
-- manager_webhook_patch.yaml
-- webhookcainjection_patch.yaml
+patches:
+  - path: manager_webhook_patch.yaml
+  - path: webhookcainjection_patch.yaml
 
 replacements:
 - source:

diff --git a/ray-operator/config/default/kustomization.yaml b/ray-operator/config/default/kustomization.yaml
@@ -9,10 +9,10 @@ namespace: ray-system
 #namePrefix: ray-operator-
 
 # Labels to add to all resources and selectors.
-#commonLabels:
+#labels:
 #  someName: someValue
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager

diff --git a/ray-operator/config/manager/kustomization.yaml b/ray-operator/config/manager/kustomization.yaml
@@ -4,6 +4,7 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/component: kuberay-operator
-  app.kubernetes.io/name: kuberay
+labels:
+  - pairs:
+      app.kubernetes.io/name: kuberay-operator
+      app.kubernetes.io/part-of: kuberay
diff --git a/ray-operator/config/rbac/kustomization.yaml b/ray-operator/config/rbac/kustomization.yaml
@@ -5,6 +5,7 @@ resources:
 - leader_election_role_binding.yaml
 - service_account.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-operator
+labels:
+  - pairs:
+      app.kubernetes.io/name: kuberay
+      app.kubernetes.io/part-of: kuberay-operator