From 7fcdc48a1ef19d212dd7f0056f51cb9dca4740b2 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 10:46:37 +0530 Subject: [PATCH 1/6] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 481dc8e0..e92036fb 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -74,10 +74,10 @@ ibm_odh: aibroker_namespace: "mas_sremat_aibroker" pull_secret_name: "ibm_entitlement" mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_accesskey: xxxx + mas_aibroker_storage_secretkey: xxxx + mas_aibroker_storage_host: xxxx + mas_aibroker_storage_port: xxxx mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" mas_aibroker_storage_region: "mas_aibroker_storage_region" From bb5fe6e4498755d2be269e7e90fb897a3f915bcd Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 11:03:32 +0530 Subject: [PATCH 2/6] Update 099-instance-appset.yaml Kmodel comment --- .../templates/099-instance-appset.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 58c3edcc..9f7dfd3a 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -39,11 +39,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + # - git: + # repoURL: "{{ .Values.generator.repo_url }}" + # revision: "{{ .Values.generator.revision }}" + # files: + # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -128,4 +128,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file + revisionHistoryLimit: 1 From 82c62106825f44ccfb4a9e5e67f9d82f5fb6bc76 Mon Sep 17 00:00:00 2001 From: Nikita Kumble Date: Thu, 3 Apr 2025 12:28:19 +0530 Subject: [PATCH 3/6] sync-options updated --- .../113-ibm-kmodels/templates/03-kmodel-istio.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml index 7f1eb294..17108a29 100644 --- a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -6,6 +6,7 @@ metadata: namespace: opendatahub annotations: argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: mtls: mode: PERMISSIVE @@ -17,6 +18,7 @@ metadata: namespace: opendatahub annotations: argocd.argoproj.io/sync-wave: "140" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: host: ds-pipeline-instance.opendatahub.svc.cluster.local trafficPolicy: @@ -33,6 +35,7 @@ metadata: namespace: opendatahub annotations: argocd.argoproj.io/sync-wave: "141" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: host: minio-instance.opendatahub.svc.cluster.local trafficPolicy: From 39d3fb51901cdfd0287d1e77de383136bbed0fd4 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Thu, 3 Apr 2025 12:34:08 +0530 Subject: [PATCH 4/6] correct indentation --- .../templates/02-kmodel-secret.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml index c549d4ff..3040359c 100644 --- a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -21,11 +21,11 @@ metadata: serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" {{- end }} stringData: - AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" - AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" - S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" - S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" - S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey }}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey }}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey }}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey }}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host }}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port }}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region }}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl }}" From 6e45f9fa6cb6fb8facf1ac3111ebe613c6901750 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 13:00:43 +0530 Subject: [PATCH 5/6] Update 01-odh-pipeline-operator-subcription.yaml odh namespace update --- .../templates/01-odh-pipeline-operator-subcription.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 10fe0e39..cb65ec43 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -2,11 +2,12 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines-operator-rh + name: openshift-pipelines namespace: "{{ .Values.openshift_namespace }}" annotations: argocd.argoproj.io/sync-wave: "116" spec: - package_name: "openshift-pipelines-operator-rh" - package_channel: "{{ .Values.pipeline_channel }}" - catalog_source: "{{ .Values.pipeline_catalog_source }}" \ No newline at end of file + channel: {{ .Values.pipeline_channel }} + name: Openshift-pipelines + source: {{ .Values.pipeline_catalog_source }} + sourceNamespace: {{ .Values.openshift_namespace }} From 91c8d79375e2e3d81984b16e1378de6eef8a1af4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 3 Apr 2025 14:35:47 +0530 Subject: [PATCH 6/6] kmodel for argocd test --- .../templates/099-instance-appset.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 9f7dfd3a..58c3edcc 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -39,11 +39,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - # - git: - # repoURL: "{{ .Values.generator.repo_url }}" - # revision: "{{ .Values.generator.revision }}" - # files: - # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -128,4 +128,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 + revisionHistoryLimit: 1 \ No newline at end of file