Skip to content

Commit

Permalink
fix: patch images of notebook-controller in its components
Browse files Browse the repository at this point in the history
Signed-off-by: Harshad Reddy Nalla <[email protected]>
  • Loading branch information
harshad16 committed Oct 25, 2023
1 parent 8e09748 commit f25d2c7
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 25 deletions.
24 changes: 1 addition & 23 deletions components/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
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
- ../odh-notebook-controller/config/base
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../base
namespace: opendatahub
commonLabels:
app.kubernetes.io/part-of: odh-notebook-controller
component.opendatahub.io/name: kf-notebook-controller
Expand All @@ -13,12 +12,25 @@ configurations:
- params.yaml

configMapGenerator:
- name: kf-notebook-controller-image-parameters
env: params.env
- name: config
behavior: merge
literals:
- USE_ISTIO=false
- ADD_FSGROUP=false
generatorOptions:
disableNameSuffixHash: true
patchesStrategicMerge:
- remove_namespace_patch.yaml
- manager_openshift_patch.yaml
- manager_service_openshift_patch.yaml

vars:
- name: odh-kf-notebook-controller-image
objref:
kind: ConfigMap
name: kf-notebook-controller-image-parameters
apiVersion: v1
fieldref:
fieldpath: data.odh-kf-notebook-controller-image
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:latest
odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:latest
15 changes: 15 additions & 0 deletions components/odh-notebook-controller/config/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../default

configMapGenerator:
- name: odh-notebook-controller-image-parameters
env: params.env
generatorOptions:
disableNameSuffixHash: true

vars:
- name: odh-notebook-controller-image
objref:
kind: ConfigMap
name: odh-notebook-controller-image-parameters
apiVersion: v1
fieldref:
fieldpath: data.odh-notebook-controller-image
1 change: 1 addition & 0 deletions components/odh-notebook-controller/config/base/params.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:latest

0 comments on commit f25d2c7

Please sign in to comment.