Merge pull request #28 from harshad16/patch-manifests

Adjust the manifests based on the RHODS odh-manifests
jiridanek · Oct 20, 2023 · f82055f · f82055f
2 parents 69c9877 + 07ef442
commit f82055f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 11 deletions.
diff --git a/components/base/kustomization.yaml b/components/base/kustomization.yaml
@@ -4,3 +4,25 @@ kind: Kustomization
 bases:
   - ../notebook-controller/config/overlays/openshift
   - ../odh-notebook-controller/config/base
+
+configMapGenerator:
+- name: notebook-controller-image-parameters
+  env: params.env
+generatorOptions:
+  disableNameSuffixHash: true
+
+vars:
+- name: odh-kf-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-kf-notebook-controller-image
+- name: odh-notebook-controller-image
+  objref:
+    kind: ConfigMap
+    name: notebook-controller-image-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.odh-notebook-controller-image
diff --git a/components/base/params.env b/components/base/params.env
@@ -0,0 +1,2 @@
+odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:latest
+odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:latest
diff --git a/components/notebook-controller/config/overlays/openshift/kustomization.yaml b/components/notebook-controller/config/overlays/openshift/kustomization.yaml
@@ -8,10 +8,10 @@ commonLabels:
   app.kubernetes.io/part-of: odh-notebook-controller
   component.opendatahub.io/name: kf-notebook-controller
   opendatahub.io/component: "true"
-images:
-  - name: docker.io/kubeflownotebookswg/notebook-controller
-    newName: quay.io/opendatahub/kubeflow-notebook-controller
-    newTag: 1.7-9f0db5d
+
+configurations:
+  - params.yaml
+
 configMapGenerator:
   - name: config
     behavior: merge

diff --git a/components/notebook-controller/config/overlays/openshift/manager_openshift_patch.yaml b/components/notebook-controller/config/overlays/openshift/manager_openshift_patch.yaml
@@ -32,10 +32,11 @@ spec:
                   name: notebook-controller-culler-config
                   key: IDLENESS_CHECK_PERIOD
                   optional: true
+          image: $(odh-kf-notebook-controller-image)
           resources:
             limits:
               cpu: 500m
               memory: 4Gi
             requests:
               cpu: 500m
-              memory: 256Mi
+              memory: 256Mi
diff --git a/components/notebook-controller/config/overlays/openshift/params.yaml b/components/notebook-controller/config/overlays/openshift/params.yaml
@@ -0,0 +1,3 @@
+varReference:
+- path: spec/template/spec/containers/image
+  kind: Deployment
diff --git a/components/odh-notebook-controller/config/base/kustomization.yaml b/components/odh-notebook-controller/config/base/kustomization.yaml
@@ -3,7 +3,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../default
-images:
-  - name: quay.io/opendatahub/odh-notebook-controller
-    newName: quay.io/opendatahub/odh-notebook-controller
-    newTag: 1.7-9f0db5d
diff --git a/components/odh-notebook-controller/config/manager/kustomization.yaml b/components/odh-notebook-controller/config/manager/kustomization.yaml
@@ -4,3 +4,5 @@ kind: Kustomization
 resources:
   - manager.yaml
   - service.yaml
+configurations:
+- params.yaml
diff --git a/components/odh-notebook-controller/config/manager/manager.yaml b/components/odh-notebook-controller/config/manager/manager.yaml
@@ -21,11 +21,11 @@ spec:
         runAsNonRoot: true
       containers:
         - name: manager
-          image: quay.io/opendatahub/odh-notebook-controller:latest
+          image: $(odh-notebook-controller-image)
           imagePullPolicy: Always
           command:
             - /manager
-          args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy:v4.10"]
+          args: ["--oauth-proxy-image", "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4bef31eb993feb6f1096b51b4876c65a6fb1f4401fee97fa4f4542b6b7c9bc46"]
           securityContext:
             allowPrivilegeEscalation: false
           ports:

diff --git a/components/odh-notebook-controller/config/manager/params.yaml b/components/odh-notebook-controller/config/manager/params.yaml
@@ -0,0 +1,3 @@
+varReference:
+- path: spec/template/spec/containers/image
+  kind: Deployment
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:latest
		odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:latest