From aa911370fb3f359e45acd6b926d25f4447c13ff4 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Mon, 3 Aug 2026 13:38:56 -0400 Subject: [PATCH 01/98] Initial publish of aiservice subcharts --- .../113-ibm-aiservice/Chart.yaml | 5 +++- .../115-ibm-aiservice-tenant/Chart.yaml | 5 +++- sub-charts/aiservice/Chart.yaml | 6 ++++ sub-charts/aiservice/README.md | 3 ++ .../00-aiservice-ibm-entitlement.yaml | 15 ++++++++++ .../templates/01-aiservice-km-s3-secret.yaml | 28 +++++++++++++++++++ sub-charts/aiservice/values.yaml | 3 ++ 7 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 sub-charts/aiservice/Chart.yaml create mode 100644 sub-charts/aiservice/README.md create mode 100644 sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml create mode 100644 sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml create mode 100644 sub-charts/aiservice/values.yaml diff --git a/instance-applications/113-ibm-aiservice/Chart.yaml b/instance-applications/113-ibm-aiservice/Chart.yaml index 88e778886..da5a3cabf 100644 --- a/instance-applications/113-ibm-aiservice/Chart.yaml +++ b/instance-applications/113-ibm-aiservice/Chart.yaml @@ -8,4 +8,7 @@ dependencies: - name: junitreporter version: 1.0.0 repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file + condition: junitreporter.devops_mongo_uri != "" +- name: aiservice + version: 1.0.0 + repository: "file://../../sub-charts/aiservice/" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/Chart.yaml b/instance-applications/115-ibm-aiservice-tenant/Chart.yaml index 186b9bb20..7e88c79db 100644 --- a/instance-applications/115-ibm-aiservice-tenant/Chart.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/Chart.yaml @@ -8,4 +8,7 @@ dependencies: - name: junitreporter version: 1.0.0 repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file + condition: junitreporter.devops_mongo_uri != "" +- name: aiservice + version: 1.0.0 + repository: "file://../../sub-charts/aiservice/" \ No newline at end of file diff --git a/sub-charts/aiservice/Chart.yaml b/sub-charts/aiservice/Chart.yaml new file mode 100644 index 000000000..e9ecfa21b --- /dev/null +++ b/sub-charts/aiservice/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: aiservice +description: | + Contains common shared resources for AIService. +type: application +version: 1.0.0 diff --git a/sub-charts/aiservice/README.md b/sub-charts/aiservice/README.md new file mode 100644 index 000000000..e37d59f83 --- /dev/null +++ b/sub-charts/aiservice/README.md @@ -0,0 +1,3 @@ +AIService +=============================================================================== +Updates common AIService resources when they are changed. \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml new file mode 100644 index 000000000..85d854337 --- /dev/null +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -0,0 +1,15 @@ +{{- if .Values.cluster_admin_role }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: ibm-entitlement + namespace: "{{ .Values.aiservice_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "146" +type: kubernetes.io/dockerconfigjson +data: + .dockerconfigjson: "{{ .Values.artifactory_token}}" + +{{- end }} + diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml new file mode 100644 index 000000000..711175ad1 --- /dev/null +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -0,0 +1,28 @@ +{{- if .Values.application_admin_role }} +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.aiservice_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "147" + serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" + {{- if eq .Values.aiservice_s3_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" +data: + AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_ACCESS_KEY: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + S3_SECRET_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_HOST: {{ .Values.aiservice_s3_host | default "" | toString | b64enc | quote }} + S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }} + S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }} + S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }} + +{{- end }} diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml new file mode 100644 index 000000000..0e9f74b63 --- /dev/null +++ b/sub-charts/aiservice/values.yaml @@ -0,0 +1,3 @@ +--- +ibm-entitlement: +km-s3-secret: \ No newline at end of file From 29bfd5659dcf0b30cc522d04ff9cd6fe5f4941a9 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 4 Aug 2026 13:08:18 -0400 Subject: [PATCH 02/98] Removed ibm-entitlement and k3 secrets from aiservice charts --- .../04-aiservice-operator-subscription.yaml | 12 -- .../templates/05-aiservice-km-s3-secret.yaml | 28 --- .../templates/06-aiservice-km-s3-secret.yaml | 174 ------------------ 3 files changed, 214 deletions(-) delete mode 100644 instance-applications/113-ibm-aiservice/templates/05-aiservice-km-s3-secret.yaml delete mode 100644 instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml diff --git a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml index 77568b36d..e8cf427b7 100644 --- a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml +++ b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml @@ -1,16 +1,4 @@ {{- if .Values.cluster_admin_role }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: ibm-entitlement - namespace: "{{ .Values.aiservice_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "146" -type: kubernetes.io/dockerconfigjson -data: - .dockerconfigjson: "{{ .Values.artifactory_token}}" - --- apiVersion: operators.coreos.com/v1 kind: OperatorGroup diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-km-s3-secret.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-km-s3-secret.yaml deleted file mode 100644 index 711175ad1..000000000 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-km-s3-secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.application_admin_role }} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: km-s3-secret - namespace: "{{ .Values.aiservice_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "147" - serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" - {{- if eq .Values.aiservice_s3_ssl "false" }} - serving.kserve.io/s3-usehttps: "0" - {{- else }} - serving.kserve.io/s3-usehttps: "1" - {{- end }} - serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" -data: - AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_ACCESS_KEY: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - S3_SECRET_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_HOST: {{ .Values.aiservice_s3_host | default "" | toString | b64enc | quote }} - S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }} - S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }} - S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }} - -{{- end }} diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml deleted file mode 100644 index f15d43d5e..000000000 --- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-km-s3-secret.yaml +++ /dev/null @@ -1,174 +0,0 @@ -{{- if .Values.application_admin_role }} -{{- $_job_name_prefix := "presync-copy-ai-secrets" }} -{{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} -{{- $_job_config_values := omit .Values "junitreporter" }} -{{- $_job_version := "v5" }} -{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} -{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash ) }} -{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: copy-secret-job-{{ .Values.tenantNamespace }} - namespace: {{ .Values.aiservice_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "305" - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: secret-reader-{{ .Values.tenantNamespace }} - namespace: {{ .Values.aiservice_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "305" - labels: - app.kubernetes.io/name: secret-reader - app.kubernetes.io/component: rbac - app.kubernetes.io/instance: {{ .Values.tenantNamespace }} - app.kubernetes.io/part-of: aiservice -rules: - - apiGroups: [""] - resources: ["secrets", "pods"] - verbs: ["get", "list"] - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: secret-reader-binding-{{ .Values.tenantNamespace }} - namespace: {{ .Values.aiservice_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "306" -subjects: - - kind: ServiceAccount - name: copy-secret-job-{{ .Values.tenantNamespace }} - namespace: {{ .Values.aiservice_namespace }} -roleRef: - kind: Role - name: secret-reader-{{ .Values.tenantNamespace }} - apiGroup: rbac.authorization.k8s.io - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: secret-writer-{{ .Values.tenantNamespace }} - namespace: {{ .Values.tenantNamespace }} - annotations: - argocd.argoproj.io/sync-wave: "306" -rules: - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "create", "update", "patch"] - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: secret-writer-binding-{{ .Values.tenantNamespace }} - namespace: {{ .Values.tenantNamespace }} - annotations: - argocd.argoproj.io/sync-wave: "306" -subjects: - - kind: ServiceAccount - name: copy-secret-job-{{ .Values.tenantNamespace }} - namespace: {{ .Values.aiservice_namespace }} -roleRef: - kind: Role - name: secret-writer-{{ .Values.tenantNamespace }} - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: allow-copy-secret-job-{{ .Values.tenantNamespace }} - namespace: "{{ .Values.aiservice_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "306" -spec: - podSelector: - matchLabels: - app: sync-job - egress: - - {} - policyTypes: - - Egress ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ $_job_name }} - namespace: {{ .Values.aiservice_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "307" - labels: - mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -spec: - template: - metadata: - labels: - app: sync-job -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - spec: - serviceAccountName: copy-secret-job-{{ .Values.tenantNamespace }} - restartPolicy: OnFailure - containers: - - name: copy-secrets - image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} - imagePullPolicy: IfNotPresent - env: - - name: SOURCE_NAMESPACE - value: "{{ .Values.aiservice_namespace }}" - - name: TARGET_NAMESPACE - value: "{{ .Values.tenantNamespace }}" - - name: SECRETS_TO_COPY - value: "ibm-entitlement km-s3-secret" - command: - - /bin/sh - - -c - - | - set -e - echo "Starting secret copy from $SOURCE_NAMESPACE to $TARGET_NAMESPACE" - for SECRET_NAME in $SECRETS_TO_COPY; do - echo "--------------------------------------------------------" - echo "Copying secret: $SECRET_NAME" - echo "--------------------------------------------------------" - - if ! kubectl get secret $SECRET_NAME -n $SOURCE_NAMESPACE -o json > /tmp/${SECRET_NAME}.json; then - echo "Failed to get secret $SECRET_NAME from $SOURCE_NAMESPACE" - exit 1 - fi - - # Clean metadata fields to avoid resourceVersion conflicts - jq 'del(.metadata.resourceVersion, .metadata.uid, .metadata.creationTimestamp, .metadata.selfLink, .metadata.managedFields)' /tmp/${SECRET_NAME}.json \ - | sed "s/\"namespace\": \"$SOURCE_NAMESPACE\"/\"namespace\": \"$TARGET_NAMESPACE\"/" > /tmp/${SECRET_NAME}_clean.json - - # Delete the app label as this secret is not tracked by ArgoCD (it's not in Git) - jq 'del(.metadata.labels["app.kubernetes.io/instance"])' /tmp/${SECRET_NAME}_clean.json > /tmp/${SECRET_NAME}_clean2.json - - # These secrets are not defined in Git so exclude them from ArgoCD's reconcilliation. - jq '.metadata.annotations = (.metadata.annotations // {}) + {"argocd.argoproj.io/sync-options": "IgnoreExtraneous,Prune=false"}' \ - /tmp/${SECRET_NAME}_clean2.json > /tmp/${SECRET_NAME}_annotated.json - - if ! kubectl apply -f /tmp/${SECRET_NAME}_annotated.json; then - echo "Failed to apply $SECRET_NAME to $TARGET_NAMESPACE" - exit 1 - fi - - if ! kubectl get secret $SECRET_NAME -n $TARGET_NAMESPACE > /dev/null; then - echo "Secret $SECRET_NAME not found in $TARGET_NAMESPACE after apply" - exit 1 - fi - - echo "Successfully copied $SECRET_NAME to $TARGET_NAMESPACE" - done - echo "All secrets copied successfully" -{{- end }} From 066e3a3de89a76bb263b22eff2b80cdbca43d6e6 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 10:28:07 -0400 Subject: [PATCH 03/98] Added subchart annotations --- sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml | 1 + sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 85d854337..53bd0efb6 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -7,6 +7,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" + subchart: true type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token}}" diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index 711175ad1..f8b662e37 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -15,6 +15,7 @@ metadata: serving.kserve.io/s3-usehttps: "1" {{- end }} serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" + subchart: true data: AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} From a1e4329ec9cac01109ef072661f71d3c0603a15f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:06:19 -0400 Subject: [PATCH 04/98] Updated if statements for aiservice --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 53bd0efb6..99f623590 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -1,4 +1,4 @@ -{{- if .Values.cluster_admin_role }} +{{- if .Values.ibm-entitlement }} --- apiVersion: v1 kind: Secret diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index f8b662e37..b2d5351bb 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -1,4 +1,4 @@ -{{- if .Values.application_admin_role }} +{{- if .Values.km-s3-secret }} --- apiVersion: v1 kind: Secret From 3d302f1782399a87c387c10b642aaf8f71dc5bf3 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:14:29 -0400 Subject: [PATCH 05/98] Removed if statements --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ---- sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml | 3 --- 2 files changed, 7 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 99f623590..d22442ee9 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -1,4 +1,3 @@ -{{- if .Values.ibm-entitlement }} --- apiVersion: v1 kind: Secret @@ -11,6 +10,3 @@ metadata: type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token}}" - -{{- end }} - diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index b2d5351bb..692589ab6 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -1,4 +1,3 @@ -{{- if .Values.km-s3-secret }} --- apiVersion: v1 kind: Secret @@ -25,5 +24,3 @@ data: S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }} S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }} S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }} - -{{- end }} From acc2a086ca59e854b9012d0d3fa1b7271c719df1 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:18:02 -0400 Subject: [PATCH 06/98] Made annotations string --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index d22442ee9..51c05e43a 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - subchart: true + subchart: "true" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token}}" diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index 692589ab6..da167757c 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -14,7 +14,7 @@ metadata: serving.kserve.io/s3-usehttps: "1" {{- end }} serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" - subchart: true + subchart: "true" data: AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} From 8a2c35691f3ad47320a968e84fc15c1f87cc4825 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:27:21 -0400 Subject: [PATCH 07/98] Removed subchart annotation --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 3 +-- sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 51c05e43a..6100e0859 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,6 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - subchart: "true" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token}}" + .dockerconfigjson: "{{ .Values.artifactory_token }}" diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index da167757c..aadcca16f 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -14,7 +14,6 @@ metadata: serving.kserve.io/s3-usehttps: "1" {{- end }} serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" - subchart: "true" data: AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} From 122b511b4632181568c75a8fae21ddd8c2e9666e Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:30:17 -0400 Subject: [PATCH 08/98] Added values for debug --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 6100e0859..b73e4d489 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,6 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" + namespace.value: "{{ .Values.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" + .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 753f40e80c808799d12a0c28eab118aa14d61993 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:36:17 -0400 Subject: [PATCH 09/98] Added values for aiservice --- instance-applications/113-ibm-aiservice/values.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index d90c02449..4868635c3 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -79,4 +79,9 @@ in_saas_env: "false" is_gitops_fvt_env: "false" #TENANT -mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" \ No newline at end of file +mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" + +#AIService Values +aiservice: + artifactory_token: "ARTIFACTORY_TOKEN" + aiservice_namespace: 'mas-{{ mas_instance_id }}-aiservice' \ No newline at end of file From 258c9e62ab7274a97198751584a2aa3a3863f5b6 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:48:15 -0400 Subject: [PATCH 10/98] Changed values --- instance-applications/113-ibm-aiservice/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 4868635c3..33daa5c00 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,5 +83,5 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: "ARTIFACTORY_TOKEN" - aiservice_namespace: 'mas-{{ mas_instance_id }}-aiservice' \ No newline at end of file + artifactory_token: {{ .Values.artifactory_token }} + aiservice_namespace: {{ .Values.aiservice_namespace }} \ No newline at end of file From 16e1a6b339a346f72b698b54e2ab49420083ded9 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:49:28 -0400 Subject: [PATCH 11/98] more value changes --- instance-applications/113-ibm-aiservice/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 33daa5c00..b6bbb4440 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,5 +83,5 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: {{ .Values.artifactory_token }} - aiservice_namespace: {{ .Values.aiservice_namespace }} \ No newline at end of file + artifactory_token: "{{ .Values.artifactory_token }}" + aiservice_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file From 95f9787322839aa603217c387b946ab90591abb9 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:50:52 -0400 Subject: [PATCH 12/98] Made values global --- instance-applications/113-ibm-aiservice/values.yaml | 5 ----- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index b6bbb4440..6c52ae3cf 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -80,8 +80,3 @@ is_gitops_fvt_env: "false" #TENANT mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" - -#AIService Values -aiservice: - artifactory_token: "{{ .Values.artifactory_token }}" - aiservice_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b73e4d489..37087c81b 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,11 +3,11 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ .Values.aiservice_namespace }}" + namespace: "{{ global.Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.artifactory_token }}" + namespace.value: "{{ global.Values.aiservice_namespace }}" + dockerconfig.value: "{{ global.Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: "{{ global.Values.artifactory_token }}" \ No newline at end of file From c6fe9c03323d9370990aadaa9ae04434489a0109 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:52:18 -0400 Subject: [PATCH 13/98] Removed globals --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 37087c81b..b73e4d489 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,11 +3,11 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ global.Values.aiservice_namespace }}" + namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ global.Values.aiservice_namespace }}" - dockerconfig.value: "{{ global.Values.artifactory_token }}" + namespace.value: "{{ .Values.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ global.Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 77f151573ee95b31fe399666cb77a4a591efe130 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:54:51 -0400 Subject: [PATCH 14/98] Added global --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b73e4d489..fd3691cce 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.artifactory_token }}" + namespace.value: "{{ .Values.global.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.global.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 7c98e977ef8acdcdae1a2dfa802bba6c4fcab62f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 11:59:26 -0400 Subject: [PATCH 15/98] Variables in value --- instance-applications/113-ibm-aiservice/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 6c52ae3cf..0d74c5b46 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -80,3 +80,8 @@ is_gitops_fvt_env: "false" #TENANT mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" + +#AIService Values +aiservice: + artifactory_token: ${artifactory_token} + aiservice_namespace: ${aiservice_namespace} \ No newline at end of file From f9010e9dda420357a6eebb95377e2c83fdac1fa0 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:10:01 -0400 Subject: [PATCH 16/98] Added tpl to subchart --- instance-applications/113-ibm-aiservice/values.yaml | 4 ++-- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 0d74c5b46..b6bbb4440 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,5 +83,5 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: ${artifactory_token} - aiservice_namespace: ${aiservice_namespace} \ No newline at end of file + artifactory_token: "{{ .Values.artifactory_token }}" + aiservice_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index fd3691cce..6350ba1f0 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,11 +3,11 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ .Values.aiservice_namespace }}" + namespace: "{{ tpl .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.global.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.global.artifactory_token }}" + namespace.value: "{{ tpl .Values.global.aiservice_namespace }}" + dockerconfig.value: "{{ tpl .Values.global.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: "{{ tpl .Values.artifactory_token }}" \ No newline at end of file From 422d1d058cf6bcc69cb9677cdbc6ed18c4d579f8 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:11:15 -0400 Subject: [PATCH 17/98] Removed tpl from namespace --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 6350ba1f0..99a893a0e 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ tpl .Values.aiservice_namespace }}" + namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" namespace.value: "{{ tpl .Values.global.aiservice_namespace }}" From c64dc5012905c6624e65c2d845678274be0ac29e Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:12:23 -0400 Subject: [PATCH 18/98] Removed namespace --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index b6bbb4440..84f0885d2 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,4 +84,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: artifactory_token: "{{ .Values.artifactory_token }}" - aiservice_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file + \ No newline at end of file From 6cbda911681b91f9ed9416b5712330124b0e6d99 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:15:06 -0400 Subject: [PATCH 19/98] Removed tpl --- instance-applications/113-ibm-aiservice/values.yaml | 5 ++--- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 84f0885d2..56b922168 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -82,6 +82,5 @@ is_gitops_fvt_env: "false" mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values -aiservice: - artifactory_token: "{{ .Values.artifactory_token }}" - \ No newline at end of file +# aiservice: +# artifactory_token: "{{ .Values.artifactory_token }}" diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 99a893a0e..a5e8ce423 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -10,4 +10,4 @@ metadata: dockerconfig.value: "{{ tpl .Values.global.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ tpl .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 81f09925403595f6fffaa0d1778e1b772128c888 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:17:07 -0400 Subject: [PATCH 20/98] Reverted --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index a5e8ce423..fd3691cce 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ tpl .Values.global.aiservice_namespace }}" - dockerconfig.value: "{{ tpl .Values.global.artifactory_token }}" + namespace.value: "{{ .Values.global.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.global.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From f2c784b9ad1b8af2c8f223d7ce145c23d49aba68 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:21:00 -0400 Subject: [PATCH 21/98] Added test value --- instance-applications/113-ibm-aiservice/values.yaml | 4 ++-- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 56b922168..b2e0e3be5 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -82,5 +82,5 @@ is_gitops_fvt_env: "false" mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values -# aiservice: -# artifactory_token: "{{ .Values.artifactory_token }}" +aiservice: + test_artifactory_token: "{{ .Values.artifactory_token }}" diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index fd3691cce..8cec879bd 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.global.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.global.artifactory_token }}" + namespace.value: "{{ .Values.aiservice_namespace }}" + dockerconfig.value: "{{ tpl .Values.test_artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From ed4293a34e1239fe6806efbda50116c0dc353395 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:24:17 -0400 Subject: [PATCH 22/98] Removed tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 8cec879bd..2c79e152b 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -7,7 +7,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ tpl .Values.test_artifactory_token }}" + dockerconfig.value: "{{ .Values.test_artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From a009b4b7ce1ded3b442dd92f5be7ab02f7e4ea84 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:26:21 -0400 Subject: [PATCH 23/98] Added context for tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 2c79e152b..06f1205a3 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -7,7 +7,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.test_artifactory_token }}" + dockerconfig.value: "{{ tpl .Values.test_artifactory_token . }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 3dba50fb51a4db346b4eeccae6c9bbbb8de50628 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:29:25 -0400 Subject: [PATCH 24/98] Added quote for tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 06f1205a3..c53c17f2c 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -7,7 +7,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ tpl .Values.test_artifactory_token . }}" + dockerconfig.value: "{{ tpl .Values.test_artifactory_token . | quote}}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 81085268b8bfc7a2818d9beba5185fe75c474168 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:31:02 -0400 Subject: [PATCH 25/98] fixed spacing --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index c53c17f2c..439f0c01b 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -7,7 +7,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ tpl .Values.test_artifactory_token . | quote}}" + dockerconfig.value: "{{ tpl .Values.test_artifactory_token . | quote }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 58c052ce40fee18dc85ac971fd9bdd434beaae17 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:42:46 -0400 Subject: [PATCH 26/98] Added argo values --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 439f0c01b..c17081bf4 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ tpl .Values.test_artifactory_token . | quote }}" + namespace.value: "{{ .Values.argo.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.argo.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 1b2d8e9c11a4c0bebbc700c9fa0829713d607431 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:46:55 -0400 Subject: [PATCH 27/98] Removed argo --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index c17081bf4..b73e4d489 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.argo.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.argo.artifactory_token }}" + namespace.value: "{{ .Values.aiservice_namespace }}" + dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 8e16d4e02e74d7f6bd821c1b754c6d5c9dbc2462 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:52:07 -0400 Subject: [PATCH 28/98] Added helm values --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b73e4d489..24e39856a 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.aiservice_namespace }}" + namespace.value: "{{ .Values.HELM_VALUES }}" dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: From fcc58490cd7e519e81e1bcddfd8a4a1d383bfc05 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:53:53 -0400 Subject: [PATCH 29/98] Added helm values namespace --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 24e39856a..1c7e19a1b 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.HELM_VALUES }}" + namespace.value: "{{ .Values.HELM_VALUESaiservice_namespace }}" dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: From 64b69f9bfd423074bc3db1afc5c00b6ccfccad20 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 12:54:42 -0400 Subject: [PATCH 30/98] Missed period --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 1c7e19a1b..8b69f87ba 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.HELM_VALUESaiservice_namespace }}" + namespace.value: "{{ .Values.HELM_VALUES.aiservice_namespace }}" dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: From 1d69a30e14d09b947b6a3e789c292c0839c930ec Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 13:04:18 -0400 Subject: [PATCH 31/98] Try to get env values --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 8b69f87ba..1d62be8f2 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.HELM_VALUES.aiservice_namespace }}" + namespace.value: "{{ .env.HELM_VALUES }}" dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: From a42d2d7193ed79fdef2b1c0e04623f88283173c6 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 13:05:21 -0400 Subject: [PATCH 32/98] Revert to stable --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 1d62be8f2..b21aadf98 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .env.HELM_VALUES }}" + namespace.value: "{{ .Values.aiservice_namespace }}" dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: From dc0bacfcf065bcd76008c960c8fec2b928dc767a Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 13:17:21 -0400 Subject: [PATCH 33/98] Added in artifactory token --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index b2e0e3be5..3816ad633 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - test_artifactory_token: "{{ .Values.artifactory_token }}" + artifactory_token: "" diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b21aadf98..3a79bbdcc 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,6 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - namespace.value: "{{ .Values.aiservice_namespace }}" - dockerconfig.value: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 50f7a7e829a12de1af841f313845a028a4078239 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 13:21:44 -0400 Subject: [PATCH 34/98] Aded s3 values --- instance-applications/113-ibm-aiservice/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 3816ad633..56adab636 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,3 +84,9 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: artifactory_token: "" + aiservice_s3_host: "" + aiservice_s3_port: "" + aiservice_s3_ssl: "true" + aiservice_s3_region: "" + aiservice_s3_accesskey: "" + aiservice_s3_secretkey: "" \ No newline at end of file From 2bb8f82dcddbae1e4f441db53967cb792f789686 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Wed, 5 Aug 2026 13:27:48 -0400 Subject: [PATCH 35/98] Added aiservice values to tenant --- .../115-ibm-aiservice-tenant/values.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index aa9262860..15c1531dd 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -43,3 +43,13 @@ tenant_entitlement_end_date: "2049-11-11" # Tenant scheduling configuration (optional, requires catalog_channel 9.2.x+) tenant_scheduling_config: {} + +#AIService Values +aiservice: + artifactory_token: "" + aiservice_s3_host: "" + aiservice_s3_port: "" + aiservice_s3_ssl: "true" + aiservice_s3_region: "" + aiservice_s3_accesskey: "" + aiservice_s3_secretkey: "" \ No newline at end of file From 62ba577513def42f42c1820b20f347626c937f19 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 7 Aug 2026 14:40:31 -0400 Subject: [PATCH 36/98] Used values.ibm_aiservice --- .../113-ibm-aiservice/values.yaml | 22 +++++++++++++------ .../00-aiservice-ibm-entitlement.yaml | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 56adab636..e19969f7e 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,10 +83,18 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: "" - aiservice_s3_host: "" - aiservice_s3_port: "" - aiservice_s3_ssl: "true" - aiservice_s3_region: "" - aiservice_s3_accesskey: "" - aiservice_s3_secretkey: "" \ No newline at end of file + artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" + aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" + aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" + + aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" + aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" + aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" + aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" + # artifactory_token: "" + # aiservice_s3_host: "" + # aiservice_s3_port: "" + # aiservice_s3_ssl: "true" + # aiservice_s3_region: "" + # aiservice_s3_accesskey: "" + # aiservice_s3_secretkey: "" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 3a79bbdcc..728cb93ab 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,6 +6,8 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" + aiservice_namespace: "{{ .Values.aiservice_namespace }}" + aiservice_artifactory_token: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 775fc12a20ef4fc18368ed1281b2c48c76c35942 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 7 Aug 2026 14:44:10 -0400 Subject: [PATCH 37/98] Removed to just be values --- .../113-ibm-aiservice/values.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index e19969f7e..d5946900d 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,14 +83,14 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" - aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" - aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" - - aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" - aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" - aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" - aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" + artifactory_token: "{{ .Values.artifactory_token }}" + aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" + aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" + + aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" + aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" + aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" + aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" # artifactory_token: "" # aiservice_s3_host: "" # aiservice_s3_port: "" From 1e15197bb779ab07b8d1f327cf5650e27fe1258b Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 7 Aug 2026 14:47:20 -0400 Subject: [PATCH 38/98] Switch to hard coded variables --- .../113-ibm-aiservice/values.yaml | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index d5946900d..56adab636 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,18 +83,10 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: "{{ .Values.artifactory_token }}" - aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" - aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" - - aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" - aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" - aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" - aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" - # artifactory_token: "" - # aiservice_s3_host: "" - # aiservice_s3_port: "" - # aiservice_s3_ssl: "true" - # aiservice_s3_region: "" - # aiservice_s3_accesskey: "" - # aiservice_s3_secretkey: "" \ No newline at end of file + artifactory_token: "" + aiservice_s3_host: "" + aiservice_s3_port: "" + aiservice_s3_ssl: "true" + aiservice_s3_region: "" + aiservice_s3_accesskey: "" + aiservice_s3_secretkey: "" \ No newline at end of file From e16d1ceec9eaf7b47b9ca20d5a2c3f2c0c577b11 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 7 Aug 2026 14:50:03 -0400 Subject: [PATCH 39/98] Removed annotations --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 728cb93ab..3a79bbdcc 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,8 +6,6 @@ metadata: namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" - aiservice_namespace: "{{ .Values.aiservice_namespace }}" - aiservice_artifactory_token: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From 9bf651651ec05d770a98685ed49576939a7ea962 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 09:48:50 -0400 Subject: [PATCH 40/98] Changed values --- instance-applications/113-ibm-aiservice/values.yaml | 8 +------- .../115-ibm-aiservice-tenant/values.yaml | 8 +------- .../templates/00-aiservice-ibm-entitlement.yaml | 3 ++- .../templates/01-aiservice-km-s3-secret.yaml | 2 +- sub-charts/aiservice/values.yaml | 11 ++++++++++- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 56adab636..c05f50690 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,10 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - artifactory_token: "" - aiservice_s3_host: "" - aiservice_s3_port: "" - aiservice_s3_ssl: "true" - aiservice_s3_region: "" - aiservice_s3_accesskey: "" - aiservice_s3_secretkey: "" \ No newline at end of file + app_namespace: " {{ aiservice_namespace }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 15c1531dd..928d3517d 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,10 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - artifactory_token: "" - aiservice_s3_host: "" - aiservice_s3_port: "" - aiservice_s3_ssl: "true" - aiservice_s3_region: "" - aiservice_s3_accesskey: "" - aiservice_s3_secretkey: "" \ No newline at end of file + app_namespace: "{{ tenantNamespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 3a79bbdcc..79f7d2760 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,9 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ .Values.aiservice_namespace }}" + namespace: "{{ .Values.app_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" + token: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index aadcca16f..818649e5f 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -4,7 +4,7 @@ kind: Secret type: Opaque metadata: name: km-s3-secret - namespace: "{{ .Values.aiservice_namespace }}" + namespace: "{{ .Values.app_namespace }}" annotations: argocd.argoproj.io/sync-wave: "147" serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 0e9f74b63..3e6daa4ec 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -1,3 +1,12 @@ --- ibm-entitlement: -km-s3-secret: \ No newline at end of file +km-s3-secret: + +app_namespace: +artifactory_token: "{{ artifactory_token }}" +aiservice_s3_host: "{{ aiservice_s3_host }}" +aiservice_s3_port: "{{ aiservice_s3_port }}" +aiservice_s3_ssl: "{{ aiservice_s3_ssl }}" +aiservice_s3_region: "{{ aiservice_s3_region }}" +aiservice_s3_accesskey: "{{ aiservice_s3_accesskey }}" +aiservice_s3_secretkey: "{{ aiservice_s3_secretkey }}" \ No newline at end of file From 7cf15044e91a33bfb1e4b45abbe0ae7a11237a9a Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 09:56:27 -0400 Subject: [PATCH 41/98] Added .values. --- .../113-ibm-aiservice/values.yaml | 2 +- .../115-ibm-aiservice-tenant/values.yaml | 2 +- sub-charts/aiservice/values.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index c05f50690..335479c33 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: " {{ aiservice_namespace }}" \ No newline at end of file + app_namespace: " {{ .Values.aiservice_namespace }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 928d3517d..6c99e4396 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ tenantNamespace }}" \ No newline at end of file + app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 3e6daa4ec..911acf30c 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -3,10 +3,10 @@ ibm-entitlement: km-s3-secret: app_namespace: -artifactory_token: "{{ artifactory_token }}" -aiservice_s3_host: "{{ aiservice_s3_host }}" -aiservice_s3_port: "{{ aiservice_s3_port }}" -aiservice_s3_ssl: "{{ aiservice_s3_ssl }}" -aiservice_s3_region: "{{ aiservice_s3_region }}" -aiservice_s3_accesskey: "{{ aiservice_s3_accesskey }}" -aiservice_s3_secretkey: "{{ aiservice_s3_secretkey }}" \ No newline at end of file +artifactory_token: "{{ .Values.artifactory_token }}" +aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" +aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" +aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" +aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" +aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" +aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" \ No newline at end of file From 7f0c45e23cb2a4b18bd7f27e3ae60cea096e48ad Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:01:48 -0400 Subject: [PATCH 42/98] Removed quotes --- .../113-ibm-aiservice/values.yaml | 2 +- .../115-ibm-aiservice-tenant/values.yaml | 2 +- .../templates/00-aiservice-ibm-entitlement.yaml | 6 +++--- sub-charts/aiservice/values.yaml | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 335479c33..aeed2eb89 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: " {{ .Values.aiservice_namespace }}" \ No newline at end of file + app_namespace: {{ .Values.aiservice_namespace }} \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 6c99e4396..32ba588e5 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file + app_namespace: {{ .Values.tenantNamespace }} \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 79f7d2760..4d0dba895 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: "{{ .Values.app_namespace }}" + namespace: {{ .Values.app_namespace | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.artifactory_token }}" + token: {{ .Values.artifactory_token | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: {{ .Values.artifactory_token | quote }} \ No newline at end of file diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 911acf30c..89365b5c0 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -3,10 +3,10 @@ ibm-entitlement: km-s3-secret: app_namespace: -artifactory_token: "{{ .Values.artifactory_token }}" -aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" -aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" -aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" -aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" -aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" -aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" \ No newline at end of file +artifactory_token: {{ .Values.artifactory_token }} +aiservice_s3_host: {{ .Values.aiservice_s3_host }} +aiservice_s3_port: {{ .Values.aiservice_s3_port }} +aiservice_s3_ssl: {{ .Values.aiservice_s3_ssl }} +aiservice_s3_region: {{ .Values.aiservice_s3_region }} +aiservice_s3_accesskey: {{ .Values.aiservice_s3_accesskey }} +aiservice_s3_secretkey: {{ .Values.aiservice_s3_secretkey }} \ No newline at end of file From 94ea7bb97e80681048c49b705938529547116187 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:04:08 -0400 Subject: [PATCH 43/98] Added quotes --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- instance-applications/115-ibm-aiservice-tenant/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index aeed2eb89..50c789594 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: {{ .Values.aiservice_namespace }} \ No newline at end of file + app_namespace: {{ .Values.aiservice_namespace | quote }} \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 32ba588e5..7af9fd303 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: {{ .Values.tenantNamespace }} \ No newline at end of file + app_namespace: {{ .Values.tenantNamespace | quote }} \ No newline at end of file From d4a3fa7de7b33b4d8f64f60970d816c216302c50 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:07:18 -0400 Subject: [PATCH 44/98] Added tpl --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- instance-applications/115-ibm-aiservice-tenant/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 50c789594..93587078b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: {{ .Values.aiservice_namespace | quote }} \ No newline at end of file + app_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 7af9fd303..6c99e4396 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: {{ .Values.tenantNamespace | quote }} \ No newline at end of file + app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 4d0dba895..43da2c5e6 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: {{ .Values.app_namespace | quote }} + namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" token: {{ .Values.artifactory_token | quote }} From 365db8984ac54c6b2646a354e8870d4cdc87fe7a Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:10:05 -0400 Subject: [PATCH 45/98] Removed extra values --- sub-charts/aiservice/values.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 89365b5c0..ab05a19a4 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -2,11 +2,4 @@ ibm-entitlement: km-s3-secret: -app_namespace: -artifactory_token: {{ .Values.artifactory_token }} -aiservice_s3_host: {{ .Values.aiservice_s3_host }} -aiservice_s3_port: {{ .Values.aiservice_s3_port }} -aiservice_s3_ssl: {{ .Values.aiservice_s3_ssl }} -aiservice_s3_region: {{ .Values.aiservice_s3_region }} -aiservice_s3_accesskey: {{ .Values.aiservice_s3_accesskey }} -aiservice_s3_secretkey: {{ .Values.aiservice_s3_secretkey }} \ No newline at end of file +app_namespace: \ No newline at end of file From 4f863dcef4b4bc6e53edb39f13ea8ce791af5f68 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:12:39 -0400 Subject: [PATCH 46/98] Added tpl to artifactory --- instance-applications/115-ibm-aiservice-tenant/values.yaml | 3 ++- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 6c99e4396..a0b75101c 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,5 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file + app_namespace: "{{ .Values.tenantNamespace }}" + artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 43da2c5e6..b9e93bc45 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ .Values.artifactory_token | quote }} + token: {{ tpl .Values.artifactory_token . | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ .Values.artifactory_token | quote }} \ No newline at end of file + .dockerconfigjson: {{ tpl .Values.artifactory_token . | quote }} \ No newline at end of file From 49e1f69df2327e1a7b564e1e902a55ebe36ea7ab Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:15:23 -0400 Subject: [PATCH 47/98] Added token variable --- sub-charts/aiservice/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index ab05a19a4..a317f3a83 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -2,4 +2,5 @@ ibm-entitlement: km-s3-secret: -app_namespace: \ No newline at end of file +app_namespace: +artifactory_token: \ No newline at end of file From abee0f252f4b6abaf85770af45513ab2e0756695 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:17:28 -0400 Subject: [PATCH 48/98] Added artifactory token --- instance-applications/113-ibm-aiservice/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 93587078b..122980490 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,5 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file + app_namespace: "{{ .Values.aiservice_namespace }}" + artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file From 682ff8615aa991bc97d4732a0e1379ec72e2e203 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:19:56 -0400 Subject: [PATCH 49/98] Reverted tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b9e93bc45..813c9a2cb 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ tpl .Values.artifactory_token . | quote }} + token: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ tpl .Values.artifactory_token . | quote }} \ No newline at end of file + .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From b13323afe2158ff3803c9472a232a975e57522c5 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:22:58 -0400 Subject: [PATCH 50/98] Added app to artifactory token --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- sub-charts/aiservice/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 122980490..de0a8ad59 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,4 +84,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file + app_artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 813c9a2cb..d7eb5bd40 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.artifactory_token }}" + token: {{ tpl .Values.app_artifactory_token . | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: {{tpl .Values.app_artifactory_token . | quote }} \ No newline at end of file diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index a317f3a83..957afb82a 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -3,4 +3,4 @@ ibm-entitlement: km-s3-secret: app_namespace: -artifactory_token: \ No newline at end of file +app_artifactory_token: \ No newline at end of file From 1d545f0959179b7e26af05702f38a2c903986c10 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 10:25:15 -0400 Subject: [PATCH 51/98] Artifactory token changes --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index de0a8ad59..b0669884e 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,4 +84,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file + app_artifactory_token: "ARTIFACTORY_TOKEN" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index d7eb5bd40..813c9a2cb 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ tpl .Values.app_artifactory_token . | quote }} + token: "{{ .Values.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{tpl .Values.app_artifactory_token . | quote }} \ No newline at end of file + .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file From ec104b7212ebcbddd1320e91bc04b6556771d98a Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:18:16 -0400 Subject: [PATCH 52/98] Added ibm_aiservice --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 813c9a2cb..d75cbb10c 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.artifactory_token }}" + token: "{{ .Values.ibm_aiservice.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file From f75292e3623463c4da6e3bbc2df6fadd58f53b48 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:21:23 -0400 Subject: [PATCH 53/98] Added tpl back --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index b0669884e..eb17b95b5 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,4 +84,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "ARTIFACTORY_TOKEN" \ No newline at end of file + app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index d75cbb10c..4b035b599 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.ibm_aiservice.artifactory_token }}" + token: {{ .Values.app_artifactory_token . | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: {{ .Values.app_artifactory_token . | quote }} \ No newline at end of file From 9807357b87d749f9ecdc51dbc34e5b3bb784c435 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:23:29 -0400 Subject: [PATCH 54/98] More fixing tpl --- instance-applications/115-ibm-aiservice-tenant/values.yaml | 2 +- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index a0b75101c..0fe372a7c 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -47,4 +47,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: app_namespace: "{{ .Values.tenantNamespace }}" - artifactory_token: "{{ .Values.artifactory_token }}" \ No newline at end of file + app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 4b035b599..aed0461ef 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ .Values.app_artifactory_token . | quote }} + token: {{ tpl .Values.app_artifactory_token . | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ .Values.app_artifactory_token . | quote }} \ No newline at end of file + .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote }} \ No newline at end of file From 4e0e35d3d5e94f7e2ef183d5f6c215417d3e05e5 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:27:18 -0400 Subject: [PATCH 55/98] Removed tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index aed0461ef..4a52c9e8a 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ tpl .Values.app_artifactory_token . | quote }} + token: "{{ .Values.app_artifactory_token }}"" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote }} \ No newline at end of file + .dockerconfigjson: "{{ .Values.app_artifactory_token }}"" \ No newline at end of file From f0a22612559e6a7a5efb929e886e4be8de6ba659 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:33:55 -0400 Subject: [PATCH 56/98] Added ibm_asiervice --- .../113-ibm-aiservice/values.yaml | 3 +-- .../115-ibm-aiservice-tenant/values.yaml | 3 +-- .../00-aiservice-ibm-entitlement.yaml | 4 ++-- .../templates/01-aiservice-km-s3-secret.yaml | 24 +++++++++---------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index eb17b95b5..93587078b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,5 +83,4 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file + app_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 0fe372a7c..6c99e4396 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,5 +46,4 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ .Values.tenantNamespace }}" - app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file + app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 4a52c9e8a..6b0b48db1 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.app_artifactory_token }}"" + token: "{{ .Values.ibm_aiservice.artifactory_token }}"" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.app_artifactory_token }}"" \ No newline at end of file + .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}"" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index 818649e5f..a887dc8b0 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -4,22 +4,22 @@ kind: Secret type: Opaque metadata: name: km-s3-secret - namespace: "{{ .Values.app_namespace }}" + namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "147" - serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" - {{- if eq .Values.aiservice_s3_ssl "false" }} + serving.kserve.io/s3-endpoint: "{{ .Values.ibm_aiservice.aiservice_s3_host }}:{{ .Values.ibm_aiservice.aiservice_s3_port }}" + {{- if eq .Values.ibm_aiservice.aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" {{- else }} serving.kserve.io/s3-usehttps: "1" {{- end }} - serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" + serving.kserve.io/s3-region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" data: - AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_ACCESS_KEY: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - S3_SECRET_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_HOST: {{ .Values.aiservice_s3_host | default "" | toString | b64enc | quote }} - S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }} - S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }} - S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }} + AWS_ACCESS_KEY_ID: {{ .Values.ibm_aiservice.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + AWS_SECRET_ACCESS_KEY: {{ .Values.ibm_aiservice.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_ACCESS_KEY: {{ .Values.ibm_aiservice.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + S3_SECRET_KEY: {{ .Values.ibm_aiservice.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_HOST: {{ .Values.ibm_aiservice.aiservice_s3_host | default "" | toString | b64enc | quote }} + S3_PORT: {{ .Values.ibm_aiservice.aiservice_s3_port | default "" | toString | b64enc | quote }} + S3_REGION: {{ .Values.ibm_aiservice.aiservice_s3_region | default "" | toString | b64enc | quote }} + S3_SSL: {{ .Values.ibm_aiservice.aiservice_s3_ssl | default true | toString | b64enc | quote }} From 3d209869c277f64700afb640d20a325d00832c60 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 11:41:16 -0400 Subject: [PATCH 57/98] Removed extra quotations --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 6b0b48db1..d75cbb10c 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.ibm_aiservice.artifactory_token }}"" + token: "{{ .Values.ibm_aiservice.artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}"" \ No newline at end of file + .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file From a6ea44f56513c01e2d8658f6ec27f42fcff74928 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Tue, 11 Aug 2026 13:00:35 -0400 Subject: [PATCH 58/98] Changed to app variables --- .../113-ibm-aiservice/values.yaml | 9 +++++++- .../115-ibm-aiservice-tenant/values.yaml | 9 +++++++- .../00-aiservice-ibm-entitlement.yaml | 4 ++-- .../templates/01-aiservice-km-s3-secret.yaml | 22 +++++++++---------- sub-charts/aiservice/values.yaml | 8 ++++++- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 93587078b..fbc72e96d 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,4 +83,11 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: "{{ .Values.aiservice_namespace }}" \ No newline at end of file + app_namespace: "{{ .Values.ibm_aiservice.aiservice_namespace }}" + app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" + app_aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 6c99e4396..0d4ab43d8 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,4 +46,11 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ .Values.tenantNamespace }}" \ No newline at end of file + app_namespace: "{{ .Values.ibm_aiservice_tenant.tenantNamespace }}" + app_artifactory_token: "{{ .Values.ibm_aiservice_tenant.artifactory_token }}" + app_aiservice_s3_host: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_secretkey }}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index d75cbb10c..305453e5f 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.ibm_aiservice.artifactory_token }}" + token: {{ tpl .Values.app_artifactory_token . | quote}} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.ibm_aiservice.artifactory_token }}" \ No newline at end of file + .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote}}" \ No newline at end of file diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index a887dc8b0..f2480a0aa 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -7,19 +7,19 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "147" - serving.kserve.io/s3-endpoint: "{{ .Values.ibm_aiservice.aiservice_s3_host }}:{{ .Values.ibm_aiservice.aiservice_s3_port }}" - {{- if eq .Values.ibm_aiservice.aiservice_s3_ssl "false" }} + serving.kserve.io/s3-endpoint: "{{ .Values.app_aiservice_s3_host }}:{{ .Values.app_aiservice_s3_port }}" + {{- if eq .Values.app_aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" {{- else }} serving.kserve.io/s3-usehttps: "1" {{- end }} - serving.kserve.io/s3-region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" + serving.kserve.io/s3-region: "{{ .Values.app_aiservice_s3_region }}" data: - AWS_ACCESS_KEY_ID: {{ .Values.ibm_aiservice.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - AWS_SECRET_ACCESS_KEY: {{ .Values.ibm_aiservice.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_ACCESS_KEY: {{ .Values.ibm_aiservice.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - S3_SECRET_KEY: {{ .Values.ibm_aiservice.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_HOST: {{ .Values.ibm_aiservice.aiservice_s3_host | default "" | toString | b64enc | quote }} - S3_PORT: {{ .Values.ibm_aiservice.aiservice_s3_port | default "" | toString | b64enc | quote }} - S3_REGION: {{ .Values.ibm_aiservice.aiservice_s3_region | default "" | toString | b64enc | quote }} - S3_SSL: {{ .Values.ibm_aiservice.aiservice_s3_ssl | default true | toString | b64enc | quote }} + AWS_ACCESS_KEY_ID: {{ .Values.app_aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + AWS_SECRET_ACCESS_KEY: {{ .Values.app_aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_ACCESS_KEY: {{ .Values.app_aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + S3_SECRET_KEY: {{ .Values.app_aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_HOST: {{ .Values.app_aiservice_s3_host | default "" | toString | b64enc | quote }} + S3_PORT: {{ .Values.app_aiservice_s3_port | default "" | toString | b64enc | quote }} + S3_REGION: {{ .Values.app_aiservice_s3_region | default "" | toString | b64enc | quote }} + S3_SSL: {{ .Values.app_aiservice_s3_ssl | default true | toString | b64enc | quote }} diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 957afb82a..0792ce96e 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -3,4 +3,10 @@ ibm-entitlement: km-s3-secret: app_namespace: -app_artifactory_token: \ No newline at end of file +app_artifactory_token: +app_aiservice_s3_host: +app_aiservice_s3_port: +app_aiservice_s3_ssl: +app_aiservice_s3_region: +app_aiservice_s3_accesskey: +app_aiservice_s3_secretkey: From b17119ce1f650a9820460fd089af908158344c34 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:32:55 -0400 Subject: [PATCH 59/98] Removed extra quote --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 305453e5f..2badc06de 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -9,4 +9,4 @@ metadata: token: {{ tpl .Values.app_artifactory_token . | quote}} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote}}" \ No newline at end of file + .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote}} From 9dd60816a30ab0c54b8b8469c0694e82624e0346 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:36:15 -0400 Subject: [PATCH 60/98] Removed tpl --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 2badc06de..90669789b 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ tpl .Values.app_artifactory_token . | quote}} + token: {{ .Values.app_artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote}} + .dockerconfigjson: {{ .Values.app_artifactory_token }} From a876a916512fe53da614c8a6da89a1355d2f25d2 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:39:13 -0400 Subject: [PATCH 61/98] Changed namespace --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index fbc72e96d..ed993858b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -83,7 +83,7 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: - app_namespace: "{{ .Values.ibm_aiservice.aiservice_namespace }}" + app_namespace: "{{ .Values.aiservice_namespace }}" app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" app_aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" app_aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" From afe0d6e97274059b9210f251e006697ef6fc17f7 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:41:28 -0400 Subject: [PATCH 62/98] Removed center of value variables --- .../113-ibm-aiservice/values.yaml | 14 +++++++------- .../115-ibm-aiservice-tenant/values.yaml | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index ed993858b..ac6c58539 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,10 +84,10 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" \ No newline at end of file + app_artifactory_token: "{{ .Values.artifactory_token }}" + app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 0d4ab43d8..043ef1bb0 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -46,11 +46,11 @@ tenant_scheduling_config: {} #AIService Values aiservice: - app_namespace: "{{ .Values.ibm_aiservice_tenant.tenantNamespace }}" - app_artifactory_token: "{{ .Values.ibm_aiservice_tenant.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_secretkey }}" \ No newline at end of file + app_namespace: "{{ .Values.tenantNamespace }}" + app_artifactory_token: "{{ .Values.artifactory_token }}" + app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" From 07e18fe1bd105161db5696e11968f03d5c9788e6 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:45:17 -0400 Subject: [PATCH 63/98] Added quotations back --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 90669789b..dd0edd445 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ .Values.app_artifactory_token }} + token: "{{ .Values.app_artifactory_token }}"" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ .Values.app_artifactory_token }} + .dockerconfigjson: "{{ .Values.app_artifactory_token }}"" From 867fe9cd0ec224325b2ad91ee30903966def1ecb Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:46:42 -0400 Subject: [PATCH 64/98] Removed extra quote --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index dd0edd445..85c84f3e4 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.app_artifactory_token }}"" + token: "{{ .Values.app_artifactory_token }}" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.app_artifactory_token }}"" + .dockerconfigjson: "{{ .Values.app_artifactory_token }}" From 96a3585e287bcba15a07ba3489a961d1c7149f2d Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:48:47 -0400 Subject: [PATCH 65/98] Added tpl to entitlement --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 85c84f3e4..86282a241 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ tpl .Values.app_namespace . | quote }} annotations: argocd.argoproj.io/sync-wave: "146" - token: "{{ .Values.app_artifactory_token }}" + token: {{ tpl .Values.app_artifactory_token . | quote }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.app_artifactory_token }}" + .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote }} From c45c757b658ef2617bd93b66028db73943f7ae84 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:50:59 -0400 Subject: [PATCH 66/98] added ibm_airservice back --- .../113-ibm-aiservice/values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index ac6c58539..3bcbb117b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,10 +84,10 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" + app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" + app_aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" From 16d87529ea592229f1d7ac2477863ca0aa4a4302 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:56:54 -0400 Subject: [PATCH 67/98] Just kept artifactory token ibm_aiservice --- instance-applications/113-ibm-aiservice/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 3bcbb117b..5b4d960e0 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -85,9 +85,9 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.ibm_aiservice.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.ibm_aiservice.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.ibm_aiservice.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.ibm_aiservice.aiservice_s3_secretkey }}" + app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" + app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" + app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" + app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" + app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" + app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" From d05d122072aa550163fab4ad144b890bc991f1fd Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 10:57:53 -0400 Subject: [PATCH 68/98] Removed ibm_aiservice --- instance-applications/113-ibm-aiservice/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 5b4d960e0..ac6c58539 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -84,7 +84,7 @@ mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" #AIService Values aiservice: app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.ibm_aiservice.artifactory_token }}" + app_artifactory_token: "{{ .Values.artifactory_token }}" app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" From 95898481ba8bb6eb4610ffd437502958cadede8f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:16:39 -0400 Subject: [PATCH 69/98] Values not passed down --- instance-applications/113-ibm-aiservice/values.yaml | 11 ----------- .../templates/00-aiservice-ibm-entitlement.yaml | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index ac6c58539..6c52ae3cf 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -80,14 +80,3 @@ is_gitops_fvt_env: "false" #TENANT mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" - -#AIService Values -aiservice: - app_namespace: "{{ .Values.aiservice_namespace }}" - app_artifactory_token: "{{ .Values.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 86282a241..32936b65d 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: {{ tpl .Values.app_namespace . | quote }} + namespace: {{ .Values.app_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ tpl .Values.app_artifactory_token . | quote }} + token: {{ .Values.artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{ tpl .Values.app_artifactory_token . | quote }} + .dockerconfigjson: {{.Values.app_artifactory_token }} From 76c68849402b193b3f8f85f31e0d350483d79e6d Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:20:35 -0400 Subject: [PATCH 70/98] Reverted --- .../115-ibm-aiservice-tenant/values.yaml | 11 --------- .../00-aiservice-ibm-entitlement.yaml | 4 ++-- .../templates/01-aiservice-km-s3-secret.yaml | 24 +++++++++---------- sub-charts/aiservice/values.yaml | 9 ------- 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml index 043ef1bb0..aa9262860 100644 --- a/instance-applications/115-ibm-aiservice-tenant/values.yaml +++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml @@ -43,14 +43,3 @@ tenant_entitlement_end_date: "2049-11-11" # Tenant scheduling configuration (optional, requires catalog_channel 9.2.x+) tenant_scheduling_config: {} - -#AIService Values -aiservice: - app_namespace: "{{ .Values.tenantNamespace }}" - app_artifactory_token: "{{ .Values.artifactory_token }}" - app_aiservice_s3_host: "{{ .Values.aiservice_s3_host }}" - app_aiservice_s3_port: "{{ .Values.aiservice_s3_port }}" - app_aiservice_s3_ssl: "{{ .Values.aiservice_s3_ssl }}" - app_aiservice_s3_region: "{{ .Values.aiservice_s3_region }}" - app_aiservice_s3_accesskey: "{{ .Values.aiservice_s3_accesskey }}" - app_aiservice_s3_secretkey: "{{ .Values.aiservice_s3_secretkey }}" diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 32936b65d..b2c2e8d60 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: {{ .Values.app_namespace }} + namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" token: {{ .Values.artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{.Values.app_artifactory_token }} + .dockerconfigjson: {{.Values.aiservice_artifactory_token }} diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml index f2480a0aa..42b414944 100644 --- a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml @@ -4,22 +4,22 @@ kind: Secret type: Opaque metadata: name: km-s3-secret - namespace: {{ tpl .Values.app_namespace . | quote }} + namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "147" - serving.kserve.io/s3-endpoint: "{{ .Values.app_aiservice_s3_host }}:{{ .Values.app_aiservice_s3_port }}" - {{- if eq .Values.app_aiservice_s3_ssl "false" }} + serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" + {{- if eq .Values.aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" {{- else }} serving.kserve.io/s3-usehttps: "1" {{- end }} - serving.kserve.io/s3-region: "{{ .Values.app_aiservice_s3_region }}" + serving.kserve.io/s3-region: "{{ .Values.aiservice_s3_region }}" data: - AWS_ACCESS_KEY_ID: {{ .Values.app_aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - AWS_SECRET_ACCESS_KEY: {{ .Values.app_aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_ACCESS_KEY: {{ .Values.app_aiservice_s3_accesskey | default "" | toString | b64enc | quote }} - S3_SECRET_KEY: {{ .Values.app_aiservice_s3_secretkey | default "" | toString | b64enc | quote }} - S3_HOST: {{ .Values.app_aiservice_s3_host | default "" | toString | b64enc | quote }} - S3_PORT: {{ .Values.app_aiservice_s3_port | default "" | toString | b64enc | quote }} - S3_REGION: {{ .Values.app_aiservice_s3_region | default "" | toString | b64enc | quote }} - S3_SSL: {{ .Values.app_aiservice_s3_ssl | default true | toString | b64enc | quote }} + AWS_ACCESS_KEY_ID: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + AWS_SECRET_ACCESS_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_ACCESS_KEY: {{ .Values.aiservice_s3_accesskey | default "" | toString | b64enc | quote }} + S3_SECRET_KEY: {{ .Values.aiservice_s3_secretkey | default "" | toString | b64enc | quote }} + S3_HOST: {{ .Values.aiservice_s3_host | default "" | toString | b64enc | quote }} + S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }} + S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }} + S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }} diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 0792ce96e..71603f75d 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -1,12 +1,3 @@ --- ibm-entitlement: km-s3-secret: - -app_namespace: -app_artifactory_token: -app_aiservice_s3_host: -app_aiservice_s3_port: -app_aiservice_s3_ssl: -app_aiservice_s3_region: -app_aiservice_s3_accesskey: -app_aiservice_s3_secretkey: From 403137e785fa8ef4920daf84f7ae129a3358b2fe Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:25:10 -0400 Subject: [PATCH 71/98] Added ibm_aiservice --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index b2c2e8d60..4f0b6dba8 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: {{ .Values.aiservice_namespace }} + namespace: {{ .Values.ibm_aiservice.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ .Values.artifactory_token }} + token: {{ .Values.ibm_aiservice.artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{.Values.aiservice_artifactory_token }} + .dockerconfigjson: {{.Values.ibm_aiservice.artifactory_token }} From 768e028fe8c307a8a1aa7e837e3b5514b9dc2226 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:25:52 -0400 Subject: [PATCH 72/98] Kept namespace --- .../aiservice/templates/00-aiservice-ibm-entitlement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml index 4f0b6dba8..ece806fe6 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: ibm-entitlement - namespace: {{ .Values.ibm_aiservice.aiservice_namespace }} + namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" token: {{ .Values.ibm_aiservice.artifactory_token }} From 2b21d6d84fafffe16fb9529c7eada7060852d06f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:27:38 -0400 Subject: [PATCH 73/98] Added condition --- instance-applications/113-ibm-aiservice/Chart.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/Chart.yaml b/instance-applications/113-ibm-aiservice/Chart.yaml index da5a3cabf..0d40934f0 100644 --- a/instance-applications/113-ibm-aiservice/Chart.yaml +++ b/instance-applications/113-ibm-aiservice/Chart.yaml @@ -11,4 +11,6 @@ dependencies: condition: junitreporter.devops_mongo_uri != "" - name: aiservice version: 1.0.0 - repository: "file://../../sub-charts/aiservice/" \ No newline at end of file + repository: "file://../../sub-charts/aiservice/" + condition: aiservice.ibm-entitlement != "" + \ No newline at end of file From 1e75434325d6191bb79b49a1160488dad1320157 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:29:34 -0400 Subject: [PATCH 74/98] Added presync --- ...tlement.yaml => 00-presync-aiservice-ibm-entitlement.yaml} | 4 ++-- ...-s3-secret.yaml => 01-presync-aiservice-km-s3-secret.yaml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename sub-charts/aiservice/templates/{00-aiservice-ibm-entitlement.yaml => 00-presync-aiservice-ibm-entitlement.yaml} (63%) rename sub-charts/aiservice/templates/{01-aiservice-km-s3-secret.yaml => 01-presync-aiservice-km-s3-secret.yaml} (100%) diff --git a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml similarity index 63% rename from sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml rename to sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml index ece806fe6..220b18d39 100644 --- a/sub-charts/aiservice/templates/00-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" - token: {{ .Values.ibm_aiservice.artifactory_token }} + token: {{ .Values.artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{.Values.ibm_aiservice.artifactory_token }} + .dockerconfigjson: {{.Values.artifactory_token }} diff --git a/sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml similarity index 100% rename from sub-charts/aiservice/templates/01-aiservice-km-s3-secret.yaml rename to sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml From 1c27c6061728e9c5da3e73a853103bbc9d95f4bd Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:32:38 -0400 Subject: [PATCH 75/98] Added hooks --- .../templates/00-presync-aiservice-ibm-entitlement.yaml | 2 ++ .../aiservice/templates/01-presync-aiservice-km-s3-secret.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml index 220b18d39..2e82da26a 100644 --- a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml @@ -6,6 +6,8 @@ metadata: namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/hook-delete-policy: HookSucceeded,BeforeHookCreation token: {{ .Values.artifactory_token }} type: kubernetes.io/dockerconfigjson data: diff --git a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml index 42b414944..7d0a9fb2a 100644 --- a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml @@ -7,6 +7,8 @@ metadata: namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "147" + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/hook-delete-policy: HookSucceeded,BeforeHookCreation serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" {{- if eq .Values.aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 34e9662bef1d21f05e4df33167e9f297bbc384e7 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 11:34:51 -0400 Subject: [PATCH 76/98] Removed deletion --- .../templates/00-presync-aiservice-ibm-entitlement.yaml | 1 - .../aiservice/templates/01-presync-aiservice-km-s3-secret.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml index 2e82da26a..a455a4612 100644 --- a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml @@ -7,7 +7,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" argocd.argoproj.io/hook: PreSync - argocd.argoproj.io/hook-delete-policy: HookSucceeded,BeforeHookCreation token: {{ .Values.artifactory_token }} type: kubernetes.io/dockerconfigjson data: diff --git a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml index 7d0a9fb2a..8dd5ed0b4 100644 --- a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml @@ -8,7 +8,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "147" argocd.argoproj.io/hook: PreSync - argocd.argoproj.io/hook-delete-policy: HookSucceeded,BeforeHookCreation serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" {{- if eq .Values.aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 40334692253d521f74467bafdb1130fce6b276ce Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:13:03 -0400 Subject: [PATCH 77/98] Added job to update values --- .../templates/05-aiservice-subchart.yaml | 65 +++++++++++++++++++ .../00-presync-aiservice-ibm-entitlement.yaml | 5 +- .../01-presync-aiservice-km-s3-secret.yaml | 1 - sub-charts/aiservice/values.yaml | 2 + 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml new file mode 100644 index 000000000..8d0e55fce --- /dev/null +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -0,0 +1,65 @@ +{{- if .Values.application_admin_role }} +{{- $_job_name_prefix := "aiservice-subchart" }} +{{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} +{{- $_job_config_values := omit .Values "junitreporter" }} +{{- $_job_version := "v5" }} +{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} +{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash ) }} +{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: aiservice-subchart-job-{{ .Values.tenantNamespace }} + namespace: {{ .Values.aiservice_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "305" +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ $_job_name }} + namespace: {{ .Values.aiservice_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "307" + labels: + mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + template: + metadata: + labels: + app: sync-job +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + spec: + serviceAccountName: aiservice-subchart-job-{{ .Values.tenantNamespace }} + restartPolicy: OnFailure + containers: + - name: aiservice-subchart + image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} + imagePullPolicy: IfNotPresent + env: + - name: SOURCE_NAMESPACE + value: "{{ .Values.aiservice_namespace }}" + - name: TARGET_NAMESPACE + value: "{{ .Values.tenantNamespace }}" + - name: ARTIFACTORY_TOKEN + value: "{{ .Values.artifactory_token }}" + + command: + - /bin/sh + - -c + - | + set -e + + helm install ./aiservice --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + argocd app get ibm-entitlement --hard-refresh + + done + echo "All secrets copied successfully" +{{- end }} diff --git a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml index a455a4612..967379cd6 100644 --- a/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml +++ b/sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml @@ -6,8 +6,7 @@ metadata: namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "146" - argocd.argoproj.io/hook: PreSync - token: {{ .Values.artifactory_token }} + token: {{ .Values.app_artifactory_token }} type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: {{.Values.artifactory_token }} + .dockerconfigjson: {{.Values.app_artifactory_token }} diff --git a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml index 8dd5ed0b4..42b414944 100644 --- a/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml +++ b/sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml @@ -7,7 +7,6 @@ metadata: namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "147" - argocd.argoproj.io/hook: PreSync serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}" {{- if eq .Values.aiservice_s3_ssl "false" }} serving.kserve.io/s3-usehttps: "0" diff --git a/sub-charts/aiservice/values.yaml b/sub-charts/aiservice/values.yaml index 71603f75d..7d8536397 100644 --- a/sub-charts/aiservice/values.yaml +++ b/sub-charts/aiservice/values.yaml @@ -1,3 +1,5 @@ --- ibm-entitlement: km-s3-secret: + +app_artifactory_token: From af261f05114249dbeb8d4e5028d12cb793485050 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:17:38 -0400 Subject: [PATCH 78/98] Added network policy --- .../templates/05-aiservice-subchart.yaml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 8d0e55fce..f94f2bbe1 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -14,7 +14,23 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "305" + argocd.argoproj.io/sync-wave: "280" +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name:aiservice-subchart-job-{{ .Values.tenantNamespace }} + namespace: "{{ .Values.aiservice_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "281" +spec: + podSelector: + matchLabels: + app: sync-job + egress: + - {} + policyTypes: + - Egress --- apiVersion: batch/v1 kind: Job @@ -22,7 +38,7 @@ metadata: name: {{ $_job_name }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "307" + argocd.argoproj.io/sync-wave: "282" labels: mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} {{- if .Values.custom_labels }} From dda229159285a17954bf4932e0b92a56522ee3f9 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:26:47 -0400 Subject: [PATCH 79/98] Changed sync order --- .../templates/05-aiservice-subchart.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index f94f2bbe1..fe9bcde96 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -14,15 +14,15 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "280" + argocd.argoproj.io/sync-wave: "143" --- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name:aiservice-subchart-job-{{ .Values.tenantNamespace }} + name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: "{{ .Values.aiservice_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "281" + argocd.argoproj.io/sync-wave: "144" spec: podSelector: matchLabels: @@ -38,7 +38,7 @@ metadata: name: {{ $_job_name }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "282" + argocd.argoproj.io/sync-wave: "145" labels: mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} {{- if .Values.custom_labels }} @@ -74,7 +74,6 @@ spec: set -e helm install ./aiservice --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN - argocd app get ibm-entitlement --hard-refresh done echo "All secrets copied successfully" From c4659067c1b0dd6540c5d265ebbb7a96b77216d1 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:29:38 -0400 Subject: [PATCH 80/98] Changed sync wave --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index fe9bcde96..bad2fc3a3 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -14,7 +14,7 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "143" + argocd.argoproj.io/sync-wave: "305" --- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy @@ -22,7 +22,7 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: "{{ .Values.aiservice_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "144" + argocd.argoproj.io/sync-wave: "306" spec: podSelector: matchLabels: @@ -38,7 +38,7 @@ metadata: name: {{ $_job_name }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "145" + argocd.argoproj.io/sync-wave: "307" labels: mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} {{- if .Values.custom_labels }} From 07d45bbf7737797d6c80fbfc14ae1e6203ffc2c2 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:30:50 -0400 Subject: [PATCH 81/98] Changed presync --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index bad2fc3a3..9f9cf5fda 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -14,7 +14,7 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "305" + argocd.argoproj.io/sync-wave: "137" --- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy @@ -22,7 +22,7 @@ metadata: name: aiservice-subchart-job-{{ .Values.tenantNamespace }} namespace: "{{ .Values.aiservice_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "306" + argocd.argoproj.io/sync-wave: "138" spec: podSelector: matchLabels: @@ -38,7 +38,7 @@ metadata: name: {{ $_job_name }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "307" + argocd.argoproj.io/sync-wave: "139" labels: mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} {{- if .Values.custom_labels }} From bc9cb29bf47df05d7611b15c86ee7c6bd24ee727 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:32:29 -0400 Subject: [PATCH 82/98] Changed to aiservice namespace --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 9f9cf5fda..e494b65aa 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -11,7 +11,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: aiservice-subchart-job-{{ .Values.tenantNamespace }} + name: aiservice-subchart-job-{{ .Values.aiservice_namespace }} namespace: {{ .Values.aiservice_namespace }} annotations: argocd.argoproj.io/sync-wave: "137" @@ -19,7 +19,7 @@ metadata: apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: aiservice-subchart-job-{{ .Values.tenantNamespace }} + name: aiservice-subchart-job-{{ .Values.aiservice_namespace }} namespace: "{{ .Values.aiservice_namespace }}" annotations: argocd.argoproj.io/sync-wave: "138" @@ -53,7 +53,7 @@ spec: {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} spec: - serviceAccountName: aiservice-subchart-job-{{ .Values.tenantNamespace }} + serviceAccountName: aiservice-subchart-job-{{ .Values.aiservice_namespace }} restartPolicy: OnFailure containers: - name: aiservice-subchart From 19a7a3f50985cc925e46b0cc9508fd8d4bf64b23 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:38:08 -0400 Subject: [PATCH 83/98] Added Roles --- .../templates/05-aiservice-subchart.yaml | 49 ++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index e494b65aa..c1510d5a7 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -2,7 +2,7 @@ {{- $_job_name_prefix := "aiservice-subchart" }} {{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }} {{- $_job_config_values := omit .Values "junitreporter" }} -{{- $_job_version := "v5" }} +{{- $_job_version := "v1" }} {{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} {{- $_job_name := join "-" (list $_job_name_prefix $_job_hash ) }} {{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} @@ -11,18 +11,55 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: aiservice-subchart-job-{{ .Values.aiservice_namespace }} + name: aiservice-subchart-job namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "137" + argocd.argoproj.io/hook: PreSync +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: aiservice-subchart-job + namespace: "{{ .Values.aiservice_namespace }}" + annotations: + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/hook-delete-policy: BeforeHookCreation +rules: + - apiGroups: ["apps"] + resources: ["deployments"] + verbs: ["get", "list", "patch", "delete"] + - apiGroups: [""] + resources: ["secrets", "configmaps", "serviceaccounts"] + verbs: ["get", "list", "patch", "delete"] + - apiGroups: ["operators.coreos.com"] + resources: ["subscriptions", "clusterserviceversions"] + verbs: ["get", "list"] + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: aiservice-subchart-job + namespace: "{{ .Values.aiservice_namespace }}" + annotations: + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/hook-delete-policy: BeforeHookCreation +subjects: + - kind: ServiceAccount + name: postsync-aiservice-migration + namespace: "{{ .Values.aiservice_namespace }}" +roleRef: + kind: Role + name: postsync-aiservice-migration + apiGroup: rbac.authorization.k8s.io --- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: aiservice-subchart-job-{{ .Values.aiservice_namespace }} + name: aiservice-subchart-job namespace: "{{ .Values.aiservice_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "138" + argocd.argoproj.io/hook: PreSync spec: podSelector: matchLabels: @@ -38,7 +75,7 @@ metadata: name: {{ $_job_name }} namespace: {{ .Values.aiservice_namespace }} annotations: - argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/hook: PreSync labels: mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} {{- if .Values.custom_labels }} From 4d017683f2ea89f1e4b519b6da3b3050d281b72a Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:41:53 -0400 Subject: [PATCH 84/98] Fixed service account name --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index c1510d5a7..bf0f7fd0a 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -90,7 +90,7 @@ spec: {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} spec: - serviceAccountName: aiservice-subchart-job-{{ .Values.aiservice_namespace }} + serviceAccountName: aiservice-subchart-job restartPolicy: OnFailure containers: - name: aiservice-subchart From e263d1063432cb4fe341c9494c53702976604b0f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:47:47 -0400 Subject: [PATCH 85/98] Added release --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index bf0f7fd0a..08a2e5b88 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -103,6 +103,8 @@ spec: value: "{{ .Values.tenantNamespace }}" - name: ARTIFACTORY_TOKEN value: "{{ .Values.artifactory_token }}" + -name: RELEASE_NAME + value: "{{ .Release.Name }}" command: - /bin/sh @@ -110,7 +112,8 @@ spec: - | set -e - helm install ./aiservice --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" + helm install $RELEASE_NAME ./aiservice --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From b1e25cb6f7e460b59450346ef19a96a2be7ea509 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:55:45 -0400 Subject: [PATCH 86/98] Fixed whitespace --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 08a2e5b88..223a2058b 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -103,7 +103,7 @@ spec: value: "{{ .Values.tenantNamespace }}" - name: ARTIFACTORY_TOKEN value: "{{ .Values.artifactory_token }}" - -name: RELEASE_NAME + - name: RELEASE_NAME value: "{{ .Release.Name }}" command: From 4883ea148c7c9fead0da1e7c296fdead2104599c Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 12:57:43 -0400 Subject: [PATCH 87/98] Changed file location --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 223a2058b..3bbf61ea1 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -113,7 +113,7 @@ spec: set -e echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME ./aiservice --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + helm install $RELEASE_NAME file://../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From 6e473748e765b655228813db4824bc6b433d0e5f Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:00:16 -0400 Subject: [PATCH 88/98] Directory fixed --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 3bbf61ea1..12fc5a5d9 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -113,7 +113,7 @@ spec: set -e echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME file://../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + helm install $RELEASE_NAME ../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From 6ac6d49b4c3d755737bf6532a0af37c36e759a31 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:09:02 -0400 Subject: [PATCH 89/98] Checking pwd --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 12fc5a5d9..9f2cf65bb 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -112,8 +112,9 @@ spec: - | set -e + echo $pwd echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME ../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + helm install $RELEASE_NAME ../../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From bdabd5b55acc49e9a923619f0e139ffffc3364e5 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:12:24 -0400 Subject: [PATCH 90/98] Added ls as well --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 9f2cf65bb..8cf5f1399 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -112,7 +112,8 @@ spec: - | set -e - echo $pwd + echo pwd + echo ls echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" helm install $RELEASE_NAME ../../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN From 1251b218b266b0f9389c882e4cdd1c3e105fac95 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:15:52 -0400 Subject: [PATCH 91/98] Fixed echos --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 8cf5f1399..b499edc13 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -112,8 +112,8 @@ spec: - | set -e - echo pwd - echo ls + echo $(pwd) + echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" helm install $RELEASE_NAME ../../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN From d151ae2909b685bd9b8c6372a6d4f31961837d89 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:22:44 -0400 Subject: [PATCH 92/98] changed directory path --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index b499edc13..9cb7819c5 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -113,9 +113,9 @@ spec: set -e echo $(pwd) - echo $(ls) + echo $(ls ..) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME ../../../sub-charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + helm install $RELEASE_NAME ../charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From 94d40a77ffd35d99c745ceb6638f42da83de6309 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:26:13 -0400 Subject: [PATCH 93/98] Setting aiservice value --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 4 ++-- instance-applications/113-ibm-aiservice/values.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 9cb7819c5..b23ea31df 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -113,9 +113,9 @@ spec: set -e echo $(pwd) - echo $(ls ..) + echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME ../charts/aiservice/ --set .Values.app_artifactory_token=$ARTIFACTORY_TOKEN + helm install $RELEASE_NAME $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" diff --git a/instance-applications/113-ibm-aiservice/values.yaml b/instance-applications/113-ibm-aiservice/values.yaml index 6c52ae3cf..cecd2f25b 100644 --- a/instance-applications/113-ibm-aiservice/values.yaml +++ b/instance-applications/113-ibm-aiservice/values.yaml @@ -80,3 +80,7 @@ is_gitops_fvt_env: "false" #TENANT mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}" + +#AIService Values +aiservice: + app_artifactory_token: From 0555830e60e0e8858fc9aa471b8a89880a981f7c Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:29:17 -0400 Subject: [PATCH 94/98] Template instead of install --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index b23ea31df..d47441db4 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -115,7 +115,7 @@ spec: echo $(pwd) echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm install $RELEASE_NAME $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN + helm template $RELEASE_NAME $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From 3cb209cb40adc3d428d005b70bef99c691c24434 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:38:56 -0400 Subject: [PATCH 95/98] Going to aiservice directory --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index d47441db4..b2a0b1ab1 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -115,7 +115,7 @@ spec: echo $(pwd) echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm template $RELEASE_NAME $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN + helm template $RELEASE_NAME ./aiservice --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN done echo "All secrets copied successfully" From 32c55ed16630d16da6ae46908f63b40fb850a4ec Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:49:11 -0400 Subject: [PATCH 96/98] Using upgrade --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index b2a0b1ab1..3f1781e35 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -115,8 +115,8 @@ spec: echo $(pwd) echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm template $RELEASE_NAME ./aiservice --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN + helm list -n $SOURCE_NAMESPACE + helm upgrade ibm-aiservice $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN - done echo "All secrets copied successfully" {{- end }} From fa10715209bcbe0c5f3fb1f96137b58aea225069 Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:50:15 -0400 Subject: [PATCH 97/98] Removed list since it is not allowed --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 3f1781e35..41665b92c 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -115,7 +115,6 @@ spec: echo $(pwd) echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm list -n $SOURCE_NAMESPACE helm upgrade ibm-aiservice $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN echo "All secrets copied successfully" From 356ea1044c1174cb299ed87acff4a72ce38898cf Mon Sep 17 00:00:00 2001 From: Max Robakiewicz Date: Fri, 14 Aug 2026 13:56:02 -0400 Subject: [PATCH 98/98] Added dependency update --- .../113-ibm-aiservice/templates/05-aiservice-subchart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml index 41665b92c..79ce6cb35 100644 --- a/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml +++ b/instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml @@ -112,10 +112,11 @@ spec: - | set -e + helm dependency update echo $(pwd) echo $(ls) echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN" - helm upgrade ibm-aiservice $(pwd) --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN + helm upgrade ibm-aiservice ./charts/aiservice --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN echo "All secrets copied successfully" {{- end }}