Upgrade manifests kustomize v5

ray-project · Oct 15, 2024 · 261628d · 261628d
1 parent 73e6c5d
commit 261628d
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 35 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,10 +6,12 @@ namespace: ray-system
 resources:
 - apiserver.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-apiserver
 images:
 - name: kuberay/apiserver
   newName: kuberay/apiserver
   newTag: nightly
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kuberay-apiserver
+    app.kubernetes.io/name: kuberay
diff --git a/apiserver/deploy/base/secure/kustomization.yaml b/apiserver/deploy/base/secure/kustomization.yaml
@@ -6,13 +6,15 @@ namespace: ray-system
 resources:
 - apiserver.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-apiserver
 images:
 - name: kuberay/apiserver
   newName: kuberay/apiserver
   newTag: nightly
 - name: kuberay/security-proxy
   newName: kuberay/security-proxy
   newTag: nightly
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kuberay-apiserver
+    app.kubernetes.io/name: kuberay
diff --git a/apiserver/deploy/local/insecure/kustomization.yaml b/apiserver/deploy/local/insecure/kustomization.yaml
@@ -3,7 +3,11 @@ kind: Kustomization
 resources:
 - ../../base/insecure
 namespace: ray-system
-patchesJson6902:
+images:
+- name: kuberay/apiserver
+  newName: quay.io/kuberay/apiserver
+  newTag: latest
+patches:
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy
@@ -12,7 +16,3 @@ patchesJson6902:
     kind: Deployment
     name: kuberay-apiserver
     version: v1
-images:
-- name: kuberay/apiserver
-  newName: quay.io/kuberay/apiserver
-  newTag: latest
diff --git a/apiserver/deploy/local/secure/kustomization.yaml b/apiserver/deploy/local/secure/kustomization.yaml
@@ -3,7 +3,14 @@ kind: Kustomization
 resources:
 - ../../base/secure
 namespace: ray-system
-patchesJson6902:
+images:
+- name: kuberay/apiserver
+  newName: kuberay/apiserver
+  newTag: latest
+- name: kuberay/security-proxy
+  newName: kuberay/security-proxy
+  newTag: latest
+patches:
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy
@@ -15,10 +22,3 @@ patchesJson6902:
     kind: Deployment
     name: kuberay-apiserver
     version: v1
-images:
-- name: kuberay/apiserver
-  newName: kuberay/apiserver
-  newTag: latest
-- name: kuberay/security-proxy
-  newName: kuberay/security-proxy
-  newTag: latest
diff --git a/ray-operator/config/certmanager/kustomization.yaml b/ray-operator/config/certmanager/kustomization.yaml
@@ -3,3 +3,5 @@ resources:
 
 configurations:
 - kustomizeconfig.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/ray-operator/config/crd/kustomization.yaml b/ray-operator/config/crd/kustomization.yaml
@@ -5,4 +5,5 @@ resources:
 - bases/ray.io_rayclusters.yaml
 - bases/ray.io_rayservices.yaml
 - bases/ray.io_rayjobs.yaml
-# +kubebuilder:scaffold:crdkustomizeresource
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/ray-operator/config/default-with-webhooks/kustomization.yaml b/ray-operator/config/default-with-webhooks/kustomization.yaml
@@ -19,9 +19,6 @@ images:
   newName: quay.io/kuberay/operator
   newTag: nightly
 
-patchesStrategicMerge:
-- manager_webhook_patch.yaml
-- webhookcainjection_patch.yaml
 
 replacements:
 - source:
@@ -125,3 +122,6 @@ resources:
 - ../webhook
 - ../certmanager
 - namespace.yaml
+patches:
+- path: manager_webhook_patch.yaml
+- path: webhookcainjection_patch.yaml
diff --git a/ray-operator/config/default/kustomization.yaml b/ray-operator/config/default/kustomization.yaml
@@ -12,15 +12,17 @@ namespace: ray-system
 #commonLabels:
 #  someName: someValue
 
-bases:
-- ../crd
-- ../rbac
-- ../manager
-- namespace.yaml
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
 
 images:
 - name: kuberay/operator
   newName: quay.io/kuberay/operator
   newTag: nightly
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../crd
+- ../rbac
+- ../manager
+- namespace.yaml
diff --git a/ray-operator/config/manager/kustomization.yaml b/ray-operator/config/manager/kustomization.yaml
@@ -4,6 +4,8 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/component: kuberay-operator
-  app.kubernetes.io/name: kuberay
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kuberay-operator
+    app.kubernetes.io/name: kuberay
diff --git a/ray-operator/config/rbac/kustomization.yaml b/ray-operator/config/rbac/kustomization.yaml
@@ -5,6 +5,10 @@ resources:
 - leader_election_role_binding.yaml
 - service_account.yaml
 
-commonLabels:
-  app.kubernetes.io/name: kuberay
-  app.kubernetes.io/component: kuberay-operator
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/component: kuberay-operator
+    app.kubernetes.io/name: kuberay
diff --git a/ray-operator/config/webhook/kustomization.yaml b/ray-operator/config/webhook/kustomization.yaml
@@ -16,3 +16,5 @@ patches:
     kind: ValidatingWebhookConfiguration
     name: validating-webhook-configuration
     version: v1
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization