From c8e772d301fb9c97979da8b0be5793556c70ed3f Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Tue, 18 Mar 2025 17:30:51 +0530 Subject: [PATCH 001/491] aibroker changes --- .../ibm-aibroker-instance-root/Chart.yaml | 5 + .../ibm-aibroker-instance-root/README.md | 3 + .../templates/000-ibm-sync-resources.yaml | 118 +++++++++ .../templates/010-ibm-sync-jobs.yaml | 118 +++++++++ .../templates/100-ibm-sls-app.yaml | 89 +++++++ .../templates/110-ibm-cp4d-app.yaml | 127 ++++++++++ .../templates/110-ibm-cp4d-operator-app.yaml | 119 ++++++++++ .../templates/110-ibm-cs-control-app.yaml | 118 +++++++++ .../templates/110-ibm-db2u-app.yaml | 72 ++++++ .../templates/120-db2-databases-app.yaml | 85 +++++++ .../templates/120-ibm-spark-app.yaml | 77 ++++++ .../templates/120-ibm-spss-app.yaml | 79 +++++++ .../templates/120-ibm-wml-app.yaml | 77 ++++++ .../templates/120-ibm-wsl-app.yaml | 79 +++++++ .../templates/130-ibm-mas-suite-app.yaml | 154 ++++++++++++ .../130-ibm-mas-suite-configs-app.yaml | 78 ++++++ .../templates/200-ibm-mas-workspaces.yaml | 69 ++++++ .../500-ibm-mas-masapp-manage-install.yaml | 91 +++++++ .../510-550-ibm-mas-masapp-configs.yaml | 152 ++++++++++++ .../510-ibm-mas-masapp-assist-install.yaml | 91 +++++++ .../510-ibm-mas-masapp-iot-install.yaml | 91 +++++++ ...m-mas-masapp-visualinspection-install.yaml | 95 ++++++++ .../520-ibm-mas-masapp-health-install.yaml | 91 +++++++ .../520-ibm-mas-masapp-monitor-install.yaml | 91 +++++++ .../520-ibm-mas-masapp-optimizer-install.yaml | 91 +++++++ .../540-ibm-mas-masapp-predict-install.yaml | 91 +++++++ .../ibm-aibroker-instance-root/values.yaml | 49 ++++ .../100-aibroker-instance-appset.yaml | 223 ++++++++++++++++++ 28 files changed, 2623 insertions(+) create mode 100644 root-applications/ibm-aibroker-instance-root/Chart.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/README.md create mode 100644 root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/values.yaml create mode 100644 root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml diff --git a/root-applications/ibm-aibroker-instance-root/Chart.yaml b/root-applications/ibm-aibroker-instance-root/Chart.yaml new file mode 100644 index 000000000..a7310f9f8 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: ibm-mas-instance-root +description: IBM MAS instance root +type: application +version: 1.0.0 diff --git a/root-applications/ibm-aibroker-instance-root/README.md b/root-applications/ibm-aibroker-instance-root/README.md new file mode 100644 index 000000000..60b68a3c7 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/README.md @@ -0,0 +1,3 @@ +IBM MAS Instance Root Application +=============================================================================== +Installs various ArgoCD Applications for managing instance-level MAS dependencies (e.g. SLS, DB2 Databases), MAS Core and MAS Applications (e.g. Manage, Monitor, etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml b/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml new file mode 100644 index 000000000..9873f026e --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml @@ -0,0 +1,118 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: syncres.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "000" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: mas-{{ .Values.instance.id }}-syncres + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/000-ibm-sync-resources + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + sm_aws_region: "{{ .Values.region.id }}" + {{- if not (empty .Values.ibm_sls) }} + {{- if eq .Values.ibm_sls.mongodb_provider "aws" }} + docdb: + master_username: "{{ .Values.ibm_sls.docdb_master_username }}" + master_password: "{{ .Values.ibm_sls.docdb_master_password }}" + instance_username: "{{ .Values.ibm_sls.sls_mongo_username }}" + instance_password: "{{ .Values.ibm_sls.sls_mongo_password }}" + master_info: {{ .Values.ibm_sls.docdb_master_info }} + {{- end }} + {{- end }} + + {{- if not (empty .Values.ibm_mas_suite) }} + + mas_manual_cert_mgmt: {{ .Values.ibm_mas_suite.mas_manual_cert_mgmt }} + dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" + mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" + mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" + mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" + ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" + cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" + cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" + + cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" + cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" + cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" + cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" + cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" + cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" + cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" + update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" + delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" + override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" + + {{- if .Values.ibm_mas_suite.manual_certs }} + manual_certs: {{ .Values.ibm_mas_suite.manual_certs | toYaml | nindent 14 }} + {{- end }} + + {{- end }} + + junitreporter: + reporter_name: "ibm-sync-resources-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + + - name: ARGOCD_APP_NAME + value: syncres + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml new file mode 100644 index 000000000..dbdc9fdcf --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml @@ -0,0 +1,118 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: syncjobs.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "010" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io/cleanup +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/010-ibm-sync-jobs + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + sm_aws_region: "{{ .Values.region.id }}" + {{- if not (empty .Values.ibm_cp4d) }} + cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" + {{- end }} + {{- if not (empty .Values.ibm_sls) }} + {{- if eq .Values.ibm_sls.mongodb_provider "aws" }} + docdb: + master_username: "{{ .Values.ibm_sls.docdb_master_username }}" + master_password: "{{ .Values.ibm_sls.docdb_master_password }}" + instance_password: "{{ .Values.ibm_sls.sls_mongo_password }}" + master_info: {{ .Values.ibm_sls.docdb_master_info }} + {{- end }} + {{- end }} + + {{- if not (empty .Values.ibm_mas_suite) }} + + mas_manual_cert_mgmt: {{ .Values.ibm_mas_suite.mas_manual_cert_mgmt }} + dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" + mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" + mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" + mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" + ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" + cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" + cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" + + cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" + cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" + cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" + cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" + cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" + cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" + cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" + update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" + delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" + override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" + + {{- if .Values.ibm_mas_suite.manual_certs }} + manual_certs: {{ .Values.ibm_mas_suite.manual_certs | toYaml | nindent 14 }} + {{- end }} + + {{- end }} + + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + + junitreporter: + reporter_name: "ibm-sync-jobs-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + + mas_wipe_mongo_data: {{ .Values.mas_wipe_mongo_data }} + + - name: ARGOCD_APP_NAME + value: syncres + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true diff --git a/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml new file mode 100644 index 000000000..9f8d2489f --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml @@ -0,0 +1,89 @@ +{{- if not (empty .Values.ibm_sls) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: sls.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "100" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "mas-{{ .Values.instance.id }}-sls" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/100-ibm-sls + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + run_sync_hooks: {{.Values.ibm_sls.run_sync_hooks }} + sls_channel: "{{ .Values.ibm_sls.sls_channel }}" + ibm_entitlement_key: "{{ .Values.ibm_sls.ibm_entitlement_key }}" + sls_mongo_secret_name: "{{ .Values.ibm_sls.sls_mongo_secret_name }}" + sls_mongo_username: "{{ .Values.ibm_sls.sls_mongo_username }}" + sls_mongo_password: "{{ .Values.ibm_sls.sls_mongo_password }}" + sls_entitlement_file: "{{ .Values.ibm_sls.sls_entitlement_file }}" + icr_cp_open: "{{ .Values.ibm_sls.icr_cp_open }}" + sls_install_plan: "{{ .Values.ibm_sls.sls_install_plan }}" + mongo_spec: {{ .Values.ibm_sls.mongo_spec | toYaml | nindent 14}} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-sls-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: slsapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml new file mode 100644 index 000000000..cfa236287 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml @@ -0,0 +1,127 @@ +{{- if not (empty .Values.ibm_cp4d) }} +--- +# IBM CP4D +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cp4d.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "110" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: 'operator.ibm.com' + kind: IBMLicensing + jsonPointers: + - /spec/version + # Ignore changes to this Role as the cp4d operator updates it but it is needed to for install + - group: 'rbac.authorization.k8s.io' + kind: Role + name: nss-runtime-managed-role-from-{{ .Values.ibm_cp4d.cpd_operators_namespace }} + namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + jsonPointers: + - /rules + - /metadata + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.ibm_cp4d.cpd_instance_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/110-ibm-cp4d + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + instance_id: "{{ .Values.instance.id }}" + ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" + cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" + namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" + cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" + cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" + cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" + cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" + cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" + cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" + cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" + cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" + cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" + cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" + cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" + {{- if not (empty .Values.ibm_wsl) }} + wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_wml) }} + wml_channel: "{{ .Values.ibm_wml.wml_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spark) }} + spark_channel: "{{ .Values.ibm_spark.spark_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spss) }} + spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_cp4d_services_base) }} + ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" + datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" + ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" + opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" + rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" + opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" + {{- end }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-cp4d-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cp4dapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml new file mode 100644 index 000000000..5960814c6 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml @@ -0,0 +1,119 @@ +{{- if not (empty .Values.ibm_cp4d) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cp4doperator.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "110" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: 'operator.ibm.com' + kind: IBMLicensing + jsonPointers: + - /spec/version + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.ibm_cp4d.cpd_operators_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/110-ibm-cp4d-operators + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + instance_id: "{{ .Values.instance.id }}" + ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" + cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" + namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" + cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" + cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" + cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" + cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" + cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" + cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" + cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" + cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" + cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" + cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" + cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" + {{- if not (empty .Values.ibm_wsl) }} + wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_wml) }} + wml_channel: "{{ .Values.ibm_wml.wml_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spark) }} + spark_channel: "{{ .Values.ibm_spark.spark_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spss) }} + spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_cp4d_services_base) }} + ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" + datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" + ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" + opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" + rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" + opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" + {{- end }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-cp4d-operator-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cp4doperatorapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml new file mode 100644 index 000000000..b7f909cde --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml @@ -0,0 +1,118 @@ +{{- if not (empty .Values.ibm_cp4d) }} +--- +# IBM CS Control +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cscontrol.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "110" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: 'operator.ibm.com' + kind: IBMLicensing + jsonPointers: + - /spec/version + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.ibm_cp4d.cpd_cs_control_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/110-ibm-cs-control + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + instance_id: "{{ .Values.instance.id }}" + ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" + cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" + namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" + cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" + cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" + cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" + cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" + cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" + cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" + cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" + cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" + cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" + cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" + cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" + {{- if not (empty .Values.ibm_wsl) }} + wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_wml) }} + wml_channel: "{{ .Values.ibm_wml.wml_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spark) }} + spark_channel: "{{ .Values.ibm_spark.spark_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_spss) }} + spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + {{- end }} + {{- if not (empty .Values.ibm_cp4d_services_base) }} + ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" + datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" + ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" + opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" + opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" + {{- end }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-cs-control-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cscontrolapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml new file mode 100644 index 000000000..b277800b4 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml @@ -0,0 +1,72 @@ +{{- if not (empty .Values.ibm_db2u) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: db2u.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "110" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_db2u.db2_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/110-ibm-db2u + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + db2_namespace: "{{ .Values.ibm_db2u.db2_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_db2u.ibm_entitlement_key }}" + db2_channel: "{{ .Values.ibm_db2u.db2_channel }}" + db2_install_plan: "{{ .Values.ibm_db2u.db2_install_plan }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-db2u-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: db2uapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml new file mode 100644 index 000000000..dbe45fd76 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml @@ -0,0 +1,85 @@ +{{- /* +When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_db2u_databases with $. +For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) +*/}} + +{{- range $i, $value := .Values.ibm_db2u_databases }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "db2-db.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }}.{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }}" + namespace: {{ $.Values.argo.namespace }} + labels: + environment: '{{ $.Values.account.id }}' + region: '{{ $.Values.region.id }}' + cluster: '{{ $.Values.cluster.id }}' + instance: '{{ $.Values.instance.id }}' + appId: '{{ $value.mas_application_id }}' + annotations: +{{ if not (contains "sdb" $value.db2_instance_name) }} + argocd.argoproj.io/sync-wave: "120" +{{ else }} + argocd.argoproj.io/sync-wave: "121" +{{ end }} + {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ $.Values.argo.projects.apps }}" + destination: + server: {{ $.Values.cluster.url }} + namespace: default + source: + repoURL: "{{ $.Values.source.repo_url }}" + path: instance-applications/120-ibm-db2u-database + targetRevision: "{{ $.Values.source.revision }}" + plugin: + name: {{ $.Values.avp.name }} + env: + - name: {{ $.Values.avp.values_varname }} + value: | + account_id: "{{ $.Values.account.id }}" + region_id: "{{ $.Values.region.id }}" + cluster_id: "{{ $.Values.cluster.id }}" + instance_id: "{{ $.Values.instance.id }}" + sm_aws_access_key_id: "{{ $.Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ $.Values.sm.aws_secret_access_key }}" + {{- if $.Values.custom_labels }} + custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: db2-db-{{ $.Values.instance.id }}-{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }} + cluster_id: "{{ $.Values.cluster.id }}" + devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" + devops_build_number: "{{ $.Values.devops.build_number }}" + gitops_version: "{{ $.Values.source.revision }}" + {{ $value | toYaml | nindent 12 }} + - name: ARGOCD_APP_NAME + value: "db2dbapp-{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }}" + {{- if not (empty $.Values.avp.secret) }} + - name: AVP_SECRET + value: {{ $.Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + prune: {{ $.Values.auto_delete }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + ignoreDifferences: + - group: 'db2u.databases.ibm.com' + kind: Db2uCluster + jsonPointers: + - /spec/environment/database/ssl/secretName + - group: 'db2u.databases.ibm.com' + kind: Db2uInstance + jsonPointers: + - /spec/environment/ssl/secretName +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml new file mode 100644 index 000000000..f7ca212f3 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml @@ -0,0 +1,77 @@ +{{- if not (empty .Values.ibm_spark) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: spark.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "120" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/120-ibm-spark + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + ccs_version: "{{ .Values.ibm_spark.ccs_version }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_service_block_storage_class: "{{ .Values.ibm_spark.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_spark.cpd_service_scale_config }}" + cpd_service_storage_class: "{{ .Values.ibm_spark.cpd_service_storage_class }}" + spark_channel: "{{ .Values.ibm_spark.spark_channel }}" + spark_version: "{{ .Values.ibm_spark.spark_version }}" + spark_install_plan: "{{ .Values.ibm_spark.spark_install_plan }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-spark-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cpdsparkapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml new file mode 100644 index 000000000..0b78eff81 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml @@ -0,0 +1,79 @@ +{{- if not (empty .Values.ibm_spss) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: spss.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "120" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/120-ibm-spss + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_service_storage_class: "{{ .Values.ibm_spss.cpd_service_storage_class }}" + cpd_service_block_storage_class: "{{ .Values.ibm_spss.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_spss.cpd_service_scale_config }}" + spss_version: "{{ .Values.ibm_spss.spss_version }}" + spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + spss_install_plan: "{{ .Values.ibm_spss.spss_install_plan }}" + ccs_version: "{{ .Values.ibm_spss.ccs_version }}" + canvasbase_channel: "{{ .Values.ibm_spss.canvasbase_channel }}" + canvasbase_install_plan: "{{ .Values.ibm_spss.canvasbase_install_plan }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-spss-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cpdspssapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml new file mode 100644 index 000000000..3338e599d --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml @@ -0,0 +1,77 @@ +{{- if not (empty .Values.ibm_wml) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: wml.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "120" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/120-ibm-wml + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" + ccs_version: "{{ .Values.ibm_wml.ccs_version }}" + cpd_service_block_storage_class: "{{ .Values.ibm_wml.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_wml.cpd_service_scale_config }}" + cpd_service_storage_class: "{{ .Values.ibm_wml.cpd_service_storage_class }}" + wml_channel: "{{ .Values.ibm_wml.wml_channel }}" + wml_version: "{{ .Values.ibm_wml.wml_version }}" + wml_install_plan: "{{ .Values.ibm_wml.wml_install_plan }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-wml-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cpdwmlapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml new file mode 100644 index 000000000..c6634633a --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml @@ -0,0 +1,79 @@ +{{- if not (empty .Values.ibm_wsl) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: wsl.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "120" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/120-ibm-wsl + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" + cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" + cpd_service_storage_class: "{{ .Values.ibm_wsl.cpd_service_storage_class }}" + cpd_service_block_storage_class: "{{ .Values.ibm_wsl.cpd_service_block_storage_class }}" + cpd_service_scale_config: "{{ .Values.ibm_wsl.cpd_service_scale_config }}" + wsl_version: "{{ .Values.ibm_wsl.wsl_version }}" + wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + wsl_install_plan: "{{ .Values.ibm_wsl.wsl_install_plan }}" + ccs_version: "{{ .Values.ibm_wsl.ccs_version }}" + datarefinery_version: "{{ .Values.ibm_wsl.datarefinery_version }}" + ws_runtimes_version: "{{ .Values.ibm_wsl.ws_runtimes_version }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-wsl-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: cpdwslapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml new file mode 100644 index 000000000..1d654766c --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml @@ -0,0 +1,154 @@ +{{- if not (empty .Values.ibm_mas_suite) }} + +{{ $app_name := printf "suite.%s.%s" .Values.cluster.id .Values.instance.id }} +{{ $app_dest_ns := printf "mas-%s-core" .Values.instance.id }} + +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: {{ $app_name }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "130" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + argocd.argoproj.io/sync-options: PruneLast=true + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ $app_dest_ns }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/130-ibm-mas-suite + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + instance_id: "{{ .Values.instance.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + sm_aws_region: "{{ .Values.region.id }}" + mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" + mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" + mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" + mas_channel: "{{ .Values.ibm_mas_suite.mas_channel }}" + mas_install_plan: "{{ .Values.ibm_mas_suite.mas_install_plan }}" + ibm_entitlement_key: "{{ .Values.ibm_mas_suite.ibm_entitlement_key }}" + domain: "{{ .Values.ibm_mas_suite.domain }}" + cert_manager_namespace: "{{ .Values.ibm_mas_suite.cert_manager_namespace }}" + mas_manual_cert_mgmt: {{.Values.ibm_mas_suite.mas_manual_cert_mgmt }} + dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" + icr_cp: "{{ .Values.ibm_mas_suite.icr_cp }}" + icr_cp_open: "{{ .Values.ibm_mas_suite.icr_cp_open }}" + ingress: "{{ .Values.ibm_mas_suite.ingress }}" + + {{- if .Values.ibm_mas_suite.mas_annotations }} + mas_annotations: {{ .Values.ibm_mas_suite.mas_annotations | toYaml | nindent 14 }} + {{- end }} + + {{- if .Values.ibm_mas_suite.mas_labels }} + mas_labels: {{ .Values.ibm_mas_suite.mas_labels | toYaml | nindent 14 }} + {{- end }} + + {{- if .Values.ibm_mas_suite.mas_image_tags }} + mas_image_tags: {{ .Values.ibm_mas_suite.mas_image_tags | toYaml | nindent 14 }} + {{- end }} + + {{- if .Values.ibm_mas_suite.mas_pod_templates }} + mas_pod_templates: {{ .Values.ibm_mas_suite.mas_pod_templates | toYaml | nindent 14 }} + {{- end }} + + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + + {{- if and (eq .Values.ibm_mas_suite.dns_provider "cis") (not (.Values.ibm_mas_suite.mas_manual_cert_mgmt )) }} + cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" + ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" + cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" + cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" + cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" + cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" + cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" + cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" + cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" + cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" + update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" + delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" + override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" + {{- end }} + + {{- if .Values.ibm_mas_suite.mas_manual_cert_mgmt }} + + {{- if .Values.ibm_mas_suite.ca_cert }} + ca_cert: | + {{ .Values.ibm_mas_suite.ca_cert }} + {{- end }} + {{- if .Values.ibm_mas_suite.tls_cert }} + tls_cert: | + {{ .Values.ibm_mas_suite.tls_cert }} + {{- end }} + {{- if .Values.ibm_mas_suite.tls_key }} + tls_key: | + {{ .Values.ibm_mas_suite.tls_key }} + {{- end }} + + {{- end }} + + junitreporter: + reporter_name: "ibm-mas-suite-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + + {{- if .Values.ibm_mas_suite.oidc }} + oidc: {{ .Values.ibm_mas_suite.oidc | toYaml | nindent 14 }} + {{- end }} + + - name: ARGOCD_APP_NAME + value: suiteapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + ignoreDifferences: + - group: 'cert-manager.io' + kind: ClusterIssuer + jsonPointers: + - /spec/acme/preferredChain + - /spec/duration +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml new file mode 100644 index 000000000..b66edec35 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml @@ -0,0 +1,78 @@ +{{- /* +When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_mas_suite_configs with $. +For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) +*/}} + +{{- range $i, $value := .Values.ibm_mas_suite_configs }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "{{ $value.mas_config_name }}.{{ $.Values.cluster.id }}" + namespace: {{ $.Values.argo.namespace }} + labels: + environment: '{{ $.Values.account.id }}' + region: '{{ $.Values.region.id }}' + cluster: '{{ $.Values.cluster.id }}' + instance: '{{ $.Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "130" + {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io/cleanup + labels: + environment: '{{ $.Values.account.id }}' + region: '{{ $.Values.region.id }}' + cluster: '{{ $.Values.cluster.id }}' + instance: '{{ $.Values.instance.id }}' +spec: + project: "{{ $.Values.argo.projects.apps }}" + destination: + server: {{ $.Values.cluster.url }} + namespace: default + source: + repoURL: "{{ $.Values.source.repo_url }}" + path: instance-applications/130-{{ $value.mas_config_chart }} + targetRevision: "{{ $.Values.source.revision }}" + plugin: + name: {{ $.Values.avp.name }} + env: + - name: {{ $.Values.avp.values_varname }} + value: | + account_id: "{{ $.Values.account.id }}" + region_id: "{{ $.Values.region.id }}" + cluster_id: "{{ $.Values.cluster.id }}" + instance_id: "{{ $.Values.instance.id }}" + sm_aws_access_key_id: "{{ $.Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ $.Values.sm.aws_secret_access_key }}" + {{- if $.Values.custom_labels }} + custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + {{ $value | toYaml | nindent 12 }} + junitreporter: + reporter_name: "{{ $value.mas_config_chart }}-{{ $value.mas_config_scope }}-{{ $.Values.instance.id }}" + cluster_id: "{{ $.Values.cluster.id }}" + devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" + devops_build_number: "{{ $.Values.devops.build_number }}" + gitops_version: "{{ $.Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: {{ $value.mas_config_name }} + {{- if not (empty $.Values.avp.secret) }} + - name: AVP_SECRET + value: {{ $.Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + prune: {{ $.Values.auto_delete }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml b/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml new file mode 100644 index 000000000..830b8a8f0 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml @@ -0,0 +1,69 @@ +{{- /* +When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_db2u_databases with $. +For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) +*/}} + +{{- range $i, $value := .Values.ibm_mas_workspaces }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: {{ $value.mas_workspace_id }}.suite.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }} + namespace: {{ $.Values.argo.namespace }} + labels: + environment: '{{ $.Values.account.id }}' + region: '{{ $.Values.region.id }}' + cluster: '{{ $.Values.cluster.id }}' + instance: '{{ $.Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "200" + {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ $.Values.argo.projects.apps }}" + destination: + server: {{ $.Values.cluster.url }} + namespace: default + source: + repoURL: "{{ $.Values.source.repo_url }}" + path: instance-applications/220-ibm-mas-workspace + targetRevision: "{{ $.Values.source.revision }}" + plugin: + name: {{ $.Values.avp.name }} + env: + - name: {{ $.Values.avp.values_varname }} + value: | + instance_id: "{{ $.Values.instance.id }}" + mas_workspace_id: "{{ $value.mas_workspace_id }}" + mas_workspace_name: "{{ $value.mas_workspace_name }}" + ingress: "{{ $.Values.ibm_mas_suite.ingress }}" + {{- if $.Values.custom_labels }} + custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-mas-ws-{{ $.Values.instance.id }}-{{ $value.mas_workspace_id }}" + cluster_id: "{{ $.Values.cluster.id }}" + devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" + devops_build_number: "{{ $.Values.devops.build_number }}" + gitops_version: "{{ $.Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "workspaceapp-{{ $value.mas_workspace_id }}" + {{- if not (empty $.Values.avp.secret) }} + - name: AVP_SECRET + value: {{ $.Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + prune: {{ $.Values.auto_delete }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml new file mode 100644 index 000000000..323d550f4 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_manage_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: manage.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'manage' + annotations: + argocd.argoproj.io/sync-wave: "500" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_manage_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_manage_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_manage_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_manage_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_manage_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_manage_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_manage_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_manage_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_manage_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_manage_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_manage_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_manage_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_manage_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_manage_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_manage_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_manage_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_manage_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_manage_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-manage-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "manage-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml new file mode 100644 index 000000000..2bc51fd52 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml @@ -0,0 +1,152 @@ +{{- /* +When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_mas_masapp_configs with $. +For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) +*/}} + +{{- range $i, $value := .Values.ibm_mas_masapp_configs }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "{{ $value.mas_workspace_id }}.{{ $value.mas_app_id }}.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }}" + namespace: {{ $.Values.argo.namespace }} + annotations: + {{- if eq $value.mas_app_id "assist" }} + argocd.argoproj.io/sync-wave: "515" + {{- else if eq $value.mas_app_id "iot" }} + argocd.argoproj.io/sync-wave: "515" + {{- else if eq $value.mas_app_id "manage" }} + argocd.argoproj.io/sync-wave: "510" + {{- else if eq $value.mas_app_id "visualinspection" }} + argocd.argoproj.io/sync-wave: "515" + {{- else if eq $value.mas_app_id "health" }} + argocd.argoproj.io/sync-wave: "530" + {{- else if eq $value.mas_app_id "monitor" }} + argocd.argoproj.io/sync-wave: "530" + {{- else if eq $value.mas_app_id "optimizer" }} + argocd.argoproj.io/sync-wave: "530" + {{- else if eq $value.mas_app_id "predict" }} + argocd.argoproj.io/sync-wave: "550" + {{- end }} + {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io + labels: + environment: '{{ $.Values.account.id }}' + region: '{{ $.Values.region.id }}' + cluster: '{{ $.Values.cluster.id }}' + instance: '{{ $.Values.instance.id }}' +spec: + project: "{{ $.Values.argo.projects.apps }}" + destination: + server: {{ $.Values.cluster.url }} + namespace: default + source: + repoURL: "{{ $.Values.source.repo_url }}" + path: instance-applications/510-550-ibm-mas-suite-app-config + targetRevision: "{{ $.Values.source.revision }}" + plugin: + name: {{ $.Values.avp.name }} + env: + - name: {{ $.Values.avp.values_varname }} + value: | + instance_id: "{{ $.Values.instance.id }}" + mas_catalog_version: "{{ $.Values.mas_catalog_version }}" + mas_app_id: "{{ $value.mas_app_id }}" + mas_workspace_id: "{{ $value.mas_workspace_id }}" + mas_app_namespace: "{{ $value.mas_app_namespace }}" + mas_app_ws_apiversion: "{{ $value.mas_app_ws_apiversion }}" + mas_app_ws_kind: "{{ $value.mas_app_ws_kind }}" + mas_appws_spec: {{ $value.mas_appws_spec | toYaml | nindent 14 }} + + mas_manual_cert_mgmt: {{ $value.mas_manual_cert_mgmt }} + run_sanity_test: {{ $value.run_sanity_test }} + ingress: {{ $value.ingress }} + {{- if $value.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ $value.public_tls_secret_name }}" + ca_cert: | + {{ $value.ca_cert }} + tls_cert: | + {{ $value.tls_cert }} + tls_key: | + {{ $value.tls_key }} + {{- end }} + + {{- if (or (eq $value.mas_app_id "manage") (eq $value.mas_app_id "health")) }} + mas_app_server_bundles_combined_add_server_config: {{ $value.mas_app_server_bundles_combined_add_server_config | toYaml | nindent 14 }} + + customization_archive_secret_names: {{ $value.customization_archive_secret_names | toYaml | nindent 14 }} + + manage_logging_secret_name: {{ $value.manage_logging_secret_name }} + manage_logging_access_secret_key: {{ $value.manage_logging_access_secret_key }} + + {{- if $value.manage_update_schedule }} + manage_update_schedule: {{ $value.manage_update_schedule }} + {{- end }} + + {{- if $value.global_secrets }} + global_secrets: {{ $value.global_secrets | toYaml | nindent 14 }} + {{- end }} + + {{- end }} + + {{- if $.Values.custom_labels }} + custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + + {{- if $.Values.ibm_mas_suite }} + {{- if $.Values.ibm_mas_suite.mas_annotations }} + {{- if (index $.Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode") }} + operational_mode: {{ index $.Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode" }} + {{- end }} + {{- end }} + {{- end }} + + junitreporter: + reporter_name: "app-config-{{ $value.mas_app_id }}-{{ $.Values.instance.id }}" + cluster_id: "{{ $.Values.cluster.id }}" + devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" + devops_build_number: "{{ $.Values.devops.build_number }}" + gitops_version: "{{ $.Values.source.revision }}" + + {{- if (eq $value.mas_app_id "manage") }} + {{- if not (empty $.Values.ibm_db2u_databases) }} + manage_db2u_databases: + {{- range $j, $db := $.Values.ibm_db2u_databases }} + {{- if and ((eq $db.mas_application_id "manage")) (not (contains "sdb" $db.db2_instance_name)) }} + - db2_namespace: {{ $db.db2_namespace }} + db2_instance_name: {{ $db.db2_instance_name }} + db2_dbname: {{ $db.db2_dbname }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + + - name: ARGOCD_APP_NAME + value: "ma-cfg-{{ $value.mas_app_id }}" + {{- if not (empty $.Values.avp.secret) }} + - name: AVP_SECRET + value: {{ $.Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + prune: {{ $.Values.auto_delete }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml new file mode 100644 index 000000000..ce1c6de12 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_assist_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: assist.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'assist' + annotations: + argocd.argoproj.io/sync-wave: "510" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_assist_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_assist_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_assist_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_assist_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_assist_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_assist_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_assist_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_assist_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_assist_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_assist_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_assist_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_assist_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_assist_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_assist_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_assist_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_assist_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_assist_install.tls_key }} + {{- end }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-assist-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + mas_app_spec: {{ .Values.ibm_suite_app_assist_install.mas_app_spec | toYaml | nindent 14 }} + - name: ARGOCD_APP_NAME + value: "assist-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml new file mode 100644 index 000000000..550854973 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_iot_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: iot.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'iot' + annotations: + argocd.argoproj.io/sync-wave: "510" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_iot_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_iot_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_iot_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_iot_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_iot_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_iot_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_iot_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_iot_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_iot_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_iot_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_iot_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_iot_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_iot_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_iot_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_iot_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_iot_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_iot_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_iot_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-iot-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "iot-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml new file mode 100644 index 000000000..828572b94 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml @@ -0,0 +1,95 @@ +{{- if not (empty .Values.ibm_suite_app_visualinspection_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: visualinspection.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'visualinspection' + annotations: + argocd.argoproj.io/sync-wave: "510" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_visualinspection_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_visualinspection_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_visualinspection_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_visualinspection_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_visualinspection_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_visualinspection_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_visualinspection_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_visualinspection_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_visualinspection_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_visualinspection_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + gpu_request_quota: "{{ .Values.ibm_suite_app_visualinspection_install.gpu_request_quota }}" + {{- if .Values.ibm_suite_app_visualinspection_install.storage_class_definitions }} + storage_class_definitions: {{ .Values.ibm_suite_app_visualinspection_install.storage_class_definitions | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-mvi-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "visualinspection-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml new file mode 100644 index 000000000..7adf44650 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_health_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: health.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'health' + annotations: + argocd.argoproj.io/sync-wave: "520" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_health_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_health_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_health_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_health_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_health_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_health_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_health_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_health_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_health_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_health_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_health_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_health_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_health_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_health_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_health_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_health_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_health_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_health_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-health-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "health-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml new file mode 100644 index 000000000..5c311fdb0 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_monitor_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: monitor.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'monitor' + annotations: + argocd.argoproj.io/sync-wave: "520" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_monitor_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_monitor_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_monitor_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_monitor_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_monitor_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_monitor_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_monitor_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_monitor_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_monitor_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_monitor_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_monitor_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_monitor_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_monitor_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_monitor_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_monitor_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_monitor_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_monitor_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_monitor_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-monitor-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "monitor-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml new file mode 100644 index 000000000..8b0202d1d --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_optimizer_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: optimizer.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'optimizer' + annotations: + argocd.argoproj.io/sync-wave: "520" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_optimizer_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_optimizer_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_optimizer_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_optimizer_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_optimizer_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_optimizer_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_optimizer_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_optimizer_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_optimizer_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_optimizer_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-optimizer-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "optimizer-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml new file mode 100644 index 000000000..ea26cd656 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml @@ -0,0 +1,91 @@ +{{- if not (empty .Values.ibm_suite_app_predict_install) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: predict.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + masapp: 'predict' + annotations: + argocd.argoproj.io/sync-wave: "540" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_suite_app_predict_install.mas_app_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/500-540-ibm-mas-suite-app-install + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + instance_id: "{{ .Values.instance.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + mas_app_api_version: "{{ .Values.ibm_suite_app_predict_install.mas_app_api_version }}" + mas_app_kind: "{{ .Values.ibm_suite_app_predict_install.mas_app_kind }}" + mas_app_namespace: "{{ .Values.ibm_suite_app_predict_install.mas_app_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_suite_app_predict_install.ibm_entitlement_key }}" + mas_app_id: "{{ .Values.ibm_suite_app_predict_install.mas_app_id }}" + mas_app_catalog_source: "{{ .Values.ibm_suite_app_predict_install.mas_app_catalog_source }}" + mas_app_channel: "{{ .Values.ibm_suite_app_predict_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_predict_install.mas_app_install_plan }}" + mas_edition: "{{ .Values.ibm_suite_app_predict_install.mas_edition }}" + run_sync_hooks: {{ .Values.ibm_suite_app_predict_install.run_sync_hooks }} + mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_predict_install.mas_manual_cert_mgmt }} + {{- if .Values.ibm_suite_app_predict_install.mas_manual_cert_mgmt }} + public_tls_secret_name: "{{ .Values.ibm_suite_app_predict_install.public_tls_secret_name }}" + ca_cert: | + {{ .Values.ibm_suite_app_predict_install.ca_cert }} + tls_cert: | + {{ .Values.ibm_suite_app_predict_install.tls_cert }} + tls_key: | + {{ .Values.ibm_suite_app_predict_install.tls_key }} + {{- end }} + mas_app_spec: {{ .Values.ibm_suite_app_predict_install.mas_app_spec | toYaml | nindent 14 }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "app-install-predict-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: "predict-install" + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml new file mode 100644 index 000000000..6555471a9 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -0,0 +1,49 @@ +--- + +avp: + name: "argocd-vault-plugin-helm" + secret: "" + values_varname: "HELM_VALUES" + +account: + id: dev + +cluster: + id: cluster1 + +region: + id: region1 + +instance: + id: inst1 + +source: + repo_url: "https://github.com/ibm-mas/gitops" + revision: "poc" + +# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# generator: +# repo_url: "" +# revision: "" + +# These defaults align with the ArgoCD worker setup by gitops-bootstrap +# (openshift-gitops with a single ArgoCD project "mas") +argo: + namespace: "openshift-gitops" + projects: + rootapps: "mas" + apps: "mas" + + +auto_delete: false + +sm: + aws_access_key_id: xxxx + +run_sanity_test: false + +devops: + mongo_uri: + build_number: \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml new file mode 100644 index 000000000..e449b7514 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml @@ -0,0 +1,223 @@ + +--- +# IBM Maximo Application Suite Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: instance-appset.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "100" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-instance-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: "mas_catalog_version" + value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file From 8a25c7f10f7eb0d005f628ed0e6227706853e421 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 19 Mar 2025 10:10:56 +0530 Subject: [PATCH 002/491] update instance appset --- .../{ => templates}/100-aibroker-instance-appset.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename root-applications/ibm-mas-cluster-root/{ => templates}/100-aibroker-instance-appset.yaml (100%) diff --git a/root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml similarity index 100% rename from root-applications/ibm-mas-cluster-root/100-aibroker-instance-appset.yaml rename to root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml From 5c0be75bcd030643bab917dd59bfe877d22e2e47 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 19 Mar 2025 11:38:17 +0530 Subject: [PATCH 003/491] restructure --- .../ibm-aibroker-instance-root/Chart.yaml | 4 +- .../ibm-aibroker-instance-root/README.md | 4 +- .../templates/100-ibm-sls-app.yaml | 89 ---------- .../templates/110-ibm-cp4d-app.yaml | 127 --------------- .../templates/110-ibm-cp4d-operator-app.yaml | 119 -------------- .../templates/110-ibm-cs-control-app.yaml | 118 -------------- .../templates/110-ibm-db2u-app.yaml | 72 -------- .../templates/120-db2-databases-app.yaml | 85 ---------- .../templates/120-ibm-spark-app.yaml | 77 --------- .../templates/120-ibm-spss-app.yaml | 79 --------- .../templates/120-ibm-wml-app.yaml | 77 --------- .../templates/120-ibm-wsl-app.yaml | 79 --------- .../templates/130-ibm-mas-suite-app.yaml | 154 ------------------ .../130-ibm-mas-suite-configs-app.yaml | 78 --------- .../templates/200-ibm-mas-workspaces.yaml | 69 -------- .../500-ibm-mas-masapp-manage-install.yaml | 91 ----------- .../510-550-ibm-mas-masapp-configs.yaml | 152 ----------------- .../510-ibm-mas-masapp-assist-install.yaml | 91 ----------- .../510-ibm-mas-masapp-iot-install.yaml | 91 ----------- ...m-mas-masapp-visualinspection-install.yaml | 95 ----------- .../520-ibm-mas-masapp-health-install.yaml | 91 ----------- .../520-ibm-mas-masapp-monitor-install.yaml | 91 ----------- .../520-ibm-mas-masapp-optimizer-install.yaml | 91 ----------- .../540-ibm-mas-masapp-predict-install.yaml | 91 ----------- 24 files changed, 4 insertions(+), 2111 deletions(-) delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml diff --git a/root-applications/ibm-aibroker-instance-root/Chart.yaml b/root-applications/ibm-aibroker-instance-root/Chart.yaml index a7310f9f8..ab5f07702 100644 --- a/root-applications/ibm-aibroker-instance-root/Chart.yaml +++ b/root-applications/ibm-aibroker-instance-root/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: ibm-mas-instance-root -description: IBM MAS instance root +name: ibm-aibroker-instance-root +description: IBM AIBroker instance root type: application version: 1.0.0 diff --git a/root-applications/ibm-aibroker-instance-root/README.md b/root-applications/ibm-aibroker-instance-root/README.md index 60b68a3c7..5db7af8f2 100644 --- a/root-applications/ibm-aibroker-instance-root/README.md +++ b/root-applications/ibm-aibroker-instance-root/README.md @@ -1,3 +1,3 @@ -IBM MAS Instance Root Application +IBM AIBroker Instance Root Application =============================================================================== -Installs various ArgoCD Applications for managing instance-level MAS dependencies (e.g. SLS, DB2 Databases), MAS Core and MAS Applications (e.g. Manage, Monitor, etc) on the target cluster. \ No newline at end of file +Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml deleted file mode 100644 index 9f8d2489f..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/100-ibm-sls-app.yaml +++ /dev/null @@ -1,89 +0,0 @@ -{{- if not (empty .Values.ibm_sls) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: sls.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "100" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "mas-{{ .Values.instance.id }}-sls" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/100-ibm-sls - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - run_sync_hooks: {{.Values.ibm_sls.run_sync_hooks }} - sls_channel: "{{ .Values.ibm_sls.sls_channel }}" - ibm_entitlement_key: "{{ .Values.ibm_sls.ibm_entitlement_key }}" - sls_mongo_secret_name: "{{ .Values.ibm_sls.sls_mongo_secret_name }}" - sls_mongo_username: "{{ .Values.ibm_sls.sls_mongo_username }}" - sls_mongo_password: "{{ .Values.ibm_sls.sls_mongo_password }}" - sls_entitlement_file: "{{ .Values.ibm_sls.sls_entitlement_file }}" - icr_cp_open: "{{ .Values.ibm_sls.icr_cp_open }}" - sls_install_plan: "{{ .Values.ibm_sls.sls_install_plan }}" - mongo_spec: {{ .Values.ibm_sls.mongo_spec | toYaml | nindent 14}} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-sls-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: slsapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml deleted file mode 100644 index cfa236287..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-app.yaml +++ /dev/null @@ -1,127 +0,0 @@ -{{- if not (empty .Values.ibm_cp4d) }} ---- -# IBM CP4D -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cp4d.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "110" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: 'operator.ibm.com' - kind: IBMLicensing - jsonPointers: - - /spec/version - # Ignore changes to this Role as the cp4d operator updates it but it is needed to for install - - group: 'rbac.authorization.k8s.io' - kind: Role - name: nss-runtime-managed-role-from-{{ .Values.ibm_cp4d.cpd_operators_namespace }} - namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - jsonPointers: - - /rules - - /metadata - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.ibm_cp4d.cpd_instance_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/110-ibm-cp4d - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - instance_id: "{{ .Values.instance.id }}" - ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" - cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" - namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" - namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" - cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" - cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" - cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" - cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" - cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" - cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" - cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" - cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" - cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" - cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" - cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" - cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" - cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" - cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" - {{- if not (empty .Values.ibm_wsl) }} - wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_wml) }} - wml_channel: "{{ .Values.ibm_wml.wml_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spark) }} - spark_channel: "{{ .Values.ibm_spark.spark_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spss) }} - spss_channel: "{{ .Values.ibm_spss.spss_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_cp4d_services_base) }} - ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" - cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" - datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" - cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" - ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" - cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" - opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" - rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" - opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" - elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" - {{- end }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-cp4d-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cp4dapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml deleted file mode 100644 index 5960814c6..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cp4d-operator-app.yaml +++ /dev/null @@ -1,119 +0,0 @@ -{{- if not (empty .Values.ibm_cp4d) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cp4doperator.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "110" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: 'operator.ibm.com' - kind: IBMLicensing - jsonPointers: - - /spec/version - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.ibm_cp4d.cpd_operators_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/110-ibm-cp4d-operators - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - instance_id: "{{ .Values.instance.id }}" - ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" - cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" - namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" - namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" - cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" - cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" - cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" - cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" - cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" - cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" - cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" - cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" - cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" - cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" - cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" - cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" - cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" - cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" - {{- if not (empty .Values.ibm_wsl) }} - wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_wml) }} - wml_channel: "{{ .Values.ibm_wml.wml_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spark) }} - spark_channel: "{{ .Values.ibm_spark.spark_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spss) }} - spss_channel: "{{ .Values.ibm_spss.spss_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_cp4d_services_base) }} - ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" - cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" - datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" - cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" - ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" - cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" - opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" - rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" - opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" - elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" - {{- end }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-cp4d-operator-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cp4doperatorapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml deleted file mode 100644 index b7f909cde..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-cs-control-app.yaml +++ /dev/null @@ -1,118 +0,0 @@ -{{- if not (empty .Values.ibm_cp4d) }} ---- -# IBM CS Control -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cscontrol.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "110" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: 'operator.ibm.com' - kind: IBMLicensing - jsonPointers: - - /spec/version - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.ibm_cp4d.cpd_cs_control_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/110-ibm-cs-control - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - instance_id: "{{ .Values.instance.id }}" - ibm_entitlement_key: "{{ .Values.ibm_cp4d.ibm_entitlement_key }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" - cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" - namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" - namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" - cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" - cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" - cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" - cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" - cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" - cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" - cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" - cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" - cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" - cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" - cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" - cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" - cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" - cpd_metadata_storage_class: "{{ .Values.ibm_cp4d.cpd_metadata_storage_class }}" - {{- if not (empty .Values.ibm_wsl) }} - wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_wml) }} - wml_channel: "{{ .Values.ibm_wml.wml_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spark) }} - spark_channel: "{{ .Values.ibm_spark.spark_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_spss) }} - spss_channel: "{{ .Values.ibm_spss.spss_channel }}" - {{- end }} - {{- if not (empty .Values.ibm_cp4d_services_base) }} - ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" - cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" - datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" - cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" - ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" - cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" - opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" - opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" - elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" - {{- end }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-cs-control-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cscontrolapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml deleted file mode 100644 index b277800b4..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/110-ibm-db2u-app.yaml +++ /dev/null @@ -1,72 +0,0 @@ -{{- if not (empty .Values.ibm_db2u) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: db2u.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "110" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_db2u.db2_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/110-ibm-db2u - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - db2_namespace: "{{ .Values.ibm_db2u.db2_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_db2u.ibm_entitlement_key }}" - db2_channel: "{{ .Values.ibm_db2u.db2_channel }}" - db2_install_plan: "{{ .Values.ibm_db2u.db2_install_plan }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-db2u-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: db2uapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml deleted file mode 100644 index dbe45fd76..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/120-db2-databases-app.yaml +++ /dev/null @@ -1,85 +0,0 @@ -{{- /* -When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_db2u_databases with $. -For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) -*/}} - -{{- range $i, $value := .Values.ibm_db2u_databases }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: "db2-db.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }}.{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }}" - namespace: {{ $.Values.argo.namespace }} - labels: - environment: '{{ $.Values.account.id }}' - region: '{{ $.Values.region.id }}' - cluster: '{{ $.Values.cluster.id }}' - instance: '{{ $.Values.instance.id }}' - appId: '{{ $value.mas_application_id }}' - annotations: -{{ if not (contains "sdb" $value.db2_instance_name) }} - argocd.argoproj.io/sync-wave: "120" -{{ else }} - argocd.argoproj.io/sync-wave: "121" -{{ end }} - {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ $.Values.argo.projects.apps }}" - destination: - server: {{ $.Values.cluster.url }} - namespace: default - source: - repoURL: "{{ $.Values.source.repo_url }}" - path: instance-applications/120-ibm-db2u-database - targetRevision: "{{ $.Values.source.revision }}" - plugin: - name: {{ $.Values.avp.name }} - env: - - name: {{ $.Values.avp.values_varname }} - value: | - account_id: "{{ $.Values.account.id }}" - region_id: "{{ $.Values.region.id }}" - cluster_id: "{{ $.Values.cluster.id }}" - instance_id: "{{ $.Values.instance.id }}" - sm_aws_access_key_id: "{{ $.Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ $.Values.sm.aws_secret_access_key }}" - {{- if $.Values.custom_labels }} - custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: db2-db-{{ $.Values.instance.id }}-{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }} - cluster_id: "{{ $.Values.cluster.id }}" - devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" - devops_build_number: "{{ $.Values.devops.build_number }}" - gitops_version: "{{ $.Values.source.revision }}" - {{ $value | toYaml | nindent 12 }} - - name: ARGOCD_APP_NAME - value: "db2dbapp-{{ $value.db2_instance_name | replace (cat "db2wh-" $.Values.instance.id "-" | replace " " "") "" }}" - {{- if not (empty $.Values.avp.secret) }} - - name: AVP_SECRET - value: {{ $.Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - prune: {{ $.Values.auto_delete }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - ignoreDifferences: - - group: 'db2u.databases.ibm.com' - kind: Db2uCluster - jsonPointers: - - /spec/environment/database/ssl/secretName - - group: 'db2u.databases.ibm.com' - kind: Db2uInstance - jsonPointers: - - /spec/environment/ssl/secretName -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml deleted file mode 100644 index f7ca212f3..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spark-app.yaml +++ /dev/null @@ -1,77 +0,0 @@ -{{- if not (empty .Values.ibm_spark) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: spark.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "120" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/120-ibm-spark - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - ccs_version: "{{ .Values.ibm_spark.ccs_version }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_service_block_storage_class: "{{ .Values.ibm_spark.cpd_service_block_storage_class }}" - cpd_service_scale_config: "{{ .Values.ibm_spark.cpd_service_scale_config }}" - cpd_service_storage_class: "{{ .Values.ibm_spark.cpd_service_storage_class }}" - spark_channel: "{{ .Values.ibm_spark.spark_channel }}" - spark_version: "{{ .Values.ibm_spark.spark_version }}" - spark_install_plan: "{{ .Values.ibm_spark.spark_install_plan }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-spark-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cpdsparkapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml deleted file mode 100644 index 0b78eff81..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-spss-app.yaml +++ /dev/null @@ -1,79 +0,0 @@ -{{- if not (empty .Values.ibm_spss) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: spss.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "120" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/120-ibm-spss - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_service_storage_class: "{{ .Values.ibm_spss.cpd_service_storage_class }}" - cpd_service_block_storage_class: "{{ .Values.ibm_spss.cpd_service_block_storage_class }}" - cpd_service_scale_config: "{{ .Values.ibm_spss.cpd_service_scale_config }}" - spss_version: "{{ .Values.ibm_spss.spss_version }}" - spss_channel: "{{ .Values.ibm_spss.spss_channel }}" - spss_install_plan: "{{ .Values.ibm_spss.spss_install_plan }}" - ccs_version: "{{ .Values.ibm_spss.ccs_version }}" - canvasbase_channel: "{{ .Values.ibm_spss.canvasbase_channel }}" - canvasbase_install_plan: "{{ .Values.ibm_spss.canvasbase_install_plan }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-spss-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cpdspssapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml deleted file mode 100644 index 3338e599d..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wml-app.yaml +++ /dev/null @@ -1,77 +0,0 @@ -{{- if not (empty .Values.ibm_wml) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: wml.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "120" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/120-ibm-wml - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" - ccs_version: "{{ .Values.ibm_wml.ccs_version }}" - cpd_service_block_storage_class: "{{ .Values.ibm_wml.cpd_service_block_storage_class }}" - cpd_service_scale_config: "{{ .Values.ibm_wml.cpd_service_scale_config }}" - cpd_service_storage_class: "{{ .Values.ibm_wml.cpd_service_storage_class }}" - wml_channel: "{{ .Values.ibm_wml.wml_channel }}" - wml_version: "{{ .Values.ibm_wml.wml_version }}" - wml_install_plan: "{{ .Values.ibm_wml.wml_install_plan }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-wml-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cpdwmlapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml deleted file mode 100644 index c6634633a..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/120-ibm-wsl-app.yaml +++ /dev/null @@ -1,79 +0,0 @@ -{{- if not (empty .Values.ibm_wsl) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: wsl.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "120" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/120-ibm-wsl - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - cpd_operators_namespace: "{{ .Values.ibm_cp4d.cpd_operators_namespace }}" - cpd_instance_namespace: "{{ .Values.ibm_cp4d.cpd_instance_namespace }}" - cpd_service_storage_class: "{{ .Values.ibm_wsl.cpd_service_storage_class }}" - cpd_service_block_storage_class: "{{ .Values.ibm_wsl.cpd_service_block_storage_class }}" - cpd_service_scale_config: "{{ .Values.ibm_wsl.cpd_service_scale_config }}" - wsl_version: "{{ .Values.ibm_wsl.wsl_version }}" - wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" - wsl_install_plan: "{{ .Values.ibm_wsl.wsl_install_plan }}" - ccs_version: "{{ .Values.ibm_wsl.ccs_version }}" - datarefinery_version: "{{ .Values.ibm_wsl.datarefinery_version }}" - ws_runtimes_version: "{{ .Values.ibm_wsl.ws_runtimes_version }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-wsl-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: cpdwslapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml deleted file mode 100644 index 1d654766c..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-app.yaml +++ /dev/null @@ -1,154 +0,0 @@ -{{- if not (empty .Values.ibm_mas_suite) }} - -{{ $app_name := printf "suite.%s.%s" .Values.cluster.id .Values.instance.id }} -{{ $app_dest_ns := printf "mas-%s-core" .Values.instance.id }} - ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: {{ $app_name }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "130" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - argocd.argoproj.io/sync-options: PruneLast=true - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ $app_dest_ns }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/130-ibm-mas-suite - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - sm_aws_region: "{{ .Values.region.id }}" - mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" - mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" - mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" - mas_channel: "{{ .Values.ibm_mas_suite.mas_channel }}" - mas_install_plan: "{{ .Values.ibm_mas_suite.mas_install_plan }}" - ibm_entitlement_key: "{{ .Values.ibm_mas_suite.ibm_entitlement_key }}" - domain: "{{ .Values.ibm_mas_suite.domain }}" - cert_manager_namespace: "{{ .Values.ibm_mas_suite.cert_manager_namespace }}" - mas_manual_cert_mgmt: {{.Values.ibm_mas_suite.mas_manual_cert_mgmt }} - dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" - icr_cp: "{{ .Values.ibm_mas_suite.icr_cp }}" - icr_cp_open: "{{ .Values.ibm_mas_suite.icr_cp_open }}" - ingress: "{{ .Values.ibm_mas_suite.ingress }}" - - {{- if .Values.ibm_mas_suite.mas_annotations }} - mas_annotations: {{ .Values.ibm_mas_suite.mas_annotations | toYaml | nindent 14 }} - {{- end }} - - {{- if .Values.ibm_mas_suite.mas_labels }} - mas_labels: {{ .Values.ibm_mas_suite.mas_labels | toYaml | nindent 14 }} - {{- end }} - - {{- if .Values.ibm_mas_suite.mas_image_tags }} - mas_image_tags: {{ .Values.ibm_mas_suite.mas_image_tags | toYaml | nindent 14 }} - {{- end }} - - {{- if .Values.ibm_mas_suite.mas_pod_templates }} - mas_pod_templates: {{ .Values.ibm_mas_suite.mas_pod_templates | toYaml | nindent 14 }} - {{- end }} - - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - {{- if and (eq .Values.ibm_mas_suite.dns_provider "cis") (not (.Values.ibm_mas_suite.mas_manual_cert_mgmt )) }} - cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" - ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" - cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" - cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" - cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" - cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" - cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" - cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" - cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" - cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" - update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" - delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" - override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" - {{- end }} - - {{- if .Values.ibm_mas_suite.mas_manual_cert_mgmt }} - - {{- if .Values.ibm_mas_suite.ca_cert }} - ca_cert: | - {{ .Values.ibm_mas_suite.ca_cert }} - {{- end }} - {{- if .Values.ibm_mas_suite.tls_cert }} - tls_cert: | - {{ .Values.ibm_mas_suite.tls_cert }} - {{- end }} - {{- if .Values.ibm_mas_suite.tls_key }} - tls_key: | - {{ .Values.ibm_mas_suite.tls_key }} - {{- end }} - - {{- end }} - - junitreporter: - reporter_name: "ibm-mas-suite-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - {{- if .Values.ibm_mas_suite.oidc }} - oidc: {{ .Values.ibm_mas_suite.oidc | toYaml | nindent 14 }} - {{- end }} - - - name: ARGOCD_APP_NAME - value: suiteapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - ignoreDifferences: - - group: 'cert-manager.io' - kind: ClusterIssuer - jsonPointers: - - /spec/acme/preferredChain - - /spec/duration -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml deleted file mode 100644 index b66edec35..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/130-ibm-mas-suite-configs-app.yaml +++ /dev/null @@ -1,78 +0,0 @@ -{{- /* -When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_mas_suite_configs with $. -For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) -*/}} - -{{- range $i, $value := .Values.ibm_mas_suite_configs }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: "{{ $value.mas_config_name }}.{{ $.Values.cluster.id }}" - namespace: {{ $.Values.argo.namespace }} - labels: - environment: '{{ $.Values.account.id }}' - region: '{{ $.Values.region.id }}' - cluster: '{{ $.Values.cluster.id }}' - instance: '{{ $.Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "130" - {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io/cleanup - labels: - environment: '{{ $.Values.account.id }}' - region: '{{ $.Values.region.id }}' - cluster: '{{ $.Values.cluster.id }}' - instance: '{{ $.Values.instance.id }}' -spec: - project: "{{ $.Values.argo.projects.apps }}" - destination: - server: {{ $.Values.cluster.url }} - namespace: default - source: - repoURL: "{{ $.Values.source.repo_url }}" - path: instance-applications/130-{{ $value.mas_config_chart }} - targetRevision: "{{ $.Values.source.revision }}" - plugin: - name: {{ $.Values.avp.name }} - env: - - name: {{ $.Values.avp.values_varname }} - value: | - account_id: "{{ $.Values.account.id }}" - region_id: "{{ $.Values.region.id }}" - cluster_id: "{{ $.Values.cluster.id }}" - instance_id: "{{ $.Values.instance.id }}" - sm_aws_access_key_id: "{{ $.Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ $.Values.sm.aws_secret_access_key }}" - {{- if $.Values.custom_labels }} - custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - {{ $value | toYaml | nindent 12 }} - junitreporter: - reporter_name: "{{ $value.mas_config_chart }}-{{ $value.mas_config_scope }}-{{ $.Values.instance.id }}" - cluster_id: "{{ $.Values.cluster.id }}" - devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" - devops_build_number: "{{ $.Values.devops.build_number }}" - gitops_version: "{{ $.Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: {{ $value.mas_config_name }} - {{- if not (empty $.Values.avp.secret) }} - - name: AVP_SECRET - value: {{ $.Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - prune: {{ $.Values.auto_delete }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml b/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml deleted file mode 100644 index 830b8a8f0..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/200-ibm-mas-workspaces.yaml +++ /dev/null @@ -1,69 +0,0 @@ -{{- /* -When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_db2u_databases with $. -For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) -*/}} - -{{- range $i, $value := .Values.ibm_mas_workspaces }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: {{ $value.mas_workspace_id }}.suite.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }} - namespace: {{ $.Values.argo.namespace }} - labels: - environment: '{{ $.Values.account.id }}' - region: '{{ $.Values.region.id }}' - cluster: '{{ $.Values.cluster.id }}' - instance: '{{ $.Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "200" - {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ $.Values.argo.projects.apps }}" - destination: - server: {{ $.Values.cluster.url }} - namespace: default - source: - repoURL: "{{ $.Values.source.repo_url }}" - path: instance-applications/220-ibm-mas-workspace - targetRevision: "{{ $.Values.source.revision }}" - plugin: - name: {{ $.Values.avp.name }} - env: - - name: {{ $.Values.avp.values_varname }} - value: | - instance_id: "{{ $.Values.instance.id }}" - mas_workspace_id: "{{ $value.mas_workspace_id }}" - mas_workspace_name: "{{ $value.mas_workspace_name }}" - ingress: "{{ $.Values.ibm_mas_suite.ingress }}" - {{- if $.Values.custom_labels }} - custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-mas-ws-{{ $.Values.instance.id }}-{{ $value.mas_workspace_id }}" - cluster_id: "{{ $.Values.cluster.id }}" - devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" - devops_build_number: "{{ $.Values.devops.build_number }}" - gitops_version: "{{ $.Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "workspaceapp-{{ $value.mas_workspace_id }}" - {{- if not (empty $.Values.avp.secret) }} - - name: AVP_SECRET - value: {{ $.Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - prune: {{ $.Values.auto_delete }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml deleted file mode 100644 index 323d550f4..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_manage_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: manage.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'manage' - annotations: - argocd.argoproj.io/sync-wave: "500" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_manage_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_manage_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_manage_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_manage_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_manage_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_manage_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_manage_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_manage_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_manage_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_manage_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_manage_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_manage_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_manage_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_manage_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_manage_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_manage_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_manage_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_manage_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-manage-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "manage-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml deleted file mode 100644 index 2bc51fd52..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml +++ /dev/null @@ -1,152 +0,0 @@ -{{- /* -When inside the range loop below, make sure you prefix any references to chart values NOT under .Values.ibm_mas_masapp_configs with $. -For example: {{ $.Values.account.id }} (instead of {{ .Values.account.id }} ) -*/}} - -{{- range $i, $value := .Values.ibm_mas_masapp_configs }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: "{{ $value.mas_workspace_id }}.{{ $value.mas_app_id }}.{{ $.Values.cluster.id }}.{{ $.Values.instance.id }}" - namespace: {{ $.Values.argo.namespace }} - annotations: - {{- if eq $value.mas_app_id "assist" }} - argocd.argoproj.io/sync-wave: "515" - {{- else if eq $value.mas_app_id "iot" }} - argocd.argoproj.io/sync-wave: "515" - {{- else if eq $value.mas_app_id "manage" }} - argocd.argoproj.io/sync-wave: "510" - {{- else if eq $value.mas_app_id "visualinspection" }} - argocd.argoproj.io/sync-wave: "515" - {{- else if eq $value.mas_app_id "health" }} - argocd.argoproj.io/sync-wave: "530" - {{- else if eq $value.mas_app_id "monitor" }} - argocd.argoproj.io/sync-wave: "530" - {{- else if eq $value.mas_app_id "optimizer" }} - argocd.argoproj.io/sync-wave: "530" - {{- else if eq $value.mas_app_id "predict" }} - argocd.argoproj.io/sync-wave: "550" - {{- end }} - {{- if and $.Values.notifications $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ $.Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ $.Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io - labels: - environment: '{{ $.Values.account.id }}' - region: '{{ $.Values.region.id }}' - cluster: '{{ $.Values.cluster.id }}' - instance: '{{ $.Values.instance.id }}' -spec: - project: "{{ $.Values.argo.projects.apps }}" - destination: - server: {{ $.Values.cluster.url }} - namespace: default - source: - repoURL: "{{ $.Values.source.repo_url }}" - path: instance-applications/510-550-ibm-mas-suite-app-config - targetRevision: "{{ $.Values.source.revision }}" - plugin: - name: {{ $.Values.avp.name }} - env: - - name: {{ $.Values.avp.values_varname }} - value: | - instance_id: "{{ $.Values.instance.id }}" - mas_catalog_version: "{{ $.Values.mas_catalog_version }}" - mas_app_id: "{{ $value.mas_app_id }}" - mas_workspace_id: "{{ $value.mas_workspace_id }}" - mas_app_namespace: "{{ $value.mas_app_namespace }}" - mas_app_ws_apiversion: "{{ $value.mas_app_ws_apiversion }}" - mas_app_ws_kind: "{{ $value.mas_app_ws_kind }}" - mas_appws_spec: {{ $value.mas_appws_spec | toYaml | nindent 14 }} - - mas_manual_cert_mgmt: {{ $value.mas_manual_cert_mgmt }} - run_sanity_test: {{ $value.run_sanity_test }} - ingress: {{ $value.ingress }} - {{- if $value.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ $value.public_tls_secret_name }}" - ca_cert: | - {{ $value.ca_cert }} - tls_cert: | - {{ $value.tls_cert }} - tls_key: | - {{ $value.tls_key }} - {{- end }} - - {{- if (or (eq $value.mas_app_id "manage") (eq $value.mas_app_id "health")) }} - mas_app_server_bundles_combined_add_server_config: {{ $value.mas_app_server_bundles_combined_add_server_config | toYaml | nindent 14 }} - - customization_archive_secret_names: {{ $value.customization_archive_secret_names | toYaml | nindent 14 }} - - manage_logging_secret_name: {{ $value.manage_logging_secret_name }} - manage_logging_access_secret_key: {{ $value.manage_logging_access_secret_key }} - - {{- if $value.manage_update_schedule }} - manage_update_schedule: {{ $value.manage_update_schedule }} - {{- end }} - - {{- if $value.global_secrets }} - global_secrets: {{ $value.global_secrets | toYaml | nindent 14 }} - {{- end }} - - {{- end }} - - {{- if $.Values.custom_labels }} - custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - {{- if $.Values.ibm_mas_suite }} - {{- if $.Values.ibm_mas_suite.mas_annotations }} - {{- if (index $.Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode") }} - operational_mode: {{ index $.Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode" }} - {{- end }} - {{- end }} - {{- end }} - - junitreporter: - reporter_name: "app-config-{{ $value.mas_app_id }}-{{ $.Values.instance.id }}" - cluster_id: "{{ $.Values.cluster.id }}" - devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" - devops_build_number: "{{ $.Values.devops.build_number }}" - gitops_version: "{{ $.Values.source.revision }}" - - {{- if (eq $value.mas_app_id "manage") }} - {{- if not (empty $.Values.ibm_db2u_databases) }} - manage_db2u_databases: - {{- range $j, $db := $.Values.ibm_db2u_databases }} - {{- if and ((eq $db.mas_application_id "manage")) (not (contains "sdb" $db.db2_instance_name)) }} - - db2_namespace: {{ $db.db2_namespace }} - db2_instance_name: {{ $db.db2_instance_name }} - db2_dbname: {{ $db.db2_dbname }} - {{- end }} - {{- end }} - {{- end }} - {{- end }} - - - name: ARGOCD_APP_NAME - value: "ma-cfg-{{ $value.mas_app_id }}" - {{- if not (empty $.Values.avp.secret) }} - - name: AVP_SECRET - value: {{ $.Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - prune: {{ $.Values.auto_delete }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml deleted file mode 100644 index ce1c6de12..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_assist_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: assist.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'assist' - annotations: - argocd.argoproj.io/sync-wave: "510" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_assist_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_assist_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_assist_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_assist_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_assist_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_assist_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_assist_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_assist_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_assist_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_assist_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_assist_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_assist_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_assist_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_assist_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_assist_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_assist_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_assist_install.tls_key }} - {{- end }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-assist-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - mas_app_spec: {{ .Values.ibm_suite_app_assist_install.mas_app_spec | toYaml | nindent 14 }} - - name: ARGOCD_APP_NAME - value: "assist-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml deleted file mode 100644 index 550854973..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_iot_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: iot.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'iot' - annotations: - argocd.argoproj.io/sync-wave: "510" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_iot_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_iot_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_iot_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_iot_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_iot_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_iot_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_iot_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_iot_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_iot_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_iot_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_iot_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_iot_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_iot_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_iot_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_iot_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_iot_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_iot_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_iot_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-iot-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "iot-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml deleted file mode 100644 index 828572b94..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml +++ /dev/null @@ -1,95 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_visualinspection_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: visualinspection.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'visualinspection' - annotations: - argocd.argoproj.io/sync-wave: "510" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_visualinspection_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_visualinspection_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_visualinspection_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_visualinspection_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_visualinspection_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_visualinspection_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_visualinspection_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_visualinspection_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_visualinspection_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_visualinspection_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - gpu_request_quota: "{{ .Values.ibm_suite_app_visualinspection_install.gpu_request_quota }}" - {{- if .Values.ibm_suite_app_visualinspection_install.storage_class_definitions }} - storage_class_definitions: {{ .Values.ibm_suite_app_visualinspection_install.storage_class_definitions | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-mvi-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "visualinspection-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml deleted file mode 100644 index 7adf44650..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-health-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_health_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: health.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'health' - annotations: - argocd.argoproj.io/sync-wave: "520" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_health_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_health_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_health_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_health_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_health_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_health_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_health_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_health_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_health_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_health_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_health_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_health_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_health_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_health_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_health_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_health_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_health_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_health_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-health-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "health-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml deleted file mode 100644 index 5c311fdb0..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_monitor_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: monitor.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'monitor' - annotations: - argocd.argoproj.io/sync-wave: "520" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_monitor_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_monitor_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_monitor_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_monitor_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_monitor_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_monitor_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_monitor_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_monitor_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_monitor_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_monitor_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_monitor_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_monitor_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_monitor_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_monitor_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_monitor_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_monitor_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_monitor_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_monitor_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-monitor-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "monitor-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml deleted file mode 100644 index 8b0202d1d..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_optimizer_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: optimizer.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'optimizer' - annotations: - argocd.argoproj.io/sync-wave: "520" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_optimizer_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_optimizer_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_optimizer_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_optimizer_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_optimizer_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_optimizer_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_optimizer_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_optimizer_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_optimizer_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_optimizer_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-optimizer-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "optimizer-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml b/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml deleted file mode 100644 index ea26cd656..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml +++ /dev/null @@ -1,91 +0,0 @@ -{{- if not (empty .Values.ibm_suite_app_predict_install) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: predict.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - masapp: 'predict' - annotations: - argocd.argoproj.io/sync-wave: "540" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_suite_app_predict_install.mas_app_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/500-540-ibm-mas-suite-app-install - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - mas_app_api_version: "{{ .Values.ibm_suite_app_predict_install.mas_app_api_version }}" - mas_app_kind: "{{ .Values.ibm_suite_app_predict_install.mas_app_kind }}" - mas_app_namespace: "{{ .Values.ibm_suite_app_predict_install.mas_app_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_suite_app_predict_install.ibm_entitlement_key }}" - mas_app_id: "{{ .Values.ibm_suite_app_predict_install.mas_app_id }}" - mas_app_catalog_source: "{{ .Values.ibm_suite_app_predict_install.mas_app_catalog_source }}" - mas_app_channel: "{{ .Values.ibm_suite_app_predict_install.mas_app_channel }}" - mas_app_install_plan: "{{ .Values.ibm_suite_app_predict_install.mas_app_install_plan }}" - mas_edition: "{{ .Values.ibm_suite_app_predict_install.mas_edition }}" - run_sync_hooks: {{ .Values.ibm_suite_app_predict_install.run_sync_hooks }} - mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_predict_install.mas_manual_cert_mgmt }} - {{- if .Values.ibm_suite_app_predict_install.mas_manual_cert_mgmt }} - public_tls_secret_name: "{{ .Values.ibm_suite_app_predict_install.public_tls_secret_name }}" - ca_cert: | - {{ .Values.ibm_suite_app_predict_install.ca_cert }} - tls_cert: | - {{ .Values.ibm_suite_app_predict_install.tls_cert }} - tls_key: | - {{ .Values.ibm_suite_app_predict_install.tls_key }} - {{- end }} - mas_app_spec: {{ .Values.ibm_suite_app_predict_install.mas_app_spec | toYaml | nindent 14 }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "app-install-predict-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: "predict-install" - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} From 0a66c46c2d3be14a88dfde3ee6f9e747a25cf84d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 19 Mar 2025 12:13:48 +0530 Subject: [PATCH 004/491] change related to minio storage --- .../111-ibm-minio/Chart.yaml | 11 +++ instance-applications/111-ibm-minio/README.md | 3 + .../111-ibm-minio/templates/02-minio-pvc.yaml | 16 ++++ .../templates/03-minio-deployment.yaml | 37 ++++++++++ .../templates/04-minio-service.yaml | 21 ++++++ .../templates/05-minio-route.yaml | 18 +++++ .../111-ibm-minio/values.yaml | 9 +++ .../templates/020-ibm-minio-app.yaml | 73 +++++++++++++++++++ .../ibm-aibroker-instance-root/values.yaml | 8 +- 9 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 instance-applications/111-ibm-minio/Chart.yaml create mode 100644 instance-applications/111-ibm-minio/README.md create mode 100644 instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml create mode 100644 instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml create mode 100644 instance-applications/111-ibm-minio/templates/04-minio-service.yaml create mode 100644 instance-applications/111-ibm-minio/templates/05-minio-route.yaml create mode 100644 instance-applications/111-ibm-minio/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/instance-applications/111-ibm-minio/Chart.yaml b/instance-applications/111-ibm-minio/Chart.yaml new file mode 100644 index 000000000..9dbbe5d53 --- /dev/null +++ b/instance-applications/111-ibm-minio/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-minio +description: IBM MINIO +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/README.md b/instance-applications/111-ibm-minio/README.md new file mode 100644 index 000000000..626328773 --- /dev/null +++ b/instance-applications/111-ibm-minio/README.md @@ -0,0 +1,3 @@ +IBM minio +=============================================================================== +Deploy and configure minio storage with configurable version \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml new file mode 100644 index 000000000..5a4973472 --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml @@ -0,0 +1,16 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: minio-pvc + namespace: {{ .Values.minio.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "112" +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + storageClassName: {{ .Values.minio.storageClass }} + resources: + requests: + storage: {{ .Values.minio.storageSize }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml new file mode 100644 index 000000000..e5745c239 --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml @@ -0,0 +1,37 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.minio.instanceName }} + namespace: {{ .Values.minio.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "113" +spec: + selector: + matchLabels: + app: {{ .Values.minio.instanceName }} + template: + metadata: + labels: + app: {{ .Values.minio.instanceName }} + spec: + volumes: + - name: storage + persistentVolumeClaim: + claimName: minio-pvc + containers: + - name: {{ .Values.minio.instanceName }} + image: {{ .Values.minio.image }} + command: + - /bin/bash + - -c + args: + - minio server /data --console-address :9090 + env: + - name: MINIO_ROOT_USER + value: {{ .Values.minio.rootUser }} + - name: MINIO_ROOT_PASSWORD + value: {{ .Values.minio.rootPassword }} + volumeMounts: + - mountPath: /data + name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml new file mode 100644 index 000000000..6c1900481 --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: minio-service + namespace: {{ .Values.minio.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "114" +spec: + type: ClusterIP + ports: + - name: api + port: 9000 + targetPort: 9000 + protocol: TCP + - name: console + port: 9090 + targetPort: 9090 + protocol: TCP + selector: + app: {{ .Values.minio.instanceName }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml new file mode 100644 index 000000000..7de81c68e --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml @@ -0,0 +1,18 @@ +--- +kind: Route +apiVersion: route.openshift.io/v1 +metadata: + name: minio-route + namespace: {{ .Values.minio.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "115" +spec: + to: + kind: Service + name: minio-service + weight: 100 + port: + targetPort: 9090 + tls: + termination: edge + insecureEdgeTerminationPolicy: None \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml new file mode 100644 index 000000000..d331c38b7 --- /dev/null +++ b/instance-applications/111-ibm-minio/values.yaml @@ -0,0 +1,9 @@ +--- +minio: + namespace: "minio" + instanceName: "minio" + rootUser: "minio" + rootPassword: "" + storageClass: "default" + storageSize: "40Gi" + image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml new file mode 100644 index 000000000..80d407579 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -0,0 +1,73 @@ +{{- if not (empty .Values.ibm_minio) }} +--- +# IBM Maximo Minio +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "020" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_minio.minio_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/111-ibm-minio + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_minio.ibm_entitlement_key }}" + minio_channel: "{{ .Values.ibm_minio.minio_channel }}" + minio_install_plan: "{{ .Values.ibm_minio.minio_install_plan }}" + # --storageclass + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-minio-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: minioapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 6555471a9..6c3a546ed 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -46,4 +46,10 @@ run_sanity_test: false devops: mongo_uri: - build_number: \ No newline at end of file + build_number: + +ibm_minio: + minio_namespace: "minio_namespace" + minio_channel: "v110508.0" + minio_install_plan: "minio_install_plan" + ibm_entitlement_key: "" \ No newline at end of file From a757e1165b45e6844ce97504d6b2fa277bde1d28 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 19 Mar 2025 12:21:57 +0530 Subject: [PATCH 005/491] removed ibm_entitlement_key --- .../templates/020-ibm-minio-app.yaml | 1 - root-applications/ibm-aibroker-instance-root/values.yaml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index 80d407579..c592d8f83 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -36,7 +36,6 @@ spec: value: | argo_namespace: "{{ .Values.argo.namespace }}" minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_minio.ibm_entitlement_key }}" minio_channel: "{{ .Values.ibm_minio.minio_channel }}" minio_install_plan: "{{ .Values.ibm_minio.minio_install_plan }}" # --storageclass diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 6c3a546ed..c857387ed 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -51,5 +51,4 @@ devops: ibm_minio: minio_namespace: "minio_namespace" minio_channel: "v110508.0" - minio_install_plan: "minio_install_plan" - ibm_entitlement_key: "" \ No newline at end of file + minio_install_plan: "minio_install_plan" \ No newline at end of file From a5f91dcf8ccfcb32cbd901b3f9e0fd40ee2524ef Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 19 Mar 2025 16:17:56 +0530 Subject: [PATCH 006/491] values updated for minio values that are used in minio helm are updated --- .../111-ibm-minio/templates/02-minio-pvc.yaml | 6 +++--- .../templates/03-minio-deployment.yaml | 16 ++++++++-------- .../templates/04-minio-service.yaml | 4 ++-- .../111-ibm-minio/templates/05-minio-route.yaml | 2 +- instance-applications/111-ibm-minio/values.yaml | 15 +++++++-------- .../templates/020-ibm-minio-app.yaml | 8 +++++--- .../ibm-aibroker-instance-root/values.yaml | 8 ++++++-- 7 files changed, 32 insertions(+), 27 deletions(-) diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml index 5a4973472..60d02fc80 100644 --- a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml +++ b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml @@ -3,14 +3,14 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: minio-pvc - namespace: {{ .Values.minio.namespace }} + namespace: {{ .Values.minio_namespace }} annotations: argocd.argoproj.io/sync-wave: "112" spec: accessModes: - ReadWriteOnce volumeMode: Filesystem - storageClassName: {{ .Values.minio.storageClass }} + storageClassName: {{ .Values.minio_storageClass }} resources: requests: - storage: {{ .Values.minio.storageSize }} \ No newline at end of file + storage: {{ .Values.minio_storageSize }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml index e5745c239..45f7d1806 100644 --- a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml +++ b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml @@ -2,26 +2,26 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Values.minio.instanceName }} - namespace: {{ .Values.minio.namespace }} + name: {{ .Values.minio_instanceName }} + namespace: {{ .Values.minio_namespace }} annotations: argocd.argoproj.io/sync-wave: "113" spec: selector: matchLabels: - app: {{ .Values.minio.instanceName }} + app: {{ .Values.minio_instanceName }} template: metadata: labels: - app: {{ .Values.minio.instanceName }} + app: {{ .Values.minio_instanceName }} spec: volumes: - name: storage persistentVolumeClaim: claimName: minio-pvc containers: - - name: {{ .Values.minio.instanceName }} - image: {{ .Values.minio.image }} + - name: {{ .Values.minio_instanceName }} + image: {{ .Values.minio_image }} command: - /bin/bash - -c @@ -29,9 +29,9 @@ spec: - minio server /data --console-address :9090 env: - name: MINIO_ROOT_USER - value: {{ .Values.minio.rootUser }} + value: {{ .Values.minio_rootUser }} - name: MINIO_ROOT_PASSWORD - value: {{ .Values.minio.rootPassword }} + value: {{ .Values.minio_rootPassword }} volumeMounts: - mountPath: /data name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml index 6c1900481..8dc6ab1b7 100644 --- a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml +++ b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: minio-service - namespace: {{ .Values.minio.namespace }} + namespace: {{ .Values.minio_namespace }} annotations: argocd.argoproj.io/sync-wave: "114" spec: @@ -18,4 +18,4 @@ spec: targetPort: 9090 protocol: TCP selector: - app: {{ .Values.minio.instanceName }} \ No newline at end of file + app: {{ .Values.minio_instanceName }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml index 7de81c68e..e7ddc8b8b 100644 --- a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml +++ b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml @@ -3,7 +3,7 @@ kind: Route apiVersion: route.openshift.io/v1 metadata: name: minio-route - namespace: {{ .Values.minio.namespace }} + namespace: {{ .Values.minio_namespace }} annotations: argocd.argoproj.io/sync-wave: "115" spec: diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml index d331c38b7..ede4cd1e2 100644 --- a/instance-applications/111-ibm-minio/values.yaml +++ b/instance-applications/111-ibm-minio/values.yaml @@ -1,9 +1,8 @@ --- -minio: - namespace: "minio" - instanceName: "minio" - rootUser: "minio" - rootPassword: "" - storageClass: "default" - storageSize: "40Gi" - image: "quay.io/minio/minio:latest" \ No newline at end of file +minio_namespace: "minio" +minio_instanceName: "minio" +minio_rootUser: "minio" +minio_rootPassword: "" +minio_storageClass: "default" +minio_storageSize: "40Gi" +minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index c592d8f83..48e4c3dfa 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -34,10 +34,12 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - argo_namespace: "{{ .Values.argo.namespace }}" minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_channel: "{{ .Values.ibm_minio.minio_channel }}" - minio_install_plan: "{{ .Values.ibm_minio.minio_install_plan }}" + minio_instanceName: "{{ .Values.ibm_minio.minio_instanceName }}" + minio_rootUser: "{{ .Values.ibm_minio.minio_rootUser }}" + minio_rootPassword: "{{ .Values.ibm_minio.minio_rootPassword }}" + minio_storageClass: "{{ .Values.ibm_minio.minio_storageClass }}" + minio_image: "{{ .Values.ibm_minio.minio_image }}" # --storageclass {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index c857387ed..4df357ff4 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -50,5 +50,9 @@ devops: ibm_minio: minio_namespace: "minio_namespace" - minio_channel: "v110508.0" - minio_install_plan: "minio_install_plan" \ No newline at end of file + minio_instanceName: "minio" + minio_rootUser: "minio" + minio_rootPassword: "" + minio_storageClass: "default" + minio_storageSize: "40Gi" + minio_image: "quay.io/minio/minio:latest" \ No newline at end of file From 604c5045eafa3fbebbdced2043220f948f99b483 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 19 Mar 2025 18:47:57 +0530 Subject: [PATCH 007/491] use snakecase rather than a combination of snake and camel --- .../111-ibm-minio/templates/02-minio-pvc.yaml | 4 ++-- .../111-ibm-minio/templates/03-minio-deployment.yaml | 12 ++++++------ .../111-ibm-minio/templates/04-minio-service.yaml | 2 +- instance-applications/111-ibm-minio/values.yaml | 10 +++++----- .../templates/020-ibm-minio-app.yaml | 9 +++++---- .../ibm-aibroker-instance-root/values.yaml | 10 +++++----- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml index 60d02fc80..98cea5a16 100644 --- a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml +++ b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml @@ -10,7 +10,7 @@ spec: accessModes: - ReadWriteOnce volumeMode: Filesystem - storageClassName: {{ .Values.minio_storageClass }} + storageClassName: {{ .Values.minio_storage_class }} resources: requests: - storage: {{ .Values.minio_storageSize }} \ No newline at end of file + storage: {{ .Values.minio_storage_size }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml index 45f7d1806..041c983e1 100644 --- a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml +++ b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml @@ -2,25 +2,25 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Values.minio_instanceName }} + name: {{ .Values.minio_instance_name }} namespace: {{ .Values.minio_namespace }} annotations: argocd.argoproj.io/sync-wave: "113" spec: selector: matchLabels: - app: {{ .Values.minio_instanceName }} + app: {{ .Values.minio_instance_name }} template: metadata: labels: - app: {{ .Values.minio_instanceName }} + app: {{ .Values.minio_instance_name }} spec: volumes: - name: storage persistentVolumeClaim: claimName: minio-pvc containers: - - name: {{ .Values.minio_instanceName }} + - name: {{ .Values.minio_instance_name }} image: {{ .Values.minio_image }} command: - /bin/bash @@ -29,9 +29,9 @@ spec: - minio server /data --console-address :9090 env: - name: MINIO_ROOT_USER - value: {{ .Values.minio_rootUser }} + value: {{ .Values.minio_root_user }} - name: MINIO_ROOT_PASSWORD - value: {{ .Values.minio_rootPassword }} + value: {{ .Values.minio_root_password }} volumeMounts: - mountPath: /data name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml index 8dc6ab1b7..b8186336f 100644 --- a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml +++ b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml @@ -18,4 +18,4 @@ spec: targetPort: 9090 protocol: TCP selector: - app: {{ .Values.minio_instanceName }} \ No newline at end of file + app: {{ .Values.minio_instance_name }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml index ede4cd1e2..4f0508e40 100644 --- a/instance-applications/111-ibm-minio/values.yaml +++ b/instance-applications/111-ibm-minio/values.yaml @@ -1,8 +1,8 @@ --- minio_namespace: "minio" -minio_instanceName: "minio" -minio_rootUser: "minio" -minio_rootPassword: "" -minio_storageClass: "default" -minio_storageSize: "40Gi" +minio_instance_name: "minio" +minio_root_user: "minio" +minio_root_password: "" +minio_storage_class: "default" +minio_storage_size: "40Gi" minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index 48e4c3dfa..50fd8c435 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -35,10 +35,11 @@ spec: - name: {{ .Values.avp.values_varname }} value: | minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_instanceName: "{{ .Values.ibm_minio.minio_instanceName }}" - minio_rootUser: "{{ .Values.ibm_minio.minio_rootUser }}" - minio_rootPassword: "{{ .Values.ibm_minio.minio_rootPassword }}" - minio_storageClass: "{{ .Values.ibm_minio.minio_storageClass }}" + minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" + minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" + minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" + minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" + minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" minio_image: "{{ .Values.ibm_minio.minio_image }}" # --storageclass {{- if .Values.custom_labels }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4df357ff4..56ba471f0 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -50,9 +50,9 @@ devops: ibm_minio: minio_namespace: "minio_namespace" - minio_instanceName: "minio" - minio_rootUser: "minio" - minio_rootPassword: "" - minio_storageClass: "default" - minio_storageSize: "40Gi" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "" + minio_storage_class: "default" + minio_storage_size: "40Gi" minio_image: "quay.io/minio/minio:latest" \ No newline at end of file From e7b090284d922a57db4dd489fdde5e3ca19c3289 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 20 Mar 2025 17:47:47 +0530 Subject: [PATCH 008/491] Odh-app-argo create --- .../templates/020-ibm-minio-app.yaml | 75 ------------------- 1 file changed, 75 deletions(-) delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml deleted file mode 100644 index 50fd8c435..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ /dev/null @@ -1,75 +0,0 @@ -{{- if not (empty .Values.ibm_minio) }} ---- -# IBM Maximo Minio -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "020" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_minio.minio_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/111-ibm-minio - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" - minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" - minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" - minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" - minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" - minio_image: "{{ .Values.ibm_minio.minio_image }}" - # --storageclass - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-minio-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: minioapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file From 73178bd558630d30d14bb9c46ca3f8300882a833 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 20 Mar 2025 17:53:40 +0530 Subject: [PATCH 009/491] Odh-app-argo create --- .../templates/020-ibm-odh-app.yaml | 75 +++++++++++++++++++ .../templates/030-ibm-minio-app.yaml | 75 +++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml new file mode 100644 index 000000000..50fd8c435 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml @@ -0,0 +1,75 @@ +{{- if not (empty .Values.ibm_minio) }} +--- +# IBM Maximo Minio +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "020" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_minio.minio_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/111-ibm-minio + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" + minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" + minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" + minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" + minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" + minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" + minio_image: "{{ .Values.ibm_minio.minio_image }}" + # --storageclass + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-minio-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: minioapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml new file mode 100644 index 000000000..50fd8c435 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml @@ -0,0 +1,75 @@ +{{- if not (empty .Values.ibm_minio) }} +--- +# IBM Maximo Minio +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "020" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_minio.minio_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/111-ibm-minio + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" + minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" + minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" + minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" + minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" + minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" + minio_image: "{{ .Values.ibm_minio.minio_image }}" + # --storageclass + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-minio-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: minioapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file From a7e1fe0f784fee2b963ec851d295651ab1c80531 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 14:40:57 +0530 Subject: [PATCH 010/491] Odh-changes main task --- instance-applications/112-ibm-odh/Chart.yaml | 11 ++++++++ instance-applications/112-ibm-odh/README.md | 3 +++ .../01-odh-pipeline-operator-subcription.yaml | 10 +++++++ .../02-odh-serverless-subscription.yaml | 21 +++++++++++++++ .../03-odh-servicemesh-operator-sa.yaml | 17 ++++++++++++ .../templates/04-odh-authorino-operator.yaml | 10 +++++++ .../05-odh-operator-subcription.yaml | 15 +++++++++++ instance-applications/112-ibm-odh/values.yaml | 8 ++++++ ...bm-odh-app.yaml => 020-ibm-minio-app.yaml} | 0 ...bm-minio-app.yaml => 030-ibm-odh-app.yaml} | 26 +++++++++++-------- .../ibm-aibroker-instance-root/values.yaml | 16 +++++++++++- 11 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 instance-applications/112-ibm-odh/Chart.yaml create mode 100644 instance-applications/112-ibm-odh/README.md create mode 100644 instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml create mode 100644 instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml create mode 100644 instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml create mode 100644 instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml create mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml create mode 100644 instance-applications/112-ibm-odh/values.yaml rename root-applications/ibm-aibroker-instance-root/templates/{020-ibm-odh-app.yaml => 020-ibm-minio-app.yaml} (100%) rename root-applications/ibm-aibroker-instance-root/templates/{030-ibm-minio-app.yaml => 030-ibm-odh-app.yaml} (67%) diff --git a/instance-applications/112-ibm-odh/Chart.yaml b/instance-applications/112-ibm-odh/Chart.yaml new file mode 100644 index 000000000..9dbbe5d53 --- /dev/null +++ b/instance-applications/112-ibm-odh/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-minio +description: IBM MINIO +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/README.md b/instance-applications/112-ibm-odh/README.md new file mode 100644 index 000000000..626328773 --- /dev/null +++ b/instance-applications/112-ibm-odh/README.md @@ -0,0 +1,3 @@ +IBM minio +=============================================================================== +Deploy and configure minio storage with configurable version \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml new file mode 100644 index 000000000..68367b18c --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + namespace: "{{ .values.openshift_namespace }}" + package_name: "openshift-pipelines-operator-rh" + package_channel: "{{ .values.pipeline_channel }}" + catalog_source: "{{ .values.pipeline_catalog_source }}" + annotations: + argocd.argoproj.io/sync-wave: "088" diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml new file mode 100644 index 000000000..6a152b2f6 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -0,0 +1,21 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: operatorgroup + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "088" +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: serverless-operator + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "088" +spec: + channel: stable + installPlanApproval: Automatic + name: serverless-operator + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml new file mode 100644 index 000000000..8609c351e --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + namespace: "{{ .values.service_mesh_namespace }}" + package_name: "servicemeshoperator" + package_channel: "{{ .values.service_mesh_channel }}" + catalog_source: "{{ .values.service_mesh_catalog_source }}" + annotations: + argocd.argoproj.io/sync-wave: "088" +--- +apiVersion: v1 +metadata: + name: istio-operator + namespace: "{{ service_mesh_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "088" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml new file mode 100644 index 000000000..7b58543ae --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + nnamespace: "{{ .values.openshift_namespace }}" + package_name: "authorino-operator" + package_channel: "{{ .values.serverless_channel }}" # This looks wrong, but that's what was in the original template + catalog_source: "{{ .values.authorino_catalog_source }}" + annotations: + argocd.argoproj.io/sync-wave: "088" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml new file mode 100644 index 000000000..3e0ad90e4 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: opendatahub-operator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "088" +spec: + channel: "{{ .values.odh_channel }}" + installPlanApproval: Manual + name: opendatahub-operator + source: "{{ .values.odh_catalog_source }}" + sourceNamespace: openshift-marketplace + startingCSV: "{{ .values.odh_operator_version }}" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml new file mode 100644 index 000000000..4f0508e40 --- /dev/null +++ b/instance-applications/112-ibm-odh/values.yaml @@ -0,0 +1,8 @@ +--- +minio_namespace: "minio" +minio_instance_name: "minio" +minio_root_user: "minio" +minio_root_password: "" +minio_storage_class: "default" +minio_storage_size: "40Gi" +minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml similarity index 100% rename from root-applications/ibm-aibroker-instance-root/templates/020-ibm-odh-app.yaml rename to root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml similarity index 67% rename from root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml rename to root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 50fd8c435..10d693056 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -1,4 +1,4 @@ -{{- if not (empty .Values.ibm_minio) }} +{{- if not (empty .Values.ibm_odh) }} --- # IBM Maximo Minio apiVersion: argoproj.io/v1alpha1 @@ -12,7 +12,7 @@ metadata: cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: - argocd.argoproj.io/sync-wave: "020" + argocd.argoproj.io/sync-wave: "030" healthCheckTimeout: "1800" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} @@ -24,23 +24,27 @@ spec: project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_minio.minio_namespace }}" + namespace: "{{ .Values.ibm_odh.minio_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/111-ibm-minio + path: instance-applications/112-ibm-odh targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} env: - name: {{ .Values.avp.values_varname }} value: | - minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" - minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" - minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" - minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" - minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" - minio_image: "{{ .Values.ibm_minio.minio_image }}" + openshift_namespace: "{{ .Values.ibm_odh.openshift_namespace }}" + pipeline_channel: "{{ .Values.ibm_odh.pipeline_channel }}" + pipeline_catalog_source: "{{ .Values.ibm_odh.pipeline_catalog_source }}" + service_mesh_namespace: "{{ .Values.ibm_odh.service_mesh_namespace }}" + service_mesh_channel: "{{ .Values.ibm_odh.service_mesh_channel }}" + service_mesh_catalog_source: "{{ .Values.ibm_odh.service_mesh_catalog_source }}" + serverless_channel: "{{ .Values.ibm_odh.serverless_channel }}" + authorino_catalog_source: "{{ .Values.ibm_odh.authorino_catalog_source }}" + odh_channel: "{{ .Values.ibm_odh.odh_channel }}" + odh_catalog_source: "{{ .Values.ibm_odh.odh_catalog_source }}" + odh_operator_version: "{{ .Values.ibm_odh.odh_operator_version }}" # --storageclass {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 56ba471f0..4e755eb82 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -55,4 +55,18 @@ ibm_minio: minio_root_password: "" minio_storage_class: "default" minio_storage_size: "40Gi" - minio_image: "quay.io/minio/minio:latest" \ No newline at end of file + minio_image: "quay.io/minio/minio:latest" + + +ibm_odh: + openshift_namespace: "openshift-operators" + pipeline_channel: "latest" + pipeline_catalog_source: "redhat-operators" + service_mesh_namespace: "openshift-operators" + service_mesh_channel: "stable" + service_mesh_catalog_source: "redhat-operators" + serverless_channel: "stable" + authorino_catalog_source: "community-operators" + odh_channel: "fast" + odh_catalog_source: "community-operators" + odh_operator_version: "opendatahub-operator.v2.11.1" \ No newline at end of file From 8c5ff78f658965c0d5a251d72c72e50a1bd394df Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 14:44:24 +0530 Subject: [PATCH 011/491] Odh-changes main task --- .../templates/030-ibm-odh-app.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 10d693056..681674c21 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -1,10 +1,10 @@ {{- if not (empty .Values.ibm_odh) }} --- -# IBM Maximo Minio +# IBM Maximo ODH apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + name: odh.{{ .Values.cluster.id }}.{{ .Values.instance.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' @@ -24,7 +24,7 @@ spec: project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_odh.minio_namespace }}" + namespace: "{{ .Values.ibm_odh.openshift_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" path: instance-applications/112-ibm-odh @@ -50,13 +50,13 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-minio-{{ .Values.instance.id }}" + reporter_name: "ibm-odh-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" devops_build_number: "{{ .Values.devops.build_number }}" gitops_version: "{{ .Values.source.revision }}" - name: ARGOCD_APP_NAME - value: minioapp + value: Odhapp {{- if not (empty .Values.avp.secret) }} - name: AVP_SECRET value: {{ .Values.avp.secret }} From 4efbddd501acf5b3ba1ff2b1a855931a24eb4273 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 14:53:32 +0530 Subject: [PATCH 012/491] Odh-changes main task --- .../templates/01-odh-pipeline-operator-subcription.yaml | 2 +- .../112-ibm-odh/templates/02-odh-serverless-subscription.yaml | 2 +- .../112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml | 4 ++-- .../112-ibm-odh/templates/04-odh-authorino-operator.yaml | 2 +- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 68367b18c..ac98702de 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -7,4 +7,4 @@ metadata: package_channel: "{{ .values.pipeline_channel }}" catalog_source: "{{ .values.pipeline_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "088" + argocd.argoproj.io/sync-wave: "113" diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index 6a152b2f6..6448c8708 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -4,7 +4,7 @@ metadata: name: operatorgroup namespace: openshift-serverless annotations: - argocd.argoproj.io/sync-wave: "088" + argocd.argoproj.io/sync-wave: "114" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 8609c351e..6d58abab7 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -7,11 +7,11 @@ metadata: package_channel: "{{ .values.service_mesh_channel }}" catalog_source: "{{ .values.service_mesh_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "088" + argocd.argoproj.io/sync-wave: "115" --- apiVersion: v1 metadata: name: istio-operator namespace: "{{ service_mesh_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "088" \ No newline at end of file + argocd.argoproj.io/sync-wave: "116" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index 7b58543ae..0029b20c5 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -7,4 +7,4 @@ metadata: package_channel: "{{ .values.serverless_channel }}" # This looks wrong, but that's what was in the original template catalog_source: "{{ .values.authorino_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "088" \ No newline at end of file + argocd.argoproj.io/sync-wave: "117" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 3e0ad90e4..1b3ece1e1 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "088" + argocd.argoproj.io/sync-wave: "118" spec: channel: "{{ .values.odh_channel }}" installPlanApproval: Manual From 825738a013603dc84aea9f326d2ebdfc1dd1f889 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 14:55:26 +0530 Subject: [PATCH 013/491] Odh-changes main task --- .../112-ibm-odh/templates/02-odh-serverless-subscription.yaml | 2 +- .../112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml | 4 ++-- .../112-ibm-odh/templates/04-odh-authorino-operator.yaml | 2 +- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index 6448c8708..823957204 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -12,7 +12,7 @@ metadata: name: serverless-operator namespace: openshift-serverless annotations: - argocd.argoproj.io/sync-wave: "088" + argocd.argoproj.io/sync-wave: "115" spec: channel: stable installPlanApproval: Automatic diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 6d58abab7..b2db974ba 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -7,11 +7,11 @@ metadata: package_channel: "{{ .values.service_mesh_channel }}" catalog_source: "{{ .values.service_mesh_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "115" + argocd.argoproj.io/sync-wave: "116" --- apiVersion: v1 metadata: name: istio-operator namespace: "{{ service_mesh_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "116" \ No newline at end of file + argocd.argoproj.io/sync-wave: "117" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index 0029b20c5..295898f03 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -7,4 +7,4 @@ metadata: package_channel: "{{ .values.serverless_channel }}" # This looks wrong, but that's what was in the original template catalog_source: "{{ .values.authorino_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "117" \ No newline at end of file + argocd.argoproj.io/sync-wave: "118" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 1b3ece1e1..a96bd50d9 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "118" + argocd.argoproj.io/sync-wave: "119" spec: channel: "{{ .values.odh_channel }}" installPlanApproval: Manual From fbbc7bf6337e61afe883fc252c7ea81c5309ba82 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 16:02:39 +0530 Subject: [PATCH 014/491] Odh-changes main task --- .../templates/01-odh-pipeline-operator-subcription.yaml | 6 +++--- .../templates/03-odh-servicemesh-operator-sa.yaml | 9 +++++---- .../112-ibm-odh/templates/04-odh-authorino-operator.yaml | 6 +++--- .../templates/05-odh-operator-subcription.yaml | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index ac98702de..8a8646995 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -2,9 +2,9 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - namespace: "{{ .values.openshift_namespace }}" + namespace: "{{ .Values.openshift_namespace }}" package_name: "openshift-pipelines-operator-rh" - package_channel: "{{ .values.pipeline_channel }}" - catalog_source: "{{ .values.pipeline_catalog_source }}" + package_channel: "{{ .Values.pipeline_channel }}" + catalog_source: "{{ .Values.pipeline_catalog_source }}" annotations: argocd.argoproj.io/sync-wave: "113" diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index b2db974ba..efc4f90b2 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -2,16 +2,17 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - namespace: "{{ .values.service_mesh_namespace }}" + namespace: "{{ .Values.service_mesh_namespace }}" package_name: "servicemeshoperator" - package_channel: "{{ .values.service_mesh_channel }}" - catalog_source: "{{ .values.service_mesh_catalog_source }}" + package_channel: "{{ .Values.service_mesh_channel }}" + catalog_source: "{{ .Values.service_mesh_catalog_source }}" annotations: argocd.argoproj.io/sync-wave: "116" --- apiVersion: v1 +kind: ServiceAccount metadata: name: istio-operator - namespace: "{{ service_mesh_namespace }}" + namespace: "{{ .Values.service_mesh_namespace }}" annotations: argocd.argoproj.io/sync-wave: "117" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index 295898f03..4a75cb79c 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -2,9 +2,9 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - nnamespace: "{{ .values.openshift_namespace }}" + nnamespace: "{{ .Values.openshift_namespace }}" package_name: "authorino-operator" - package_channel: "{{ .values.serverless_channel }}" # This looks wrong, but that's what was in the original template - catalog_source: "{{ .values.authorino_catalog_source }}" + package_channel: "{{ .Values.serverless_channel }}" # This looks wrong, but that's what was in the original template + catalog_source: "{{ .Values.authorino_catalog_source }}" annotations: argocd.argoproj.io/sync-wave: "118" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index a96bd50d9..5383242f2 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -7,9 +7,9 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "119" spec: - channel: "{{ .values.odh_channel }}" + channel: "{{ .Values.odh_channel }}" installPlanApproval: Manual name: opendatahub-operator - source: "{{ .values.odh_catalog_source }}" + source: "{{ .Values.odh_catalog_source }}" sourceNamespace: openshift-marketplace - startingCSV: "{{ .values.odh_operator_version }}" \ No newline at end of file + startingCSV: "{{ .Values.odh_operator_version }}" \ No newline at end of file From d1d3e2b175513c4abc56a509be6965d92e4dd049 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 21 Mar 2025 17:28:41 +0530 Subject: [PATCH 015/491] Odh-changes main task --- instance-applications/112-ibm-odh/Chart.yaml | 14 +++++++------- instance-applications/112-ibm-odh/values.yaml | 18 +++++++++++------- .../ibm-aibroker-instance-root/values.yaml | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/instance-applications/112-ibm-odh/Chart.yaml b/instance-applications/112-ibm-odh/Chart.yaml index 9dbbe5d53..61c70ae97 100644 --- a/instance-applications/112-ibm-odh/Chart.yaml +++ b/instance-applications/112-ibm-odh/Chart.yaml @@ -1,11 +1,11 @@ apiVersion: v2 -name: ibm-minio -description: IBM MINIO +name: ibm-odh +description: IBM ODH type: application version: 1.0.0 -dependencies: -- name: junitreporter - version: 1.0.0 - repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file +# dependencies: +# - name: junitreporter +# version: 1.0.0 +# repository: "file://../../sub-charts/junitreporter/" +# condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 4f0508e40..761cf3ddd 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -1,8 +1,12 @@ --- -minio_namespace: "minio" -minio_instance_name: "minio" -minio_root_user: "minio" -minio_root_password: "" -minio_storage_class: "default" -minio_storage_size: "40Gi" -minio_image: "quay.io/minio/minio:latest" \ No newline at end of file +openshift_namespace: "openshift-operators" +pipeline_channel: "latest" +pipeline_catalog_source: "redhat-operators" +service_mesh_namespace: "openshift-operators" +service_mesh_channel: "stable" +service_mesh_catalog_source: "redhat-operators" +serverless_channel: "stable" +authorino_catalog_source: "community-operators" +odh_channel: "fast" +odh_catalog_source: "community-operators" +odh_operator_version: "opendatahub-operator.v2.11.1" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4e755eb82..943446218 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -69,4 +69,4 @@ ibm_odh: authorino_catalog_source: "community-operators" odh_channel: "fast" odh_catalog_source: "community-operators" - odh_operator_version: "opendatahub-operator.v2.11.1" \ No newline at end of file + odh_operator_version: "opendatahub-operator.v2.11.1" From 92864aeb937e00e479981ef98886ca0f0ac49e35 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 24 Mar 2025 12:52:30 +0530 Subject: [PATCH 016/491] heml chart for odh added new files and updated some values --- instance-applications/112-ibm-odh/Chart.yaml | 10 ++-- .../templates/06-odh-namespace.yaml | 7 +++ .../templates/07-odh-external-secret-db.yaml | 12 ++++ .../templates/08-odh-dsc-init.yaml | 34 +++++++++++ .../09-odh-data-science-cluster.yaml | 26 +++++++++ .../templates/10-odh-dspa-aws.yaml | 53 ++++++++++++++++++ .../templates/10-odh-dspa-local.yaml | 21 +++++++ .../templates/10-odh-dspa-minio.yaml | 56 +++++++++++++++++++ .../112-ibm-odh/templates/11-odh.yaml | 8 +++ instance-applications/112-ibm-odh/values.yaml | 26 ++++++++- .../templates/030-ibm-odh-app.yaml | 25 +++++++++ .../ibm-aibroker-instance-root/values.yaml | 24 ++++++++ 12 files changed, 296 insertions(+), 6 deletions(-) create mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml create mode 100644 instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml create mode 100644 instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml create mode 100644 instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml create mode 100644 instance-applications/112-ibm-odh/templates/11-odh.yaml diff --git a/instance-applications/112-ibm-odh/Chart.yaml b/instance-applications/112-ibm-odh/Chart.yaml index 61c70ae97..f2df6fd80 100644 --- a/instance-applications/112-ibm-odh/Chart.yaml +++ b/instance-applications/112-ibm-odh/Chart.yaml @@ -4,8 +4,8 @@ description: IBM ODH type: application version: 1.0.0 -# dependencies: -# - name: junitreporter -# version: 1.0.0 -# repository: "file://../../sub-charts/junitreporter/" -# condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml new file mode 100644 index 000000000..4c3a7342d --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -0,0 +1,7 @@ +# create new workspace is not needed , because argocd will create new namespace bydefault +# --- +# apiVersion: v1 +# kind: Namespace +# metadata: +# name: "{{ .Values.openshift_namespace }}" +# argocd.argoproj.io/sync-wave: "120" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml new file mode 100644 index 000000000..04182cd58 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + namespace: "{{ .Values.aibroker_namespace }}" + argocd.argoproj.io/sync-wave: "121" +type: Opaque +stringData: + password: "{{ .Values.mas_aibroker_db_secret_value }}" # need to verify is it b64enc +# data: +# password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} diff --git a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml new file mode 100644 index 000000000..1d5e9b875 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml @@ -0,0 +1,34 @@ + +--- +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + annotations: + argocd.argoproj.io/sync-wave: "122" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + finalizers: + - dscinitialization.opendatahub.io/finalizer + labels: + app.kubernetes.io/created-by: opendatahub-operator + app.kubernetes.io/instance: default + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: dscinitialization + app.kubernetes.io/part-of: opendatahub-operator + name: default-dsci +spec: + applicationsNamespace: opendatahub + monitoring: + managementState: Managed + namespace: opendatahub + serviceMesh: + auth: + audiences: + - 'https://kubernetes.default.svc' + controlPlane: + metricsCollection: Istio + name: data-science-smcp + namespace: istio-system + managementState: Managed + trustedCABundle: + customCABundle: '' + managementState: Managed diff --git a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml new file mode 100644 index 000000000..849f9cd41 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml @@ -0,0 +1,26 @@ +--- +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + annotations: + argocd.argoproj.io/sync-wave: "123" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + labels: + app.kubernetes.io/created-by: opendatahub-operator + app.kubernetes.io/instance: default + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: datasciencecluster + app.kubernetes.io/part-of: opendatahub-operator + name: default-dsc +spec: + components: + datasciencepipelines: + managementState: Managed + kserve: + managementState: Managed + serving: + ingressGateway: + certificate: + type: SelfSigned + managementState: Managed + name: knative-serving diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml new file mode 100644 index 000000000..5c539c126 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml @@ -0,0 +1,53 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "aws" }} +apiVersion: v1 +kind: Secret +metadata: + name: ds-pipeline-s3-instance + namespace: "{{ .Values.aibroker_namespace }}" + labels: + opendatahub.io/dashboard: 'false' + opendatahub.io/managed: 'true' + annotations: + opendatahub.io/connection-type: s3 + openshift.io/display-name: AWS S3 Connection + argocd.argoproj.io/sync-wave: "124" +stringData: + accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey}}" + host: "{{ .Values.mas_aibroker_storage_host }}" + region: "{{ .Values.mas_aibroker_storage_region }}" + ssl: "{{ .Values.mas_aibroker_storage_ssl }}" +--- +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + dspVersion: v1 + database: + disableHealthCheck: true + customExtraParams: '{"tls":"false"}' + externalDB: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + username: "{{ .Values.mas_aibroker_db_user }}" + pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" + passwordSecret: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + key: password + objectStorage: + disableHealthCheck: true + externalStorage: + host: "{{ .Values.mas_aibroker_storage_host }}" + bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + s3CredentialsSecret: + accessKey: accesskey + secretKey: secretkey + secretName: ds-pipeline-s3-instance + scheme: https +{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml new file mode 100644 index 000000000..7b7241790 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml @@ -0,0 +1,21 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "local" }} +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + database: + disableHealthCheck: true + objectStorage: + disableHealthCheck: true + minio: + deploy: true + image: 'quay.io/minio/minio' + pvcSize: 40Gi + storageClassName: {{ .Values.primary_storage_class }} +{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml new file mode 100644 index 000000000..a3847bc38 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -0,0 +1,56 @@ +{{- if eq .Values.mas_aibroker_storage_provider "minio" }} +apiVersion: v1 +kind: Secret +metadata: + name: ds-pipeline-s3-instance + namespace: "{{ .Values.aibroker_namespace }}" + labels: + opendatahub.io/dashboard: "false" + opendatahub.io/managed: "true" + annotations: + argocd.argoproj.io/sync-wave: "124" + opendatahub.io/connection-type: s3 + openshift.io/display-name: Minio Data Connection +stringData: + accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey}}" + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + ssl: "{{ .Values.mas_aibroker_storage_ssl }}" +--- +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + dspVersion: v1 + database: + disableHealthCheck: true + customExtraParams: '{"tls":"false"}' + externalDB: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + username: "{{ .Values.mas_aibroker_db_user }}" + pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" + passwordSecret: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + key: password + + objectStorage: + disableHealthCheck: true + externalStorage: + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + storageClassName: "{{ .Values.primary_storage_class }}" + s3CredentialsSecret: + accessKey: accesskey + secretKey: secretkey + secretName: ds-pipeline-s3-instance + scheme: http + +{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml new file mode 100644 index 000000000..4a44619bf --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pipeline-runner-instance + namespace: "{{ .Values.aibroker_namespace }}" +imagePullSecrets: + - name: "{{ .Values.pull_secret_name }}" diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 761cf3ddd..4e6e6c339 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -9,4 +9,28 @@ serverless_channel: "stable" authorino_catalog_source: "community-operators" odh_channel: "fast" odh_catalog_source: "community-operators" -odh_operator_version: "opendatahub-operator.v2.11.1" \ No newline at end of file +odh_operator_version: "opendatahub-operator.v2.11.1" + +aibroker_namespace: "mas-{{ mas_instance_id }}-aibroker" +pull_secret_name: "ibm-entitlement" +# Storage vars +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_accesskey: "MAS_AIBROKER_STORAGE_ACCESSKEY" +mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" +mas_aibroker_storage_host: "MAS_AIBROKER_STORAGE_HOST" +mas_aibroker_storage_port: "MAS_AIBROKER_STORAGE_PORT" +mas_aibroker_storage_ssl: "MAS_AIBROKER_STORAGE_SSL" +mas_aibroker_storage_region: "MAS_AIBROKER_STORAGE_REGION" + +# MariaDB +mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" +mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" +mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" +mas_aibroker_db_database: "MAS_AIBROKER_DB_DATABASE" + +mas_aibroker_db_secret_key: "MAS_AIBROKER_DB_SECRET_KEY" +mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" +mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" + +mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" +primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 681674c21..43e93e13b 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -45,6 +45,31 @@ spec: odh_channel: "{{ .Values.ibm_odh.odh_channel }}" odh_catalog_source: "{{ .Values.ibm_odh.odh_catalog_source }}" odh_operator_version: "{{ .Values.ibm_odh.odh_operator_version }}" + + aibroker_namespace: "{{ .Values.ibm_odh.aibroker_namespace }}" + pull_secret_name: "{{ .Values.ibm_odh.pull_secret_name }}" + # Storage vars + mas_aibroker_storage_provider: "{{ .Values.ibm_odh.mas_aibroker_storage_provider }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_odh.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_odh.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_odh.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_odh.mas_aibroker_storage_port }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_odh.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_region: "{{ .Values.ibm_odh.mas_aibroker_storage_region }}" + + # MariaDB + mas_aibroker_db_host: "{{ .Values.ibm_odh.mas_aibroker_db_host }}" + mas_aibroker_db_port: "{{ .Values.ibm_odh.mas_aibroker_db_port }}" + mas_aibroker_db_user: "{{ .Values.ibm_odh.mas_aibroker_db_user }}" + mas_aibroker_db_database: "{{ .Values.ibm_odh.mas_aibroker_db_database }}" + + mas_aibroker_db_secret_key: "{{ .Values.ibm_odh.mas_aibroker_db_secret_key }}" + mas_aibroker_db_secret_name: "{{ .Values.ibm_odh.mas_aibroker_db_secret_name }}" + mas_aibroker_db_secret_value: "{{ .Values.ibm_odh.mas_aibroker_db_secret_value }}" + + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_odh.mas_aibroker_storage_pipelines_bucket }}" + primary_storage_class: "{{ .Values.ibm_odh.primary_storage_class }}" + # --storageclass {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 943446218..c43ebf873 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -70,3 +70,27 @@ ibm_odh: odh_channel: "fast" odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.11.1" + + aibroker_namespace: "mas-{{ mas_instance_id }}-aibroker" + pull_secret_name: "ibm-entitlement" + # Storage vars + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_accesskey: "MAS_AIBROKER_STORAGE_ACCESSKEY" + mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" + mas_aibroker_storage_host: "MAS_AIBROKER_STORAGE_HOST" + mas_aibroker_storage_port: "MAS_AIBROKER_STORAGE_PORT" + mas_aibroker_storage_ssl: "MAS_AIBROKER_STORAGE_SSL" + mas_aibroker_storage_region: "MAS_AIBROKER_STORAGE_REGION" + + # MariaDB + mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" + mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" + mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" + mas_aibroker_db_database: "MAS_AIBROKER_DB_DATABASE" + + mas_aibroker_db_secret_key: "MAS_AIBROKER_DB_SECRET_KEY" + mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" + mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" + + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" From 4ad2dd097fd9e98489b93e266402f107696d08e3 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 24 Mar 2025 13:02:31 +0530 Subject: [PATCH 017/491] readme file updated --- instance-applications/112-ibm-odh/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/README.md b/instance-applications/112-ibm-odh/README.md index 626328773..976ceae80 100644 --- a/instance-applications/112-ibm-odh/README.md +++ b/instance-applications/112-ibm-odh/README.md @@ -1,3 +1,3 @@ -IBM minio +IBM ODH =============================================================================== -Deploy and configure minio storage with configurable version \ No newline at end of file +Deploy and configure ODH with configurable version \ No newline at end of file From 90a2881bfe008605d9012244728f3eff22ad3013 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Mon, 24 Mar 2025 15:08:52 +0530 Subject: [PATCH 018/491] Update 020-ibm-minio-app.yaml --- .../templates/020-ibm-minio-app.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index 50fd8c435..7aa4221a7 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -41,7 +41,6 @@ spec: minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" minio_image: "{{ .Values.ibm_minio.minio_image }}" - # --storageclass {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} @@ -72,4 +71,4 @@ spec: {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From becadc60bdf089857db6812f99dcf6786bedeb76 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 24 Mar 2025 16:40:01 +0530 Subject: [PATCH 019/491] removed comment --- .../ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 43e93e13b..c125d3dad 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -70,7 +70,6 @@ spec: mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_odh.mas_aibroker_storage_pipelines_bucket }}" primary_storage_class: "{{ .Values.ibm_odh.primary_storage_class }}" - # --storageclass {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} From b0896b0ebe47a239307bab6dc1866ae1821bd6bb Mon Sep 17 00:00:00 2001 From: Drashti Malviya Date: Mon, 24 Mar 2025 18:31:31 +0530 Subject: [PATCH 020/491] delete unused files for minio testing --- .../000-ibm-operator-catalog-app.yaml | 70 ------ .../010-ibm-redhat-cert-manager-app.yaml | 76 ------ .../templates/020-ibm-dro-app.yaml | 90 ------- .../templates/021-ibm-dro-cleanup.yaml | 66 ------ .../templates/030-ibm-cis-cert-manager.yaml | 71 ------ .../templates/040-cis-compliance-app.yaml | 70 ------ .../templates/041-cis-compliance-cleanup.yaml | 66 ------ .../templates/050-nfd-operator-app.yaml | 70 ------ .../051-nvidia-gpu-operator-app.yaml | 71 ------ .../052-group-sync-operator-app.yaml | 70 ------ .../054-cluster-logging-operator-app.yaml | 70 ------ .../055-instana-agent-operator-app.yaml | 81 ------- .../templates/060-custom-sa.yaml | 70 ------ .../templates/060-selenium-grid.yaml | 51 ---- .../templates/061-ibm-rbac-app.yaml | 62 ----- .../templates/099-instance-appset.yaml | 223 ------------------ .../templates/200-cluster-promotion-app.yaml | 85 ------- 17 files changed, 1362 deletions(-) delete mode 100644 root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml delete mode 100644 root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml diff --git a/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml b/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml deleted file mode 100644 index 806b3f2f4..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if not (empty .Values.ibm_operator_catalog) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: operator-catalog.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "000" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/000-ibm-operator-catalog - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - ibm_entitlement_key: "{{ .Values.ibm_operator_catalog.ibm_entitlement_key }}" - mas_catalog_version: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - mas_catalog_image: "{{ .Values.ibm_operator_catalog.mas_catalog_image }}" - junitreporter: - reporter_name: "ibm-operator-catalog" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: operatorcatalogapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml deleted file mode 100644 index dc405e7e7..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ /dev/null @@ -1,76 +0,0 @@ -{{- if not (empty .Values.redhat_cert_manager) }} ---- -# Redhat Cert Manager -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: redhat-cert-manager.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "010" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: cert-manager-operator - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/010-redhat-cert-manager - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - channel: "{{ .Values.redhat_cert_manager.channel }}" - run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - redhat_cert_manager_install_plan: "{{ .Values.redhat_cert_manager.redhat_cert_manager_install_plan }}" - junitreporter: - reporter_name: "redhat-cert-manager" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: rcmapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml b/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml deleted file mode 100644 index c9080cc6f..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml +++ /dev/null @@ -1,90 +0,0 @@ -{{- if not (empty .Values.ibm_dro) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dro.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "020" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_dro.dro_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/020-ibm-dro - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - run_sync_hooks: {{.Values.ibm_dro.run_sync_hooks }} - dro_namespace: "{{ .Values.ibm_dro.dro_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_dro.ibm_entitlement_key }}" - dro_cmm_setup: "{{ .Values.ibm_dro.dro_cmm_setup }}" - dro_install_plan: "{{ .Values.ibm_dro.dro_install_plan }}" - imo_install_plan: "{{ .Values.ibm_dro.imo_install_plan }}" - junitreporter: - reporter_name: "ibm-dro" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.ibm_dro.dro_cmm_setup }} - dro_cmm: - auth_apikey: "{{ .Values.ibm_dro.dro_cmm.auth_apikey }}" - auth_url: "{{ .Values.ibm_dro.dro_cmm.auth_url }}" - cmm_url: "{{ .Values.ibm_dro.dro_cmm.cmm_url }}" - {{- end }} - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: droapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml b/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml deleted file mode 100644 index f6c0d1ba1..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml +++ /dev/null @@ -1,66 +0,0 @@ -{{- if not (empty .Values.ibm_dro) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: ibm-dro-cleanup.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "021" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io/cleanup -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/021-ibm-dro-cleanup - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - dro_namespace: "{{ .Values.ibm_dro.dro_namespace }}" - junitreporter: - reporter_name: "ibm-dro-cleanup" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: ibmdrocleanup - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - - Validate=false -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml b/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml deleted file mode 100644 index 5fc53f990..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml +++ /dev/null @@ -1,71 +0,0 @@ -{{- if not (empty .Values.ibm_cis_cert_manager) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: ibm-cis-cert-manager.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "030" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/030-ibm-cis-cert-manager - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-cis-cert-manager" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - dns_provider: "{{ .Values.ibm_cis_cert_manager.dns_provider }}" - ocp_cluster_domain: "{{ .Values.ibm_cis_cert_manager.ocp_cluster_domain }}" - cis_apikey: "{{ .Values.ibm_cis_cert_manager.cis_apikey }}" - ocp_public_cluster_domain: "{{ .Values.ibm_cis_cert_manager.ocp_public_cluster_domain }}" - ingress: {{ .Values.ibm_cis_cert_manager.ingress }} - - - name: ARGOCD_APP_NAME - value: ibmciscertmanagerapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - - Validate=false -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml b/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml deleted file mode 100644 index 86aea2894..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if not (empty .Values.cis_compliance) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cis-compliance.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "040" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: openshift-compliance - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/040-cis-compliance - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - cis_install_plan: "{{ .Values.cis_compliance.cis_install_plan }}" - junitreporter: - reporter_name: "cis-compliance" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: ciscomplianceapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - - Validate=false - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml b/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml deleted file mode 100644 index c666234db..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml +++ /dev/null @@ -1,66 +0,0 @@ -{{- if not (empty .Values.cis_compliance) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cis-compliance-cleanup.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "041" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io/cleanup -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/041-cis-compliance-cleanup - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - junitreporter: - reporter_name: "cis-compliance-cleanup" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: ciscompliancecleanup - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - - Validate=false -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml deleted file mode 100644 index 0cd8779a9..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if not (empty .Values.nvidia_gpu_operator) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nfd.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "050" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.nvidia_gpu_operator.nfd_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/050-nfd-operator - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - nfd_namespace: "{{ .Values.nvidia_gpu_operator.nfd_namespace }}" - nfd_channel: "{{ .Values.nvidia_gpu_operator.nfd_channel }}" - nfd_install_plan: "{{ .Values.nvidia_gpu_operator.nfd_install_plan }}" - junitreporter: - reporter_name: "nfd-operator" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: nfdapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml deleted file mode 100644 index dcd95f4ac..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml +++ /dev/null @@ -1,71 +0,0 @@ -{{- if not (empty .Values.nvidia_gpu_operator) }} ---- -# IBM Maximo Operator Catalog -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nvidia-gpu.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "051" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.nvidia_gpu_operator.gpu_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/051-nvidia-gpu-operator - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - argo_namespace: "{{ .Values.argo.namespace }}" - gpu_channel: "{{ .Values.nvidia_gpu_operator.gpu_channel }}" - gpu_driver_repository_path: "{{ .Values.nvidia_gpu_operator.gpu_driver_repository_path }}" - gpu_driver_version: "{{ .Values.nvidia_gpu_operator.gpu_driver_version }}" - gpu_install_plan: "{{ .Values.nvidia_gpu_operator.gpu_install_plan }}" - junitreporter: - reporter_name: "nvdia-gpu-operator" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: nvidiagpuapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml deleted file mode 100644 index e8832ac5b..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if not (empty .Values.group_sync_operator) }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: group-sync-operator.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "052" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: group-sync-operator - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/052-group-sync-operator - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - group_sync_operator_cron_schedule: "{{ .Values.group_sync_operator.cron_schedule }}" - group_sync_operator_isv_tenant_url: "{{ .Values.group_sync_operator.isv_tenant_url }}" - group_sync_operator_isv_client_id: "{{ .Values.group_sync_operator.isv_client_id }}" - group_sync_operator_isv_client_secret: "{{ .Values.group_sync_operator.isv_client_secret }}" - group_sync_operator_isv_groups: {{ .Values.group_sync_operator.isv_groups | toYaml | nindent 14 }} - junitreporter: - reporter_name: "group-sync-operator" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: groupsyncoperatorapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml deleted file mode 100644 index 0175d810e..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if and (not (empty .Values.cluster_logging_operator)) (eq .Values.cluster_logging_operator.install "true") }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cluster-logging-operator.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "054" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: openshift-logging - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/054-cluster-logging-operator - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - cluster_id: "{{ .Values.cluster.id }}" - region_id: "{{ .Values.region.id }}" - cluster_logging_operator_use_syslog_forwarder: "{{ .Values.cluster_logging_operator.use_syslog_forwarder }}" - cluster_logging_operator_aws_access_key_id: "{{ .Values.cluster_logging_operator.aws_access_key_id }}" - cluster_logging_operator_aws_secret_access_key: "{{ .Values.cluster_logging_operator.aws_secret_access_key }}" - junitreporter: - reporter_name: "cluster-logging-operator" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: clusterloggingoperatorapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml deleted file mode 100644 index 28e31ac67..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{{- if and (not (empty .Values.instana_agent_operator)) (eq .Values.instana_agent_operator.install "true") }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: instana-agent-operator.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "055" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - ignoreDifferences: - - group: instana.io - kind: InstanaAgent - jsonPointers: - - /spec/agent/configuration_yaml # Handled by CronJob - destination: - server: {{ .Values.cluster.url }} - namespace: instana-agent - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/055-instana-agent-operator - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - instana_agent_operator_key: "{{ .Values.instana_agent_operator.key }}" - instana_agent_operator_endpoint_host: "{{ .Values.instana_agent_operator.endpoint_host }}" - instana_agent_operator_endpoint_port: "{{ .Values.instana_agent_operator.endpoint_port }}" - instana_agent_operator_jks_storage_class: "{{ .Values.instana_agent_operator.jks_storage_class }}" - instana_agent_operator_env: {{ .Values.instana_agent_operator.env | toYaml | nindent 14 }} - junitreporter: - reporter_name: "instana-agent-operator" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: instanaagentoperatorapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml b/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml deleted file mode 100644 index e4894f30f..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if not (empty .Values.custom_sa.custom_sa_namespace) }} ---- -# Custom Service Accounts -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: custom-sa.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "060" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.custom_sa.custom_sa_namespace }} - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/060-custom-sa - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - custom_sa_namespace: "{{ .Values.custom_sa.custom_sa_namespace }}" - {{- if .Values.custom_sa.custom_sa_details }} - custom_sa_details: {{ .Values.custom_sa.custom_sa_details | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "custom-sa" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: customsaapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true -{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml b/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml deleted file mode 100644 index dbceb2e1c..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml +++ /dev/null @@ -1,51 +0,0 @@ -{{- if not (empty .Values.selenium_grid) }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: selenium-grid.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "060" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: {{ .Values.selenium_grid.namespace }} - source: - chart: selenium-grid - repoURL: https://www.selenium.dev/docker-selenium - targetRevision: {{ .Values.selenium_grid.version }} - helm: - releaseName: selenium-grid - values: | -{{ .Values.selenium_grid.values | toYaml | indent 8 }} - - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - ServerSideApply=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml b/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml deleted file mode 100644 index de1acd28c..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if not (empty .Values.ibm_rbac) }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: ibm-rbac.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "061" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/061-ibm-rbac - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - ibm_rbac_binding_to_group: {{ .Values.ibm_rbac.binding_to_group | toYaml | nindent 14 }} - junitreporter: - reporter_name: "ibm-rbac" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: ibmrbacapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml deleted file mode 100644 index 7061e2b3d..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ /dev/null @@ -1,223 +0,0 @@ - ---- -# IBM Maximo Application Suite Instance Application Set -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: instance-appset.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "099" -spec: - goTemplate: true - generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" - template: - metadata: - name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - annotations: - healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - spec: - project: "{{ .Values.argo.projects.rootapps }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-mas-instance-root - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "mas_catalog_version" - value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml b/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml deleted file mode 100644 index 377778ce3..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml +++ /dev/null @@ -1,85 +0,0 @@ -{{- if not (empty .Values.promotion) }} ---- -# Cluster Promotion -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: cluster-promotion.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "200" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: mas-syncres - source: - repoURL: "{{ .Values.source.repo_url }}" - path: cluster-applications/200-cluster-promotion - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - {{- if .Values.promotion }} - github_pat: "{{ .Values.promotion.github_pat }}" - target_github_host: "{{ .Values.promotion.target_github_host }}" - target_github_repo: "{{ .Values.promotion.target_github_repo }}" - target_github_org: "{{ .Values.promotion.target_github_org }}" - target_github_path: "{{ .Values.promotion.target_github_path }}" - target_git_branch: "{{ .Values.promotion.target_git_branch }}" - create_target_pr: "{{ .Values.promotion.create_target_pr }}" - target_pr_title: "{{ .Values.promotion.target_pr_title }}" - cluster_values: {{- range .Values.promotion.cluster_values }} - - {{ quote . }}{{- end }} - target_pr_title: "{{ .Values.promotion.target_pr_title }}" - mas_catalog_version: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - {{- end }} - junitreporter: - reporter_name: "cluster-promotion" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - name: ARGOCD_APP_NAME - value: promoteapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} \ No newline at end of file From 24d1bd2a3f32391592743a7ff5ef3c24a4698f78 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Mon, 24 Mar 2025 19:04:40 +0530 Subject: [PATCH 021/491] Update 100-aibroker-instance-appset.yaml update --- .../100-aibroker-instance-appset.yaml | 138 +----------------- 1 file changed, 2 insertions(+), 136 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index e449b7514..ce92820a2 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -28,112 +28,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-minio-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -166,36 +61,7 @@ spec: parameters: - name: "generator.repo_url" value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "mas_catalog_version" - value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" + destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} From 54dbe38cf6c98a4294c88078c45281efaf7d8a25 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Tue, 25 Mar 2025 00:24:00 +0530 Subject: [PATCH 022/491] Update 100-aibroker-instance-appset.yaml --- .../100-aibroker-instance-appset.yaml | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index ce92820a2..0a163078a 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -8,8 +8,8 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' + region: '{{ .Values.region.id }}' annotations: argocd.argoproj.io/sync-wave: "100" spec: @@ -24,11 +24,18 @@ spec: - 'merge-key' generators: # This is the "base" generator, it *must* be first in the list + + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.region.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-minio-install.yaml" + - path: "{{ .Values.ibm_minio.minio_namespace }}/{{ .Values.ibm_minio.minio_root_user }}/{{ .Values.ibm_minio.minio_root_password }}/{{ .Values.ibm_minio.minio_storage_class }}/{{ .Values.ibm_minio.minio_storage_size }}/{{ .Values.ibm_minio.minio_image }}/*/ibm-aibroker-minio-install.yaml" + syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -61,6 +68,14 @@ spec: parameters: - name: "generator.repo_url" value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: "argo.namespace" + value: "{{ .Values.argo.namespace }}" destination: server: 'https://kubernetes.default.svc' @@ -86,4 +101,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file + revisionHistoryLimit: 1 From 30eecffeba002e3a5dfb71db00ac5ea7482ed3d1 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Tue, 25 Mar 2025 00:41:29 +0530 Subject: [PATCH 023/491] deleted unused instance root app files deleted unused instance root app files --- .../templates/000-ibm-sync-resources.yaml | 118 ------------------ .../templates/010-ibm-sync-jobs.yaml | 118 ------------------ 2 files changed, 236 deletions(-) delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml b/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml deleted file mode 100644 index 9873f026e..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/000-ibm-sync-resources.yaml +++ /dev/null @@ -1,118 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: syncres.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "000" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: mas-{{ .Values.instance.id }}-syncres - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/000-ibm-sync-resources - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - argo_namespace: "{{ .Values.argo.namespace }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - sm_aws_region: "{{ .Values.region.id }}" - {{- if not (empty .Values.ibm_sls) }} - {{- if eq .Values.ibm_sls.mongodb_provider "aws" }} - docdb: - master_username: "{{ .Values.ibm_sls.docdb_master_username }}" - master_password: "{{ .Values.ibm_sls.docdb_master_password }}" - instance_username: "{{ .Values.ibm_sls.sls_mongo_username }}" - instance_password: "{{ .Values.ibm_sls.sls_mongo_password }}" - master_info: {{ .Values.ibm_sls.docdb_master_info }} - {{- end }} - {{- end }} - - {{- if not (empty .Values.ibm_mas_suite) }} - - mas_manual_cert_mgmt: {{ .Values.ibm_mas_suite.mas_manual_cert_mgmt }} - dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" - mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" - mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" - mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" - ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" - cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" - cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" - - cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" - cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" - cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" - cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" - cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" - cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" - cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" - update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" - delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" - override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" - - {{- if .Values.ibm_mas_suite.manual_certs }} - manual_certs: {{ .Values.ibm_mas_suite.manual_certs | toYaml | nindent 14 }} - {{- end }} - - {{- end }} - - junitreporter: - reporter_name: "ibm-sync-resources-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - - name: ARGOCD_APP_NAME - value: syncres - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - - RespectIgnoreDifferences=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml b/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml deleted file mode 100644 index dbdc9fdcf..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/010-ibm-sync-jobs.yaml +++ /dev/null @@ -1,118 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: syncjobs.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "010" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io - - post-delete-finalizer.argocd.argoproj.io/cleanup -spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: default - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/010-ibm-sync-jobs - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - account_id: "{{ .Values.account.id }}" - region_id: "{{ .Values.region.id }}" - cluster_id: "{{ .Values.cluster.id }}" - instance_id: "{{ .Values.instance.id }}" - sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" - sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" - sm_aws_region: "{{ .Values.region.id }}" - {{- if not (empty .Values.ibm_cp4d) }} - cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" - {{- end }} - {{- if not (empty .Values.ibm_sls) }} - {{- if eq .Values.ibm_sls.mongodb_provider "aws" }} - docdb: - master_username: "{{ .Values.ibm_sls.docdb_master_username }}" - master_password: "{{ .Values.ibm_sls.docdb_master_password }}" - instance_password: "{{ .Values.ibm_sls.sls_mongo_password }}" - master_info: {{ .Values.ibm_sls.docdb_master_info }} - {{- end }} - {{- end }} - - {{- if not (empty .Values.ibm_mas_suite) }} - - mas_manual_cert_mgmt: {{ .Values.ibm_mas_suite.mas_manual_cert_mgmt }} - dns_provider: "{{ .Values.ibm_mas_suite.dns_provider }}" - mas_workspace_id: "{{ .Values.ibm_mas_suite.mas_workspace_id }}" - mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" - mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" - ocp_cluster_domain: "{{ .Values.ibm_mas_suite.ocp_cluster_domain }}" - cis_apikey: "{{ .Values.ibm_mas_suite.cis_apikey }}" - cis_crn: "{{ .Values.ibm_mas_suite.cis_crn }}" - - cis_email: "{{ .Values.ibm_mas_suite.cis_email }}" - cis_subdomain: "{{ .Values.ibm_mas_suite.cis_subdomain }}" - cis_mas_domain: "{{ .Values.ibm_mas_suite.cis_mas_domain }}" - cis_enhanced_security: "{{ .Values.ibm_mas_suite.cis_enhanced_security }}" - cis_waf: "{{ .Values.ibm_mas_suite.cis_waf }}" - cis_proxy: "{{ .Values.ibm_mas_suite.cis_proxy }}" - cis_service_name: "{{ .Values.ibm_mas_suite.cis_service_name }}" - update_dns_entries: "{{ .Values.ibm_mas_suite.update_dns_entries }}" - delete_wildcards: "{{ .Values.ibm_mas_suite.delete_wildcards }}" - override_edge_certs: "{{ .Values.ibm_mas_suite.override_edge_certs }}" - - {{- if .Values.ibm_mas_suite.manual_certs }} - manual_certs: {{ .Values.ibm_mas_suite.manual_certs | toYaml | nindent 14 }} - {{- end }} - - {{- end }} - - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - - junitreporter: - reporter_name: "ibm-sync-jobs-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - mas_wipe_mongo_data: {{ .Values.mas_wipe_mongo_data }} - - - name: ARGOCD_APP_NAME - value: syncres - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true From 93964269c130898638a24f1b6501ab2f0c16f5da Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Tue, 25 Mar 2025 11:38:27 +0530 Subject: [PATCH 024/491] revert back missing changes --- .../000-ibm-operator-catalog-app.yaml | 70 ++++++ .../010-ibm-redhat-cert-manager-app.yaml | 76 ++++++ .../templates/020-ibm-dro-app.yaml | 90 +++++++ .../templates/021-ibm-dro-cleanup.yaml | 66 +++++ .../templates/030-ibm-cis-cert-manager.yaml | 71 ++++++ .../templates/040-cis-compliance-app.yaml | 70 ++++++ .../templates/041-cis-compliance-cleanup.yaml | 66 +++++ .../templates/050-nfd-operator-app.yaml | 71 ++++++ .../051-nvidia-gpu-operator-app.yaml | 71 ++++++ .../052-group-sync-operator-app.yaml | 70 ++++++ .../054-cluster-logging-operator-app.yaml | 70 ++++++ .../055-instana-agent-operator-app.yaml | 81 +++++++ .../templates/060-custom-sa.yaml | 70 ++++++ .../templates/060-selenium-grid.yaml | 51 ++++ .../templates/061-ibm-rbac-app.yaml | 62 +++++ .../templates/099-instance-appset.yaml | 228 ++++++++++++++++++ .../100-aibroker-instance-appset.yaml | 47 +++- .../templates/200-cluster-promotion-app.yaml | 85 +++++++ 18 files changed, 1407 insertions(+), 8 deletions(-) create mode 100644 root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml diff --git a/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml b/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml new file mode 100644 index 000000000..806b3f2f4 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/000-ibm-operator-catalog-app.yaml @@ -0,0 +1,70 @@ +{{- if not (empty .Values.ibm_operator_catalog) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: operator-catalog.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "000" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/000-ibm-operator-catalog + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + ibm_entitlement_key: "{{ .Values.ibm_operator_catalog.ibm_entitlement_key }}" + mas_catalog_version: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + mas_catalog_image: "{{ .Values.ibm_operator_catalog.mas_catalog_image }}" + junitreporter: + reporter_name: "ibm-operator-catalog" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: operatorcatalogapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml new file mode 100644 index 000000000..dc405e7e7 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -0,0 +1,76 @@ +{{- if not (empty .Values.redhat_cert_manager) }} +--- +# Redhat Cert Manager +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redhat-cert-manager.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "010" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: cert-manager-operator + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/010-redhat-cert-manager + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + channel: "{{ .Values.redhat_cert_manager.channel }}" + run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} + redhat_cert_manager_install_plan: "{{ .Values.redhat_cert_manager.redhat_cert_manager_install_plan }}" + junitreporter: + reporter_name: "redhat-cert-manager" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: rcmapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml b/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml new file mode 100644 index 000000000..c9080cc6f --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml @@ -0,0 +1,90 @@ +{{- if not (empty .Values.ibm_dro) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: dro.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "020" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_dro.dro_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/020-ibm-dro + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + run_sync_hooks: {{.Values.ibm_dro.run_sync_hooks }} + dro_namespace: "{{ .Values.ibm_dro.dro_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_dro.ibm_entitlement_key }}" + dro_cmm_setup: "{{ .Values.ibm_dro.dro_cmm_setup }}" + dro_install_plan: "{{ .Values.ibm_dro.dro_install_plan }}" + imo_install_plan: "{{ .Values.ibm_dro.imo_install_plan }}" + junitreporter: + reporter_name: "ibm-dro" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.ibm_dro.dro_cmm_setup }} + dro_cmm: + auth_apikey: "{{ .Values.ibm_dro.dro_cmm.auth_apikey }}" + auth_url: "{{ .Values.ibm_dro.dro_cmm.auth_url }}" + cmm_url: "{{ .Values.ibm_dro.dro_cmm.cmm_url }}" + {{- end }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: droapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml b/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml new file mode 100644 index 000000000..f6c0d1ba1 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/021-ibm-dro-cleanup.yaml @@ -0,0 +1,66 @@ +{{- if not (empty .Values.ibm_dro) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: ibm-dro-cleanup.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "021" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io/cleanup +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/021-ibm-dro-cleanup + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + dro_namespace: "{{ .Values.ibm_dro.dro_namespace }}" + junitreporter: + reporter_name: "ibm-dro-cleanup" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: ibmdrocleanup + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + - Validate=false +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml b/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml new file mode 100644 index 000000000..5fc53f990 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/030-ibm-cis-cert-manager.yaml @@ -0,0 +1,71 @@ +{{- if not (empty .Values.ibm_cis_cert_manager) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: ibm-cis-cert-manager.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "030" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/030-ibm-cis-cert-manager + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-cis-cert-manager" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + dns_provider: "{{ .Values.ibm_cis_cert_manager.dns_provider }}" + ocp_cluster_domain: "{{ .Values.ibm_cis_cert_manager.ocp_cluster_domain }}" + cis_apikey: "{{ .Values.ibm_cis_cert_manager.cis_apikey }}" + ocp_public_cluster_domain: "{{ .Values.ibm_cis_cert_manager.ocp_public_cluster_domain }}" + ingress: {{ .Values.ibm_cis_cert_manager.ingress }} + + - name: ARGOCD_APP_NAME + value: ibmciscertmanagerapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + - Validate=false +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml b/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml new file mode 100644 index 000000000..86aea2894 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml @@ -0,0 +1,70 @@ +{{- if not (empty .Values.cis_compliance) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cis-compliance.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "040" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: openshift-compliance + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/040-cis-compliance + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + cis_install_plan: "{{ .Values.cis_compliance.cis_install_plan }}" + junitreporter: + reporter_name: "cis-compliance" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: ciscomplianceapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + - Validate=false + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml b/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml new file mode 100644 index 000000000..c666234db --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/041-cis-compliance-cleanup.yaml @@ -0,0 +1,66 @@ +{{- if not (empty .Values.cis_compliance) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cis-compliance-cleanup.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "041" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io/cleanup +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/041-cis-compliance-cleanup + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + junitreporter: + reporter_name: "cis-compliance-cleanup" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: ciscompliancecleanup + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + - Validate=false +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml new file mode 100644 index 000000000..443fff2cf --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml @@ -0,0 +1,71 @@ +{{- if not (empty .Values.nvidia_gpu_operator) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: nfd.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "050" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.nvidia_gpu_operator.nfd_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/050-nfd-operator + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + nfd_image: "{{ .Values.nvidia_gpu_operator.nfd_image }}" + nfd_namespace: "{{ .Values.nvidia_gpu_operator.nfd_namespace }}" + nfd_channel: "{{ .Values.nvidia_gpu_operator.nfd_channel }}" + nfd_install_plan: "{{ .Values.nvidia_gpu_operator.nfd_install_plan }}" + junitreporter: + reporter_name: "nfd-operator" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: nfdapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml new file mode 100644 index 000000000..dcd95f4ac --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml @@ -0,0 +1,71 @@ +{{- if not (empty .Values.nvidia_gpu_operator) }} +--- +# IBM Maximo Operator Catalog +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: nvidia-gpu.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "051" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.nvidia_gpu_operator.gpu_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/051-nvidia-gpu-operator + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + argo_namespace: "{{ .Values.argo.namespace }}" + gpu_channel: "{{ .Values.nvidia_gpu_operator.gpu_channel }}" + gpu_driver_repository_path: "{{ .Values.nvidia_gpu_operator.gpu_driver_repository_path }}" + gpu_driver_version: "{{ .Values.nvidia_gpu_operator.gpu_driver_version }}" + gpu_install_plan: "{{ .Values.nvidia_gpu_operator.gpu_install_plan }}" + junitreporter: + reporter_name: "nvdia-gpu-operator" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: nvidiagpuapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml new file mode 100644 index 000000000..e8832ac5b --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml @@ -0,0 +1,70 @@ +{{- if not (empty .Values.group_sync_operator) }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: group-sync-operator.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "052" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: group-sync-operator + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/052-group-sync-operator + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + group_sync_operator_cron_schedule: "{{ .Values.group_sync_operator.cron_schedule }}" + group_sync_operator_isv_tenant_url: "{{ .Values.group_sync_operator.isv_tenant_url }}" + group_sync_operator_isv_client_id: "{{ .Values.group_sync_operator.isv_client_id }}" + group_sync_operator_isv_client_secret: "{{ .Values.group_sync_operator.isv_client_secret }}" + group_sync_operator_isv_groups: {{ .Values.group_sync_operator.isv_groups | toYaml | nindent 14 }} + junitreporter: + reporter_name: "group-sync-operator" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: groupsyncoperatorapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml new file mode 100644 index 000000000..0175d810e --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml @@ -0,0 +1,70 @@ +{{- if and (not (empty .Values.cluster_logging_operator)) (eq .Values.cluster_logging_operator.install "true") }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cluster-logging-operator.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "054" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: openshift-logging + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/054-cluster-logging-operator + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + cluster_id: "{{ .Values.cluster.id }}" + region_id: "{{ .Values.region.id }}" + cluster_logging_operator_use_syslog_forwarder: "{{ .Values.cluster_logging_operator.use_syslog_forwarder }}" + cluster_logging_operator_aws_access_key_id: "{{ .Values.cluster_logging_operator.aws_access_key_id }}" + cluster_logging_operator_aws_secret_access_key: "{{ .Values.cluster_logging_operator.aws_secret_access_key }}" + junitreporter: + reporter_name: "cluster-logging-operator" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: clusterloggingoperatorapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml new file mode 100644 index 000000000..28e31ac67 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml @@ -0,0 +1,81 @@ +{{- if and (not (empty .Values.instana_agent_operator)) (eq .Values.instana_agent_operator.install "true") }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: instana-agent-operator.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "055" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + ignoreDifferences: + - group: instana.io + kind: InstanaAgent + jsonPointers: + - /spec/agent/configuration_yaml # Handled by CronJob + destination: + server: {{ .Values.cluster.url }} + namespace: instana-agent + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/055-instana-agent-operator + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + instana_agent_operator_key: "{{ .Values.instana_agent_operator.key }}" + instana_agent_operator_endpoint_host: "{{ .Values.instana_agent_operator.endpoint_host }}" + instana_agent_operator_endpoint_port: "{{ .Values.instana_agent_operator.endpoint_port }}" + instana_agent_operator_jks_storage_class: "{{ .Values.instana_agent_operator.jks_storage_class }}" + instana_agent_operator_env: {{ .Values.instana_agent_operator.env | toYaml | nindent 14 }} + junitreporter: + reporter_name: "instana-agent-operator" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: instanaagentoperatorapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml b/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml new file mode 100644 index 000000000..e4894f30f --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/060-custom-sa.yaml @@ -0,0 +1,70 @@ +{{- if not (empty .Values.custom_sa.custom_sa_namespace) }} +--- +# Custom Service Accounts +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: custom-sa.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "060" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.custom_sa.custom_sa_namespace }} + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/060-custom-sa + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}" + sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" + custom_sa_namespace: "{{ .Values.custom_sa.custom_sa_namespace }}" + {{- if .Values.custom_sa.custom_sa_details }} + custom_sa_details: {{ .Values.custom_sa.custom_sa_details | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "custom-sa" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: customsaapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml b/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml new file mode 100644 index 000000000..dbceb2e1c --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml @@ -0,0 +1,51 @@ +{{- if not (empty .Values.selenium_grid) }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: selenium-grid.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "060" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: {{ .Values.selenium_grid.namespace }} + source: + chart: selenium-grid + repoURL: https://www.selenium.dev/docker-selenium + targetRevision: {{ .Values.selenium_grid.version }} + helm: + releaseName: selenium-grid + values: | +{{ .Values.selenium_grid.values | toYaml | indent 8 }} + + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml b/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml new file mode 100644 index 000000000..de1acd28c --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/061-ibm-rbac-app.yaml @@ -0,0 +1,62 @@ +{{- if not (empty .Values.ibm_rbac) }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: ibm-rbac.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "061" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: default + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/061-ibm-rbac + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + ibm_rbac_binding_to_group: {{ .Values.ibm_rbac.binding_to_group | toYaml | nindent 14 }} + junitreporter: + reporter_name: "ibm-rbac" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: ibmrbacapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml new file mode 100644 index 000000000..99efe4fdc --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -0,0 +1,228 @@ + +--- +# IBM Maximo Application Suite Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: instance-appset.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "099" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-mas-instance-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: "mas_catalog_version" + value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 0a163078a..a1a1143d9 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -8,8 +8,8 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "100" spec: @@ -24,18 +24,16 @@ spec: - 'merge-key' generators: # This is the "base" generator, it *must* be first in the list - - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.region.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.ibm_minio.minio_namespace }}/{{ .Values.ibm_minio.minio_root_user }}/{{ .Values.ibm_minio.minio_root_password }}/{{ .Values.ibm_minio.minio_storage_class }}/{{ .Values.ibm_minio.minio_storage_size }}/{{ .Values.ibm_minio.minio_image }}/*/ibm-aibroker-minio-install.yaml" - + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-minio-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -74,9 +72,42 @@ spec: value: "{{ .Values.source.revision }}" - name: "source.repo_url" value: "{{ .Values.source.repo_url }}" - - name: "argo.namespace" + - name: argo.namespace value: "{{ .Values.argo.namespace }}" - + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: "minio_namespace" + value: "{{ .Values.ibm_minio.minio_namespace }}" + - name: "minio_instance_name" + value: "{{ .Values.ibm_minio.minio_instance_name }}" + - name: "minio_root_user" + value: "{{ .Values.ibm_minio.minio_root_user }}" + - name: "minio_root_password" + value: "{{ .Values.ibm_minio.minio_root_password }}" + - name: "minio_storage_class" + value: "{{ .Values.ibm_minio.minio_storage_class }}" + - name: "minio_storage_size" + value: "{{ .Values.ibm_minio.minio_storage_size }}" + - name: "minio_image" + value: "{{ .Values.ibm_minio.minio_image }}" + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} @@ -101,4 +132,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml b/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml new file mode 100644 index 000000000..377778ce3 --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml @@ -0,0 +1,85 @@ +{{- if not (empty .Values.promotion) }} +--- +# Cluster Promotion +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cluster-promotion.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "200" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: mas-syncres + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/200-cluster-promotion + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + account_id: "{{ .Values.account.id }}" + region_id: "{{ .Values.region.id }}" + cluster_id: "{{ .Values.cluster.id }}" + argo_namespace: "{{ .Values.argo.namespace }}" + {{- if .Values.promotion }} + github_pat: "{{ .Values.promotion.github_pat }}" + target_github_host: "{{ .Values.promotion.target_github_host }}" + target_github_repo: "{{ .Values.promotion.target_github_repo }}" + target_github_org: "{{ .Values.promotion.target_github_org }}" + target_github_path: "{{ .Values.promotion.target_github_path }}" + target_git_branch: "{{ .Values.promotion.target_git_branch }}" + create_target_pr: "{{ .Values.promotion.create_target_pr }}" + target_pr_title: "{{ .Values.promotion.target_pr_title }}" + cluster_values: {{- range .Values.promotion.cluster_values }} + - {{ quote . }}{{- end }} + target_pr_title: "{{ .Values.promotion.target_pr_title }}" + mas_catalog_version: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + {{- end }} + junitreporter: + reporter_name: "cluster-promotion" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: promoteapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file From 3a040119e49bf95b89cf227cf602335958c694bd Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Tue, 25 Mar 2025 12:25:09 +0530 Subject: [PATCH 025/491] Update 06-odh-namespace.yaml fix namespace --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index 4c3a7342d..a540f22e7 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -3,5 +3,5 @@ # apiVersion: v1 # kind: Namespace # metadata: -# name: "{{ .Values.openshift_namespace }}" -# argocd.argoproj.io/sync-wave: "120" \ No newline at end of file +# name: "{{ .Values.aibroker_namespace }}" +# argocd.argoproj.io/sync-wave: "120" From 4189a990058764864b8baa293620d59980531dbc Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 25 Mar 2025 14:17:49 +0530 Subject: [PATCH 026/491] keep encoded value for db password and created namespace for the aibroker --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 12 ++++++------ .../templates/07-odh-external-secret-db.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index a540f22e7..a6cc6b154 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -1,7 +1,7 @@ # create new workspace is not needed , because argocd will create new namespace bydefault -# --- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: "{{ .Values.aibroker_namespace }}" -# argocd.argoproj.io/sync-wave: "120" +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + argocd.argoproj.io/sync-wave: "120" diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml index 04182cd58..fb4925035 100644 --- a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" argocd.argoproj.io/sync-wave: "121" type: Opaque -stringData: - password: "{{ .Values.mas_aibroker_db_secret_value }}" # need to verify is it b64enc -# data: -# password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} +# stringData: +# password: "{{ .Values.mas_aibroker_db_secret_value }}" # need to verify is it b64enc +data: + password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} From 41ff9f961b2c27e59890f4bc7496eb57691c33d1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 26 Mar 2025 12:25:27 +0530 Subject: [PATCH 027/491] odh job created odh-perator job created --- .../01-odh-pipeline-operator-subcription.yaml | 7 +++-- .../templates/05-odh-operator-job.yaml | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 8a8646995..f918f05bd 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -3,8 +3,9 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: namespace: "{{ .Values.openshift_namespace }}" - package_name: "openshift-pipelines-operator-rh" - package_channel: "{{ .Values.pipeline_channel }}" - catalog_source: "{{ .Values.pipeline_catalog_source }}" annotations: argocd.argoproj.io/sync-wave: "113" +spec: + package_name: "openshift-pipelines-operator-rh" + package_channel: "{{ .Values.pipeline_channel }}" + catalog_source: "{{ .Values.pipeline_catalog_source }}" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml new file mode 100644 index 000000000..8f98d45a1 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: batch/v1 +kind: Job +metadata: + namespace: {{ .Values.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "00" +spec: + template: + spec: + serviceAccountName: {{ .Values.serviceAccountName }} + containers: + - name: run + image: quay.io/ibmmas/cli:latest + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + command: + - /bin/sh + - -c + - | + oc patch installplan {{ | first }} -n openshift-operators --type merge --patch '{"spec":{"approved":true}}' + echo "Approve install plan for Opendatahub operator" + restartPolicy: OnFailure \ No newline at end of file From 5fa4cd8d2f3bd9e5248d6a7019a78fb9d5d7282d Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 12:40:23 +0530 Subject: [PATCH 028/491] updates the region --- .../templates/020-ibm-minio-app.yaml | 2 +- .../templates/100-aibroker-instance-appset.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index 7aa4221a7..10917c862 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -8,7 +8,7 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' + # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index a1a1143d9..1566f7cf1 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -8,7 +8,7 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' +# region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "100" @@ -41,7 +41,7 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' + # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -49,7 +49,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" + argocd.argoproj.io/sync-wave: "100" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} From 5131fcc4307757fef2ac06a40fc63dc2a6496b8f Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 12:44:58 +0530 Subject: [PATCH 029/491] comment the values yaml --- .../ibm-aibroker-instance-root/values.yaml | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 56ba471f0..35e5d9ed8 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -1,58 +1,58 @@ ---- +# --- -avp: - name: "argocd-vault-plugin-helm" - secret: "" - values_varname: "HELM_VALUES" +# avp: +# name: "argocd-vault-plugin-helm" +# secret: "" +# values_varname: "HELM_VALUES" -account: - id: dev +# account: +# id: dev -cluster: - id: cluster1 +# cluster: +# id: cluster1 -region: - id: region1 +# region: +# id: region1 -instance: - id: inst1 +# instance: +# id: inst1 -source: - repo_url: "https://github.com/ibm-mas/gitops" - revision: "poc" +# source: +# repo_url: "https://github.com/ibm-mas/gitops" +# revision: "poc" -# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), -# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified -# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) -# generator: -# repo_url: "" -# revision: "" +# # Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# # So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# # Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# # generator: +# # repo_url: "" +# # revision: "" -# These defaults align with the ArgoCD worker setup by gitops-bootstrap -# (openshift-gitops with a single ArgoCD project "mas") -argo: - namespace: "openshift-gitops" - projects: - rootapps: "mas" - apps: "mas" +# # These defaults align with the ArgoCD worker setup by gitops-bootstrap +# # (openshift-gitops with a single ArgoCD project "mas") +# argo: +# namespace: "openshift-gitops" +# projects: +# rootapps: "mas" +# apps: "mas" -auto_delete: false +# auto_delete: false -sm: - aws_access_key_id: xxxx +# sm: +# aws_access_key_id: xxxx -run_sanity_test: false +# run_sanity_test: false -devops: - mongo_uri: - build_number: +# devops: +# mongo_uri: +# build_number: -ibm_minio: - minio_namespace: "minio_namespace" - minio_instance_name: "minio" - minio_root_user: "minio" - minio_root_password: "" - minio_storage_class: "default" - minio_storage_size: "40Gi" - minio_image: "quay.io/minio/minio:latest" \ No newline at end of file +# ibm_minio: +# minio_namespace: "minio_namespace" +# minio_instance_name: "minio" +# minio_root_user: "minio" +# minio_root_password: "" +# minio_storage_class: "default" +# minio_storage_size: "40Gi" +# minio_image: "quay.io/minio/minio:latest" \ No newline at end of file From 56753bfc9cbfd7094e079b806c1547b98547243a Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 12:58:35 +0530 Subject: [PATCH 030/491] comment the values yaml --- .../ibm-aibroker-instance-root/values.yaml | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 35e5d9ed8..56ba471f0 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -1,58 +1,58 @@ -# --- +--- -# avp: -# name: "argocd-vault-plugin-helm" -# secret: "" -# values_varname: "HELM_VALUES" +avp: + name: "argocd-vault-plugin-helm" + secret: "" + values_varname: "HELM_VALUES" -# account: -# id: dev +account: + id: dev -# cluster: -# id: cluster1 +cluster: + id: cluster1 -# region: -# id: region1 +region: + id: region1 -# instance: -# id: inst1 +instance: + id: inst1 -# source: -# repo_url: "https://github.com/ibm-mas/gitops" -# revision: "poc" +source: + repo_url: "https://github.com/ibm-mas/gitops" + revision: "poc" -# # Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), -# # So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified -# # Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) -# # generator: -# # repo_url: "" -# # revision: "" +# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# generator: +# repo_url: "" +# revision: "" -# # These defaults align with the ArgoCD worker setup by gitops-bootstrap -# # (openshift-gitops with a single ArgoCD project "mas") -# argo: -# namespace: "openshift-gitops" -# projects: -# rootapps: "mas" -# apps: "mas" +# These defaults align with the ArgoCD worker setup by gitops-bootstrap +# (openshift-gitops with a single ArgoCD project "mas") +argo: + namespace: "openshift-gitops" + projects: + rootapps: "mas" + apps: "mas" -# auto_delete: false +auto_delete: false -# sm: -# aws_access_key_id: xxxx +sm: + aws_access_key_id: xxxx -# run_sanity_test: false +run_sanity_test: false -# devops: -# mongo_uri: -# build_number: +devops: + mongo_uri: + build_number: -# ibm_minio: -# minio_namespace: "minio_namespace" -# minio_instance_name: "minio" -# minio_root_user: "minio" -# minio_root_password: "" -# minio_storage_class: "default" -# minio_storage_size: "40Gi" -# minio_image: "quay.io/minio/minio:latest" \ No newline at end of file +ibm_minio: + minio_namespace: "minio_namespace" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "" + minio_storage_class: "default" + minio_storage_size: "40Gi" + minio_image: "quay.io/minio/minio:latest" \ No newline at end of file From 0caa5f4598c1c904dc3eb6656921e97e2fb50e1c Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:10:31 +0530 Subject: [PATCH 031/491] fix values for minio in cluster values --- root-applications/ibm-mas-cluster-root/values.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 31e327fa3..6537eb399 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -48,4 +48,13 @@ devops: custom_sa: custom_sa_namespace: - custom_sa_details: \ No newline at end of file + custom_sa_details: + +ibm_minio: + minio_namespace: "minio" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "minio123" + minio_storage_class: "default" + minio_storage_size: "40Gi" + minio_image: "quay.io/minio/minio:latest" \ No newline at end of file From d4fc73d09d7929887f7261d87759103461d5f611 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:15:53 +0530 Subject: [PATCH 032/491] fix values for minio in cluster values --- .../templates/100-aibroker-instance-appset.yaml | 2 +- root-applications/ibm-mas-cluster-root/values.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 1566f7cf1..b62d70b0d 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -4,7 +4,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: instance-appset.{{ .Values.cluster.id }} + name: aibroker-instance-appset.{{ .Values.cluster.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 6537eb399..dd9780e86 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -7,20 +7,20 @@ avp: values_varname: "HELM_VALUES" account: - id: inst1 + id: fyre-sre-dev -region: - id: region1 +# region: +# id: region1 cluster: - id: cluster1 + id: sremat-test generator: repo_url: xxxx source: repo_url: "https://github.com/ibm-mas/gitops" - revision: "poc" + revision: "aibroker" # Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), # So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified From 7ef43f89ec667737168cdd26335a6ce9dca976c5 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:17:25 +0530 Subject: [PATCH 033/491] fix values for minio in cluster values --- .../templates/100-aibroker-instance-appset.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index b62d70b0d..6b42b7548 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -8,7 +8,6 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "100" @@ -41,7 +40,6 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} From a4749c5996ab583b2a29a87ffc922a52f1b3dae5 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:18:49 +0530 Subject: [PATCH 034/491] fix values for minio in cluster values --- root-applications/ibm-mas-cluster-root/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index dd9780e86..3e382150d 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -9,8 +9,8 @@ avp: account: id: fyre-sre-dev -# region: -# id: region1 +region: + id: us-east-1 cluster: id: sremat-test From 5ceeef36f3e22a5576d2ab79ffb486de82d97e3e Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:35:40 +0530 Subject: [PATCH 035/491] fix values for minio in cluster values --- .../templates/100-aibroker-instance-appset.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 6b42b7548..450d45e69 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -22,12 +22,7 @@ spec: # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - 'merge-key' generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + # This is the "base" generator, it *must* be first in the list - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 755b0bd0d864a63cf6e14ee3a24c2f8f56054cc8 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 13:38:06 +0530 Subject: [PATCH 036/491] fix values for minio in cluster values --- .../templates/100-aibroker-instance-appset.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 450d45e69..4855b8de9 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -22,7 +22,13 @@ spec: # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - 'merge-key' generators: - # This is the "base" generator, it *must* be first in the list + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 7537d523ce0581022e6b8e9203f1a9b35726a85d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 26 Mar 2025 16:30:58 +0530 Subject: [PATCH 037/491] Odh job with role rb and sa --- .../templates/05-odh-operator-job.yaml | 68 ++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 8f98d45a1..9545f8017 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,10 +1,76 @@ + +{{ $ns := "openshift-operators"}} +{{ $role_name := "odh-installplan-ra" }} +{{ $sa_name := "odh-installplan-sa" }} +{{ $rb_name := "odh-installplan-rb" }} + +--- +kind: ServiceAccount +apiVersion: v1 +metadata: + name: {{ $sa_name }} + namespace: {{ $ns }} + annotations: + argocd.argoproj.io/sync-wave: "013" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} + +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ $role_name }} + annotations: + argocd.argoproj.io/sync-wave: "013" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +rules: + - verbs: + - get + apiGroups: + - packages.operators.coreos.com + resources: + - packagemanifests + - verbs: + - get + apiGroups: + - config.openshift.io + resources: + - ingresses + + + +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ $rb_name }} + annotations: + argocd.argoproj.io/sync-wave: "014" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +subjects: + - kind: ServiceAccount + name: {{ $sa_name }} + namespace: {{ $ns }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ $role_name }} + --- apiVersion: batch/v1 kind: Job metadata: namespace: {{ .Values.namespace }} annotations: - argocd.argoproj.io/sync-wave: "00" + argocd.argoproj.io/sync-wave: "016" spec: template: spec: From 21ef03b11aa1e1f2e5bee68bf1f97928a3efa05f Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 16:40:09 +0530 Subject: [PATCH 038/491] fix name of file --- .../templates/100-aibroker-instance-appset.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 4855b8de9..4b2e305c8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -27,13 +27,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-minio-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From ff5aeb9aadd382a26a15825f63ae009e9f6ce9b5 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 16:50:51 +0530 Subject: [PATCH 039/491] rename file name and sync --- ...instance-appset.yaml => 098-aibroker-instance-appset.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename root-applications/ibm-mas-cluster-root/templates/{100-aibroker-instance-appset.yaml => 098-aibroker-instance-appset.yaml} (98%) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml similarity index 98% rename from root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml rename to root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml index 4b2e305c8..c1348da93 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml @@ -10,7 +10,7 @@ metadata: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' annotations: - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "098" spec: goTemplate: true generators: @@ -47,7 +47,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "098" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} From 44c690f173cbbf39c2581c26a2a1a432305d49f6 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 17:01:19 +0530 Subject: [PATCH 040/491] rename file name and sync --- ...instance-appset.yaml => 100-aibroker-instance-appset.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename root-applications/ibm-mas-cluster-root/templates/{098-aibroker-instance-appset.yaml => 100-aibroker-instance-appset.yaml} (98%) diff --git a/root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml similarity index 98% rename from root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml rename to root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index c1348da93..4b2e305c8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/098-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -10,7 +10,7 @@ metadata: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' annotations: - argocd.argoproj.io/sync-wave: "098" + argocd.argoproj.io/sync-wave: "100" spec: goTemplate: true generators: @@ -47,7 +47,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "098" + argocd.argoproj.io/sync-wave: "100" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} From b3526348f3fa0ce411b8ca53d260aaadd1c90d67 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 17:08:55 +0530 Subject: [PATCH 041/491] rename file name and sync --- .../templates/100-aibroker-instance-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml index 4b2e305c8..893d0a080 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -27,7 +27,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 2fe8a0c719aa7e53da19400b3faa80cd52156268 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 17:15:07 +0530 Subject: [PATCH 042/491] rename file name and sync --- .../templates/099-instance-appset.yaml | 135 +++--------------- .../100-aibroker-instance-appset.yaml | 133 ----------------- 2 files changed, 20 insertions(+), 248 deletions(-) delete mode 100644 root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 99efe4fdc..893d0a080 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -4,14 +4,13 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: instance-appset.{{ .Values.cluster.id }} + name: aibroker-instance-appset.{{ .Values.cluster.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: - argocd.argoproj.io/sync-wave: "099" + argocd.argoproj.io/sync-wave: "100" spec: goTemplate: true generators: @@ -28,117 +27,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -146,7 +40,6 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -154,7 +47,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" + argocd.argoproj.io/sync-wave: "100" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} @@ -164,7 +57,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-mas-instance-root + path: root-applications/ibm-aibroker-instance-root helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" @@ -183,8 +76,20 @@ spec: - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" {{- end }} - - name: "mas_catalog_version" - value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + - name: "minio_namespace" + value: "{{ .Values.ibm_minio.minio_namespace }}" + - name: "minio_instance_name" + value: "{{ .Values.ibm_minio.minio_instance_name }}" + - name: "minio_root_user" + value: "{{ .Values.ibm_minio.minio_root_user }}" + - name: "minio_root_password" + value: "{{ .Values.ibm_minio.minio_root_password }}" + - name: "minio_storage_class" + value: "{{ .Values.ibm_minio.minio_storage_class }}" + - name: "minio_storage_size" + value: "{{ .Values.ibm_minio.minio_storage_size }}" + - name: "minio_image" + value: "{{ .Values.ibm_minio.minio_image }}" - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml deleted file mode 100644 index 893d0a080..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ /dev/null @@ -1,133 +0,0 @@ - ---- -# IBM Maximo Application Suite Instance Application Set -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: aibroker-instance-appset.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "100" -spec: - goTemplate: true - generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" - template: - metadata: - name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - annotations: - healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "100" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - spec: - project: "{{ .Values.argo.projects.rootapps }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "minio_namespace" - value: "{{ .Values.ibm_minio.minio_namespace }}" - - name: "minio_instance_name" - value: "{{ .Values.ibm_minio.minio_instance_name }}" - - name: "minio_root_user" - value: "{{ .Values.ibm_minio.minio_root_user }}" - - name: "minio_root_password" - value: "{{ .Values.ibm_minio.minio_root_password }}" - - name: "minio_storage_class" - value: "{{ .Values.ibm_minio.minio_storage_class }}" - - name: "minio_storage_size" - value: "{{ .Values.ibm_minio.minio_storage_size }}" - - name: "minio_image" - value: "{{ .Values.ibm_minio.minio_image }}" - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file From 59d3ef1261b1bc5696e165b069221ac1c12f2acb Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 21:33:10 +0530 Subject: [PATCH 043/491] rename file name and sync --- .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 893d0a080..4b2e305c8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -27,7 +27,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From b8e275d43accd8603f27758210725b47313f017b Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 26 Mar 2025 23:25:56 +0530 Subject: [PATCH 044/491] fixed on instance-appset for aibroker --- .../templates/099-instance-appset.yaml | 133 ++++++++++++++--- .../100-aibroker-instance-appset.yaml | 135 ++++++++++++++++++ 2 files changed, 249 insertions(+), 19 deletions(-) create mode 100644 root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 4b2e305c8..99efe4fdc 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -4,13 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: aibroker-instance-appset.{{ .Values.cluster.id }} + name: instance-appset.{{ .Values.cluster.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "099" spec: goTemplate: true generators: @@ -32,7 +33,112 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -40,6 +146,7 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -47,7 +154,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "099" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} @@ -57,7 +164,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root + path: root-applications/ibm-mas-instance-root helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" @@ -76,20 +183,8 @@ spec: - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" {{- end }} - - name: "minio_namespace" - value: "{{ .Values.ibm_minio.minio_namespace }}" - - name: "minio_instance_name" - value: "{{ .Values.ibm_minio.minio_instance_name }}" - - name: "minio_root_user" - value: "{{ .Values.ibm_minio.minio_root_user }}" - - name: "minio_root_password" - value: "{{ .Values.ibm_minio.minio_root_password }}" - - name: "minio_storage_class" - value: "{{ .Values.ibm_minio.minio_storage_class }}" - - name: "minio_storage_size" - value: "{{ .Values.ibm_minio.minio_storage_size }}" - - name: "minio_image" - value: "{{ .Values.ibm_minio.minio_image }}" + - name: "mas_catalog_version" + value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml new file mode 100644 index 000000000..2665d644f --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml @@ -0,0 +1,135 @@ + +--- +# IBM Maximo Application Suite Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: aibroker-instance-appset.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' +# region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "100" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + # region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "100" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-instance-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: "minio_namespace" + value: "{{ .Values.ibm_minio.minio_namespace }}" + - name: "minio_instance_name" + value: "{{ .Values.ibm_minio.minio_instance_name }}" + - name: "minio_root_user" + value: "{{ .Values.ibm_minio.minio_root_user }}" + - name: "minio_root_password" + value: "{{ .Values.ibm_minio.minio_root_password }}" + - name: "minio_storage_class" + value: "{{ .Values.ibm_minio.minio_storage_class }}" + - name: "minio_storage_size" + value: "{{ .Values.ibm_minio.minio_storage_size }}" + - name: "minio_image" + value: "{{ .Values.ibm_minio.minio_image }}" + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file From 45689a4614a5745d01a7ab5f3ffd6f5fcf909e7d Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 27 Mar 2025 10:04:36 +0530 Subject: [PATCH 045/491] removed instance appset --- .../templates/099-instance-appset.yaml | 228 ------------------ 1 file changed, 228 deletions(-) delete mode 100644 root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml deleted file mode 100644 index 99efe4fdc..000000000 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ /dev/null @@ -1,228 +0,0 @@ - ---- -# IBM Maximo Application Suite Instance Application Set -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: instance-appset.{{ .Values.cluster.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - annotations: - argocd.argoproj.io/sync-wave: "099" -spec: - goTemplate: true - generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" - template: - metadata: - name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - annotations: - healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - spec: - project: "{{ .Values.argo.projects.rootapps }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-mas-instance-root - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "mas_catalog_version" - value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file From 107a089689815f8a1162b52d0f3f19d4fb8051e7 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 27 Mar 2025 11:53:10 +0530 Subject: [PATCH 046/491] main.py update with 100-aibroker-instance-appset.yaml --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 24f63c52c..851561f50 100644 --- a/main.py +++ b/main.py @@ -76,6 +76,6 @@ def cluster_root_app_set(): env.macro(cluster_root_app_set) def instance_root_app_set(): - return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml", "Instance Root Application Set") + return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml", "Instance Root Application Set") env.macro(instance_root_app_set) From 65b9f40d0dce3f2bbd7d55e9a959bb7366d819fc Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 27 Mar 2025 12:02:01 +0530 Subject: [PATCH 047/491] main.py update with 100-aibroker-instance-appset.yaml --- main.py | 2 +- ...broker-instance-appset.yaml => 099-instance-appset.yaml} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename root-applications/ibm-mas-cluster-root/templates/{100-aibroker-instance-appset.yaml => 099-instance-appset.yaml} (97%) diff --git a/main.py b/main.py index 851561f50..24f63c52c 100644 --- a/main.py +++ b/main.py @@ -76,6 +76,6 @@ def cluster_root_app_set(): env.macro(cluster_root_app_set) def instance_root_app_set(): - return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml", "Instance Root Application Set") + return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml", "Instance Root Application Set") env.macro(instance_root_app_set) diff --git a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml similarity index 97% rename from root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml rename to root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 2665d644f..076fcd75e 100644 --- a/root-applications/ibm-mas-cluster-root/templates/100-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -4,14 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: aibroker-instance-appset.{{ .Values.cluster.id }} + name: instance-appset.{{ .Values.cluster.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "099" spec: goTemplate: true generators: @@ -49,7 +49,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "100" + argocd.argoproj.io/sync-wave: "099" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} From 52309b16a32982ebabd6751503be6b097fc8d968 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 27 Mar 2025 16:23:51 +0530 Subject: [PATCH 048/491] comment junit dependencies --- .../000-ibm-operator-catalog/Chart.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster-applications/000-ibm-operator-catalog/Chart.yaml b/cluster-applications/000-ibm-operator-catalog/Chart.yaml index 4676983f7..345a3ef1b 100644 --- a/cluster-applications/000-ibm-operator-catalog/Chart.yaml +++ b/cluster-applications/000-ibm-operator-catalog/Chart.yaml @@ -4,8 +4,8 @@ description: IBM Maximo Operator Catalog type: application version: 1.0.0 -dependencies: -- name: junitreporter - version: 1.0.0 - repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file +# dependencies: +# - name: junitreporter +# version: 1.0.0 +# repository: "file://../../sub-charts/junitreporter/" +# condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file From a47191e72c754d33a5cf07ee421b3a07fb990b30 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 28 Mar 2025 14:09:32 +0530 Subject: [PATCH 049/491] argocd sync-wave update with job --- .../01-odh-pipeline-operator-subcription.yaml | 2 +- .../02-odh-serverless-subscription.yaml | 4 +- .../03-odh-servicemesh-operator-sa.yaml | 4 +- .../templates/04-odh-authorino-operator.yaml | 2 +- .../templates/05-odh-operator-job.yaml | 48 +++++++++---------- .../05-odh-operator-subcription.yaml | 2 +- .../templates/06-odh-namespace.yaml | 2 +- .../templates/07-odh-external-secret-db.yaml | 2 +- .../templates/08-odh-dsc-init.yaml | 2 +- .../09-odh-data-science-cluster.yaml | 2 +- .../templates/10-odh-dspa-aws.yaml | 4 +- .../templates/10-odh-dspa-local.yaml | 2 +- .../templates/10-odh-dspa-minio.yaml | 4 +- 13 files changed, 38 insertions(+), 42 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index f918f05bd..9c2d736b7 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -4,7 +4,7 @@ kind: Subscription metadata: namespace: "{{ .Values.openshift_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "113" + argocd.argoproj.io/sync-wave: "116" spec: package_name: "openshift-pipelines-operator-rh" package_channel: "{{ .Values.pipeline_channel }}" diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index 823957204..a60fc6ebf 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -4,7 +4,7 @@ metadata: name: operatorgroup namespace: openshift-serverless annotations: - argocd.argoproj.io/sync-wave: "114" + argocd.argoproj.io/sync-wave: "117" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription @@ -12,7 +12,7 @@ metadata: name: serverless-operator namespace: openshift-serverless annotations: - argocd.argoproj.io/sync-wave: "115" + argocd.argoproj.io/sync-wave: "118" spec: channel: stable installPlanApproval: Automatic diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index efc4f90b2..cd18a95f7 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -7,7 +7,7 @@ metadata: package_channel: "{{ .Values.service_mesh_channel }}" catalog_source: "{{ .Values.service_mesh_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "116" + argocd.argoproj.io/sync-wave: "119" --- apiVersion: v1 kind: ServiceAccount @@ -15,4 +15,4 @@ metadata: name: istio-operator namespace: "{{ .Values.service_mesh_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "117" \ No newline at end of file + argocd.argoproj.io/sync-wave: "120" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index 4a75cb79c..f7c3af60a 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -7,4 +7,4 @@ metadata: package_channel: "{{ .Values.serverless_channel }}" # This looks wrong, but that's what was in the original template catalog_source: "{{ .Values.authorino_catalog_source }}" annotations: - argocd.argoproj.io/sync-wave: "118" \ No newline at end of file + argocd.argoproj.io/sync-wave: "121" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 9545f8017..b56567c08 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -11,58 +11,54 @@ metadata: name: {{ $sa_name }} namespace: {{ $ns }} annotations: - argocd.argoproj.io/sync-wave: "013" + argocd.argoproj.io/sync-wave: "122" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} --- -kind: ClusterRole +kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ $role_name }} annotations: - argocd.argoproj.io/sync-wave: "013" + argocd.argoproj.io/sync-wave: "123" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} rules: - verbs: - - get - apiGroups: - - packages.operators.coreos.com + - patch resources: - - packagemanifests - - verbs: - - get - apiGroups: - - config.openshift.io - resources: - - ingresses - + - installplan --- -kind: ClusterRoleBinding + apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding metadata: - name: {{ $rb_name }} annotations: - argocd.argoproj.io/sync-wave: "014" -{{- if .Values.custom_labels }} + argocd.argoproj.io/sync-wave: "124" + namespace: "{{ $ns }}" + name: "odh-installplan" labels: + app: "odh-installplan" +{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} -subjects: - - kind: ServiceAccount - name: {{ $sa_name }} - namespace: {{ $ns }} roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ $role_name }} + kind: Role + name: "odh-installplan" +subjects: + - apiGroup: "" + kind: ServiceAccount + name: "odh-installplan" + namespace: {{ $ns }} + --- apiVersion: batch/v1 @@ -70,13 +66,13 @@ kind: Job metadata: namespace: {{ .Values.namespace }} annotations: - argocd.argoproj.io/sync-wave: "016" + argocd.argoproj.io/sync-wave: "125" spec: template: spec: serviceAccountName: {{ .Values.serviceAccountName }} containers: - - name: run + - name: Installplan-job image: quay.io/ibmmas/cli:latest imagePullPolicy: IfNotPresent resources: diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 5383242f2..ac2cb84a9 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "119" + argocd.argoproj.io/sync-wave: "126" spec: channel: "{{ .Values.odh_channel }}" installPlanApproval: Manual diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index a6cc6b154..50801bf35 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -4,4 +4,4 @@ apiVersion: v1 kind: Namespace metadata: name: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "120" + argocd.argoproj.io/sync-wave: "127" diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml index fb4925035..a748c64c6 100644 --- a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -4,7 +4,7 @@ kind: Secret metadata: name: "{{ .Values.mas_aibroker_db_secret_name }}" namespace: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "121" + argocd.argoproj.io/sync-wave: "128" type: Opaque # stringData: # password: "{{ .Values.mas_aibroker_db_secret_value }}" # need to verify is it b64enc diff --git a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml index 1d5e9b875..c2ece7b65 100644 --- a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml +++ b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml @@ -4,7 +4,7 @@ apiVersion: dscinitialization.opendatahub.io/v1 kind: DSCInitialization metadata: annotations: - argocd.argoproj.io/sync-wave: "122" + argocd.argoproj.io/sync-wave: "129" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true finalizers: - dscinitialization.opendatahub.io/finalizer diff --git a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml index 849f9cd41..ba9315cb5 100644 --- a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml +++ b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml @@ -3,7 +3,7 @@ kind: DataScienceCluster apiVersion: datasciencecluster.opendatahub.io/v1 metadata: annotations: - argocd.argoproj.io/sync-wave: "123" + argocd.argoproj.io/sync-wave: "130" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true labels: app.kubernetes.io/created-by: opendatahub-operator diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml index 5c539c126..6c11e9a10 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml @@ -11,7 +11,7 @@ metadata: annotations: opendatahub.io/connection-type: s3 openshift.io/display-name: AWS S3 Connection - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "131" stringData: accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" secretkey: "{{ .Values.mas_aibroker_storage_secretkey}}" @@ -25,7 +25,7 @@ metadata: name: instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "132" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: dspVersion: v1 diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml index 7b7241790..003a84a92 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml @@ -6,7 +6,7 @@ metadata: name: instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "133" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: database: diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index a3847bc38..70209fcff 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -8,7 +8,7 @@ metadata: opendatahub.io/dashboard: "false" opendatahub.io/managed: "true" annotations: - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "134" opendatahub.io/connection-type: s3 openshift.io/display-name: Minio Data Connection stringData: @@ -24,7 +24,7 @@ metadata: name: instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "135" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: dspVersion: v1 From 435018578b835ffb9d861128843f075d6d396b86 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Wed, 2 Apr 2025 13:00:08 +0530 Subject: [PATCH 050/491] update for odh --- .../ibm-mas-cluster-root/templates/099-instance-appset.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 076fcd75e..3eafb0bc4 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -34,6 +34,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 67a88261e63277d0d01cd2032dc0c32c15b369b1 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Wed, 2 Apr 2025 13:19:30 +0530 Subject: [PATCH 051/491] Update 030-ibm-odh-app.yaml --- .../ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index c125d3dad..1e71ca0fe 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -80,7 +80,7 @@ spec: devops_build_number: "{{ .Values.devops.build_number }}" gitops_version: "{{ .Values.source.revision }}" - name: ARGOCD_APP_NAME - value: Odhapp + value: odh {{- if not (empty .Values.avp.secret) }} - name: AVP_SECRET value: {{ .Values.avp.secret }} @@ -100,4 +100,4 @@ spec: {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 4cae44cfd3a1c262228996610618e59ce69cc107 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 15:42:13 +0530 Subject: [PATCH 052/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index b56567c08..137de2033 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -86,6 +86,12 @@ spec: - /bin/sh - -c - | - oc patch installplan {{ | first }} -n openshift-operators --type merge --patch '{"spec":{"approved":true}}' - echo "Approve install plan for Opendatahub operator" - restartPolicy: OnFailure \ No newline at end of file + clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("{{ .Values.odhOperatorVersion }}")) | .metadata.name') + if [ -n "$clusterServiceVersionNames" ]; then + oc patch installplan $clusterServiceVersionNames -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' + echo "InstallPlan $clusterServiceVersionNames approved successfully." + else + echo "No InstallPlan found for {{ .Values.odhOperatorVersion }}." + exit 1 + fi + restartPolicy: OnFailure From a49e4bba88a65eedb8f54009e5c2dc9ab7c2e4c2 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 15:47:25 +0530 Subject: [PATCH 053/491] Update values.yaml --- instance-applications/112-ibm-odh/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 4e6e6c339..bcde8a991 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -11,7 +11,7 @@ odh_channel: "fast" odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.11.1" -aibroker_namespace: "mas-{{ mas_instance_id }}-aibroker" +aibroker_namespace: "mas-sremat-aibroker" pull_secret_name: "ibm-entitlement" # Storage vars mas_aibroker_storage_provider: "aws" @@ -33,4 +33,4 @@ mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" -primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" \ No newline at end of file +primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" From 0195470fad894cd6d1b6a75f3d5999318c1aac32 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 15:56:09 +0530 Subject: [PATCH 054/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index c43ebf873..4e9e8c1af 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -71,7 +71,7 @@ ibm_odh: odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.11.1" - aibroker_namespace: "mas-{{ mas_instance_id }}-aibroker" + aibroker_namespace: "mas-sremat-aibroker" pull_secret_name: "ibm-entitlement" # Storage vars mas_aibroker_storage_provider: "aws" From b19a5b116003a7d86c6c41ae8e138f766687cabb Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 2 Apr 2025 16:25:10 +0530 Subject: [PATCH 055/491] subscription name updates --- .../templates/01-odh-pipeline-operator-subcription.yaml | 1 + .../112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml | 1 + .../112-ibm-odh/templates/04-odh-authorino-operator.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 9c2d736b7..10fe0e395 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -2,6 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: + name: openshift-pipelines-operator-rh namespace: "{{ .Values.openshift_namespace }}" annotations: argocd.argoproj.io/sync-wave: "116" diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index cd18a95f7..6ea35bdd2 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -2,6 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: + name: servicemeshoperator namespace: "{{ .Values.service_mesh_namespace }}" package_name: "servicemeshoperator" package_channel: "{{ .Values.service_mesh_channel }}" diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index f7c3af60a..5c1405ee1 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -2,6 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: + name: authorino-operator nnamespace: "{{ .Values.openshift_namespace }}" package_name: "authorino-operator" package_channel: "{{ .Values.serverless_channel }}" # This looks wrong, but that's what was in the original template From e7ee8f0005ca53cc9ecdbc54f5e59fbbe15f9b43 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 16:37:31 +0530 Subject: [PATCH 056/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 137de2033..020d15635 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -64,6 +64,7 @@ subjects: apiVersion: batch/v1 kind: Job metadata: + name: installplan-patch namespace: {{ .Values.namespace }} annotations: argocd.argoproj.io/sync-wave: "125" From 546536fcd1c3204ed08ccd667743cbc444c1301a Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Wed, 2 Apr 2025 16:38:24 +0530 Subject: [PATCH 057/491] update all changes of kmodel --- .../113-ibm-kmodels/Chart.yaml | 11 ++ .../113-ibm-kmodels/README.md | 3 + .../templates/01-kmodel-namespace.yaml | 7 + .../templates/02-kmodel-secret.yaml | 31 ++++ .../templates/04-aibroker-istio.yaml | 43 +++++ .../05-aibroker-networkpolicies.yaml | 43 +++++ .../templates/06-aibroker-store.yaml | 125 +++++++++++++ .../templates/07-aibroker-watcher.yaml | 142 +++++++++++++++ .../templates/08-aibroker-controller.yaml | 169 ++++++++++++++++++ .../113-ibm-kmodels/values.yaml | 41 +++++ .../templates/040-ibm-kmodels-app.yaml | 89 +++++++++ .../templates/099-instance-appset.yaml | 23 +-- 12 files changed, 711 insertions(+), 16 deletions(-) create mode 100644 instance-applications/113-ibm-kmodels/Chart.yaml create mode 100644 instance-applications/113-ibm-kmodels/README.md create mode 100644 instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml create mode 100644 instance-applications/113-ibm-kmodels/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml diff --git a/instance-applications/113-ibm-kmodels/Chart.yaml b/instance-applications/113-ibm-kmodels/Chart.yaml new file mode 100644 index 000000000..21648d971 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-kmodels +description: IBM KMODELS +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/README.md b/instance-applications/113-ibm-kmodels/README.md new file mode 100644 index 000000000..cd4553e8f --- /dev/null +++ b/instance-applications/113-ibm-kmodels/README.md @@ -0,0 +1,3 @@ +IBM Kmodels +=============================================================================== +Deploy and configure kmodels storage with configurable version \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml new file mode 100644 index 000000000..66c0e384e --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "126" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml new file mode 100644 index 000000000..e94d18074 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -0,0 +1,31 @@ +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "127" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml b/instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml new file mode 100644 index 000000000..b89b5c664 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: security.istio.io/v1beta1 +kind: PeerAuthentication +metadata: + name: default + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "128" +spec: + mtls: + mode: PERMISSIVE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: ds-pipeline-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "129" +spec: + host: ds-pipeline-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 8888 + tls: + mode: DISABLE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: minio-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "130" +spec: + host: minio-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 9000 + tls: + mode: DISABLE diff --git a/instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml new file mode 100644 index 000000000..d840f83ad --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "131" +spec: + podSelector: + matchLabels: + kmodels: instance + part-of: kmodels + policyTypes: + - Ingress + ingress: + - ports: + - port: 3000 + - port: 8443 + +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: ds-pipelines-km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" +spec: + podSelector: + matchLabels: + app: ds-pipeline-instance + component: data-science-pipelines + ingress: + - ports: + - protocol: TCP + port: 8888 + from: + - podSelector: + matchLabels: + app: km-controller + policyTypes: + - Ingress diff --git a/instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml b/instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml new file mode 100644 index 000000000..3bffdafbe --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml @@ -0,0 +1,125 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "133" + labels: + app: km-store +data: + STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + # Certificate files folder (default: /etc/ssl/certs) + CERTS_PATH: "/etc/ssl/certs" + # Private key (default: tls.key) + CERT_PRIVATE_KEY: "tls.key" + # Public certificate (default: tls.crt) + CERT_PUBLIC_CERTIFICATE: "tls.crt" + # Set to true to enable https server (default: true) + SUPPORT_HTTPS: "true" + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "134" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-store + type: ClusterIP + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "135" + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels +spec: + replicas: 1 + selector: + matchLabels: + app: km-store + kmodels: instance + part-of: kmodels + template: + metadata: + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels + spec: + restartPolicy: Always + volumes: + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: store + image: "{{ .Values.image_store }}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + envFrom: + - configMapRef: + name: km-store + - secretRef: + name: km-s3-secret + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + volumeMounts: + - mountPath: "/etc/ssl/certs" + name: ssh-key + readOnly: true diff --git a/instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml new file mode 100644 index 000000000..01de21a4a --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml @@ -0,0 +1,142 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "136" +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-role + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "137" +rules: + - verbs: + - list + - watch + apiGroups: + - '' + resources: + - events + - pods +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-binding + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "138" +subjects: + - kind: ServiceAccount + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: km-watcher-role + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "139" + labels: + app: km-watcher +data: + PIPELINES: "{{ .Values.aibroker_namespace }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "140" +spec: + ports: + - name: http + port: 3000 + targetPort: http + selector: + app: km-watcher + type: ClusterIP + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "141" + labels: + app: km-watcher + component: watcher +spec: + replicas: 1 + selector: + matchLabels: + app: km-watcher + template: + metadata: + labels: + app: km-watcher + component: watcher + spec: + serviceAccountName: km-watcher + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: watcher + image: "{{ .Values.image_watcher}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 5 + periodSeconds: 500 + envFrom: + - configMapRef: + name: km-watcher + - secretRef: + name: km-s3-secret diff --git a/instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml b/instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml new file mode 100644 index 000000000..40d8b6127 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml @@ -0,0 +1,169 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "142" + labels: + app: km-controller +data: + DOCKER_SERVER: "{{ .Values.docker_server }}" + PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + DOCKER_SECRETS_NAME: "ibm-entitlement" + CONNECTOR_IMAGE_PREFIX: '' + PIPELINE_STEP_IMAGE_PREFIX: '' + PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" + CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" + {{- if .Values.mas_aibroker_saas }} + DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" + {{- else }} + DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" + {{- end }} + PLATFORM: openshift + + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "143" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-controller + type: ClusterIP + + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: km-controller-pvc + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "144" +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + resources: + requests: + storage: 1Gi + storageClassName: "{{ .Values.primary_storage_class }}" + + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "145" + + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "146" + labels: + app: km-controller + component: controller +spec: + replicas: 1 + revisionHistoryLimit: 1 + selector: + matchLabels: + app: km-controller + template: + metadata: + labels: + app: km-controller + component: controller + spec: + serviceAccountName: km-controller + volumes: + - name: storage + persistentVolumeClaim: + claimName: km-controller-pvc + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: controller + image: "{{ .Values.image_controller}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + resources: + requests: + memory: "128Mi" + cpu: "100m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "200m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + env: + - name: KMODELS_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: KMODELS_ID + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: km-controller + - secretRef: + name: km-s3-secret + volumeMounts: + - name: storage + mountPath: "/storage" + - name: ssh-key + mountPath: "/etc/ssl/certs" + readOnly: true diff --git a/instance-applications/113-ibm-kmodels/values.yaml b/instance-applications/113-ibm-kmodels/values.yaml new file mode 100644 index 000000000..3d5c279ce --- /dev/null +++ b/instance-applications/113-ibm-kmodels/values.yaml @@ -0,0 +1,41 @@ +--- +run_sync_hooks: true + +aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" + +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_ssl: "true" + +# following are the variable need to injected via environment variable +mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" +mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" +mas_aibroker_storage_host: "mas_aibroker_storage_host" +mas_aibroker_storage_port: "mas_aibroker_storage_port" +mas_aibroker_storage_region: "mas_aibroker_storage_region" + +ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" + +# vars file for kmodels +pullSecretName: "ibm-entitlement" + +docker_server: "MAS_ICR_CP/aibroker" + +tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" +mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" +primary_storage_class: "PRIMARY_STORAGE_CLASS" + +# Bucket names +mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" +mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" +mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + +#container images +image_store: "MAS_ICR_CP/aibroker/store:1.0.2" +image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" +image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + +mas_aibroker_pipeline_steps_tag: 1.0.0 +mas_aibroker_connector_tag: 1.0.0 + +#saas +mas_aibroker_saas: "MAS_AIBROKER_SAAS" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml new file mode 100644 index 000000000..a7e7c2fc8 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml @@ -0,0 +1,89 @@ +{{- if not (empty .Values.ibm_kmodel) }} +--- +# IBM Maximo Kmodels +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "040" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/113-ibm-kmodel + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" + aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" + mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" + ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" + pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" + docker_server: "{{ .Values.ibm_kmodel.docker_server }}" + tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" + primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" + mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" + mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" + image_store: "{{ .Values.ibm_kmodel.image_store }}" + image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" + image_controller: "{{ .Values.ibm_kmodel.image_controller }}" + mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" + mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" + + junitreporter: + reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: kmodelapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 3eafb0bc4..58c3edcc8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -38,7 +38,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -82,21 +87,7 @@ spec: {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "minio_namespace" - value: "{{ .Values.ibm_minio.minio_namespace }}" - - name: "minio_instance_name" - value: "{{ .Values.ibm_minio.minio_instance_name }}" - - name: "minio_root_user" - value: "{{ .Values.ibm_minio.minio_root_user }}" - - name: "minio_root_password" - value: "{{ .Values.ibm_minio.minio_root_password }}" - - name: "minio_storage_class" - value: "{{ .Values.ibm_minio.minio_storage_class }}" - - name: "minio_storage_size" - value: "{{ .Values.ibm_minio.minio_storage_size }}" - - name: "minio_image" - value: "{{ .Values.ibm_minio.minio_image }}" + {{- end }} - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps From c582839114c43d6fe7949a2a771a2181130c01a0 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 2 Apr 2025 17:07:14 +0530 Subject: [PATCH 058/491] remove _ with - --- instance-applications/112-ibm-odh/values.yaml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index bcde8a991..c9f262d87 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -1,36 +1,36 @@ --- -openshift_namespace: "openshift-operators" -pipeline_channel: "latest" -pipeline_catalog_source: "redhat-operators" -service_mesh_namespace: "openshift-operators" -service_mesh_channel: "stable" -service_mesh_catalog_source: "redhat-operators" -serverless_channel: "stable" -authorino_catalog_source: "community-operators" -odh_channel: "fast" -odh_catalog_source: "community-operators" -odh_operator_version: "opendatahub-operator.v2.11.1" +openshift-namespace: "openshift-operators" +pipeline-channel: "latest" +pipeline-catalog-source: "redhat-operators" +service-mesh-namespace: "openshift-operators" +service-mesh-channel: "stable" +service-mesh-catalog-source: "redhat-operators" +serverless-channel: "stable" +authorino-catalog-source: "community-operators" +odh-channel: "fast" +odh-catalog-source: "community-operators" +odh-operator-version: "opendatahub-operator.v2.11.1" -aibroker_namespace: "mas-sremat-aibroker" -pull_secret_name: "ibm-entitlement" +aibroker-namespace: "mas-sremat-aibroker" +pull-secret-name: "ibm-entitlement" # Storage vars -mas_aibroker_storage_provider: "aws" -mas_aibroker_storage_accesskey: "MAS_AIBROKER_STORAGE_ACCESSKEY" -mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" -mas_aibroker_storage_host: "MAS_AIBROKER_STORAGE_HOST" -mas_aibroker_storage_port: "MAS_AIBROKER_STORAGE_PORT" -mas_aibroker_storage_ssl: "MAS_AIBROKER_STORAGE_SSL" -mas_aibroker_storage_region: "MAS_AIBROKER_STORAGE_REGION" +mas-aibroker-storage-provider: "aws" +mas-aibroker-storage-accesskey: "aibroker-storage-accesskey" +mas-aibroker-storage-secretkey: "aibroker-storage-secretkey" +mas-aibroker-storage-host: "mas-aibroker-storage-host" +mas-aibroker-storage-port: "mas-aibroker-storage-port" +mas-aibroker-storage-ssl: "mas-aibroker-storage-ssl" +mas-aibroker-storage-region: "mas-aibroker-storage-region" # MariaDB -mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" -mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" -mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" -mas_aibroker_db_database: "MAS_AIBROKER_DB_DATABASE" +mas-aibroker-db-host: "mas-aibroker-db-host" +mas-aibroker-db-port: "mas-aibroker-db-port" +mas-aibroker-db-user: "mas-aibroker-db-user" +mas-aibroker-db-database: "mas-aibroker-db-database" -mas_aibroker_db_secret_key: "MAS_AIBROKER_DB_SECRET_KEY" -mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" -mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" +mas-aibroker-db-secret-key: "mas-aibroker-db-secret-key" +mas-aibroker-db-secret-name: "mas-aibroker-db-secret-name" +mas-aibroker-db-secret-value: "mas-aibroker-db-secret-value" -mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" -primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" +mas-aibroker-storage-pipelines-bucket: "mas-aibroker-storage-pipelines-bucket" +primary-storage-class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" From 029f20435850635cb0c378c1f35420bda4f7cb3a Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Wed, 2 Apr 2025 17:15:05 +0530 Subject: [PATCH 059/491] fix in instance-root --- .../ibm-aibroker-instance-root/values.yaml | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4e9e8c1af..22d126183 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -73,24 +73,23 @@ ibm_odh: aibroker_namespace: "mas-sremat-aibroker" pull_secret_name: "ibm-entitlement" - # Storage vars - mas_aibroker_storage_provider: "aws" - mas_aibroker_storage_accesskey: "MAS_AIBROKER_STORAGE_ACCESSKEY" - mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" - mas_aibroker_storage_host: "MAS_AIBROKER_STORAGE_HOST" - mas_aibroker_storage_port: "MAS_AIBROKER_STORAGE_PORT" - mas_aibroker_storage_ssl: "MAS_AIBROKER_STORAGE_SSL" - mas_aibroker_storage_region: "MAS_AIBROKER_STORAGE_REGION" + mas-aibroker-storage-provider: "minio" + mas-aibroker-storage-accesskey: "aibroker-storage-accesskey" + mas-aibroker-storage-secretkey: "aibroker-storage-secretkey" + mas-aibroker-storage-host: "mas-aibroker-storage-host" + mas-aibroker-storage-port: "mas-aibroker-storage-port" + mas-aibroker-storage-ssl: "mas-aibroker-storage-ssl" + mas-aibroker-storage-region: "mas-aibroker-storage-region" # MariaDB - mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" - mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" - mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" - mas_aibroker_db_database: "MAS_AIBROKER_DB_DATABASE" + mas-aibroker-db-host: "mas-aibroker-db-host" + mas-aibroker-db-port: "mas-aibroker-db-port" + mas-aibroker-db-user: "mas-aibroker-db-user" + mas-aibroker-db-database: "mas-aibroker-db-database" - mas_aibroker_db_secret_key: "MAS_AIBROKER_DB_SECRET_KEY" - mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" - mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" + mas-aibroker-db-secret-key: "mas-aibroker-db-secret-key" + mas-aibroker-db-secret-name: "mas-aibroker-db-secret-name" + mas-aibroker-db-secret-value: "mas-aibroker-db-secret-value" - mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" + mas-aibroker-storage-pipelines-bucket: "mas-aibroker-storage-pipelines-bucket" + primary-storage-class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" From 516099b5ef416abd6eb57e849026788f2b1ece61 Mon Sep 17 00:00:00 2001 From: Nikita Kumble Date: Wed, 2 Apr 2025 17:29:48 +0530 Subject: [PATCH 060/491] changes in kmodel --- .../templates/{04-aibroker-istio.yaml => 03-kmodel-istio.yaml} | 0 ...broker-networkpolicies.yaml => 04-kmodel-networkpolicies.yaml} | 0 .../templates/{06-aibroker-store.yaml => 05-kmodel-store.yaml} | 0 .../{07-aibroker-watcher.yaml => 06-kmodel-watcher.yaml} | 0 .../{08-aibroker-controller.yaml => 07-kmodel-controller.yaml} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename instance-applications/113-ibm-kmodels/templates/{04-aibroker-istio.yaml => 03-kmodel-istio.yaml} (100%) rename instance-applications/113-ibm-kmodels/templates/{05-aibroker-networkpolicies.yaml => 04-kmodel-networkpolicies.yaml} (100%) rename instance-applications/113-ibm-kmodels/templates/{06-aibroker-store.yaml => 05-kmodel-store.yaml} (100%) rename instance-applications/113-ibm-kmodels/templates/{07-aibroker-watcher.yaml => 06-kmodel-watcher.yaml} (100%) rename instance-applications/113-ibm-kmodels/templates/{08-aibroker-controller.yaml => 07-kmodel-controller.yaml} (100%) diff --git a/instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/04-aibroker-istio.yaml rename to instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/05-aibroker-networkpolicies.yaml rename to instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/06-aibroker-store.yaml rename to instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/07-aibroker-watcher.yaml rename to instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/08-aibroker-controller.yaml rename to instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml From 9a29e6bac8f4a3c5180158e3879fd6e999f11a12 Mon Sep 17 00:00:00 2001 From: Nikita Kumble Date: Wed, 2 Apr 2025 17:39:27 +0530 Subject: [PATCH 061/491] aibroker_kmodel sync waves changed --- .../112-ibm-odh/templates/11-odh.yaml | 2 ++ .../templates/01-kmodel-namespace.yaml | 2 +- .../113-ibm-kmodels/templates/02-kmodel-secret.yaml | 2 +- .../113-ibm-kmodels/templates/03-kmodel-istio.yaml | 6 +++--- .../templates/04-kmodel-networkpolicies.yaml | 4 ++-- .../113-ibm-kmodels/templates/05-kmodel-store.yaml | 6 +++--- .../113-ibm-kmodels/templates/06-kmodel-watcher.yaml | 12 ++++++------ .../templates/07-kmodel-controller.yaml | 10 +++++----- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 4a44619bf..936cfd5cf 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -4,5 +4,7 @@ kind: ServiceAccount metadata: name: pipeline-runner-instance namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "136" imagePullSecrets: - name: "{{ .Values.pull_secret_name }}" diff --git a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml index 66c0e384e..1d9553fbc 100644 --- a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -4,4 +4,4 @@ kind: Namespace metadata: name: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "126" \ No newline at end of file + argocd.argoproj.io/sync-wave: "137" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml index e94d18074..c549d4ffb 100644 --- a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -6,7 +6,7 @@ metadata: name: km-s3-secret namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "127" + argocd.argoproj.io/sync-wave: "138" {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} diff --git a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml index b89b5c664..7f1eb294d 100644 --- a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -5,7 +5,7 @@ metadata: name: default namespace: opendatahub annotations: - argocd.argoproj.io/sync-wave: "128" + argocd.argoproj.io/sync-wave: "139" spec: mtls: mode: PERMISSIVE @@ -16,7 +16,7 @@ metadata: name: ds-pipeline-instance namespace: opendatahub annotations: - argocd.argoproj.io/sync-wave: "129" + argocd.argoproj.io/sync-wave: "140" spec: host: ds-pipeline-instance.opendatahub.svc.cluster.local trafficPolicy: @@ -32,7 +32,7 @@ metadata: name: minio-instance namespace: opendatahub annotations: - argocd.argoproj.io/sync-wave: "130" + argocd.argoproj.io/sync-wave: "141" spec: host: minio-instance.opendatahub.svc.cluster.local trafficPolicy: diff --git a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml index d840f83ad..d18856881 100644 --- a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -5,7 +5,7 @@ metadata: name: km-instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "131" + argocd.argoproj.io/sync-wave: "142" spec: podSelector: matchLabels: @@ -25,7 +25,7 @@ metadata: name: ds-pipelines-km-instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-wave: "143" spec: podSelector: matchLabels: diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml index 3bffdafbe..0df630860 100644 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml @@ -5,7 +5,7 @@ metadata: name: km-store namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "133" + argocd.argoproj.io/sync-wave: "144" labels: app: km-store data: @@ -26,7 +26,7 @@ metadata: name: km-store namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "134" + argocd.argoproj.io/sync-wave: "145" spec: ports: - name: http @@ -46,7 +46,7 @@ metadata: name: km-store namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "135" + argocd.argoproj.io/sync-wave: "146" labels: app: km-store component: store diff --git a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml index 01de21a4a..dec6716e2 100644 --- a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -5,7 +5,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "136" + argocd.argoproj.io/sync-wave: "147" --- kind: Role apiVersion: rbac.authorization.k8s.io/v1 @@ -13,7 +13,7 @@ metadata: name: km-watcher-role namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "137" + argocd.argoproj.io/sync-wave: "148" rules: - verbs: - list @@ -30,7 +30,7 @@ metadata: name: km-watcher-binding namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "138" + argocd.argoproj.io/sync-wave: "149" subjects: - kind: ServiceAccount name: km-watcher @@ -47,7 +47,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/sync-wave: "150" labels: app: km-watcher data: @@ -62,7 +62,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "140" + argocd.argoproj.io/sync-wave: "151" spec: ports: - name: http @@ -79,7 +79,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "141" + argocd.argoproj.io/sync-wave: "152" labels: app: km-watcher component: watcher diff --git a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml index 40d8b6127..7839ab53a 100644 --- a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -5,7 +5,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "142" + argocd.argoproj.io/sync-wave: "153" labels: app: km-controller data: @@ -32,7 +32,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "143" + argocd.argoproj.io/sync-wave: "154" spec: ports: - name: http @@ -53,7 +53,7 @@ metadata: name: km-controller-pvc namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "144" + argocd.argoproj.io/sync-wave: "155" spec: accessModes: - ReadWriteOnce @@ -71,7 +71,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "145" + argocd.argoproj.io/sync-wave: "156" --- @@ -81,7 +81,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "146" + argocd.argoproj.io/sync-wave: "157" labels: app: km-controller component: controller From 8db8e5fd347d248f21f36ac0e583c563e232e863 Mon Sep 17 00:00:00 2001 From: Nikita Kumble Date: Wed, 2 Apr 2025 17:47:47 +0530 Subject: [PATCH 062/491] aibroker_kmodel change in instance root file name --- .../templates/040-ibm-kmodels-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml index a7e7c2fc8..96a455712 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml @@ -27,7 +27,7 @@ spec: namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/113-ibm-kmodel + path: instance-applications/113-ibm-kmodels targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} From 6f80930df01794e3bcddaed18ee5193d3e5b0b69 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 17:58:58 +0530 Subject: [PATCH 063/491] Update values.yaml --- .../ibm-aibroker-instance-root/values.yaml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 22d126183..d73b2a4cd 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -71,25 +71,25 @@ ibm_odh: odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.11.1" - aibroker_namespace: "mas-sremat-aibroker" - pull_secret_name: "ibm-entitlement" - mas-aibroker-storage-provider: "minio" - mas-aibroker-storage-accesskey: "aibroker-storage-accesskey" - mas-aibroker-storage-secretkey: "aibroker-storage-secretkey" - mas-aibroker-storage-host: "mas-aibroker-storage-host" - mas-aibroker-storage-port: "mas-aibroker-storage-port" - mas-aibroker-storage-ssl: "mas-aibroker-storage-ssl" - mas-aibroker-storage-region: "mas-aibroker-storage-region" + aibroker_namespace: "mas_sremat_aibroker" + pull_secret_name: "ibm_entitlement" + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_accesskey: "aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" + mas_aibroker_storage_region: "mas_aibroker_storage_region" # MariaDB - mas-aibroker-db-host: "mas-aibroker-db-host" - mas-aibroker-db-port: "mas-aibroker-db-port" - mas-aibroker-db-user: "mas-aibroker-db-user" - mas-aibroker-db-database: "mas-aibroker-db-database" + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_database: "mas_aibroker_db_database" - mas-aibroker-db-secret-key: "mas-aibroker-db-secret-key" - mas-aibroker-db-secret-name: "mas-aibroker-db-secret-name" - mas-aibroker-db-secret-value: "mas-aibroker-db-secret-value" + mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" - mas-aibroker-storage-pipelines-bucket: "mas-aibroker-storage-pipelines-bucket" - primary-storage-class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + primary_storage_class: "nfs-client" From 2e71bfa6494fa8b6b9a837e1edf63f9efaec0ed6 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Wed, 2 Apr 2025 18:11:05 +0530 Subject: [PATCH 064/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d73b2a4cd..481dc8e0a 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -74,8 +74,8 @@ ibm_odh: aibroker_namespace: "mas_sremat_aibroker" pull_secret_name: "ibm_entitlement" mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_accesskey: "aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "aibroker_storage_secretkey" + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" From 370482b08ce7a3b8250b40360226032e7bd1ba3e Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 3 Apr 2025 11:14:45 +0530 Subject: [PATCH 065/491] test only odh --- .../113-ibm-kmodels/Chart.yaml | 11 -- .../113-ibm-kmodels/README.md | 3 - .../templates/01-kmodel-namespace.yaml | 7 - .../templates/02-kmodel-secret.yaml | 31 ---- .../templates/03-kmodel-istio.yaml | 43 ----- .../templates/04-kmodel-networkpolicies.yaml | 43 ----- .../templates/05-kmodel-store.yaml | 125 ------------- .../templates/06-kmodel-watcher.yaml | 142 --------------- .../templates/07-kmodel-controller.yaml | 169 ------------------ .../113-ibm-kmodels/values.yaml | 41 ----- .../templates/040-ibm-kmodels-app.yaml | 89 --------- .../templates/099-instance-appset.yaml | 7 +- .../ibm-mas-cluster-root/values.yaml | 11 +- 13 files changed, 2 insertions(+), 720 deletions(-) delete mode 100644 instance-applications/113-ibm-kmodels/Chart.yaml delete mode 100644 instance-applications/113-ibm-kmodels/README.md delete mode 100644 instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml delete mode 100644 instance-applications/113-ibm-kmodels/values.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml diff --git a/instance-applications/113-ibm-kmodels/Chart.yaml b/instance-applications/113-ibm-kmodels/Chart.yaml deleted file mode 100644 index 21648d971..000000000 --- a/instance-applications/113-ibm-kmodels/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: ibm-kmodels -description: IBM KMODELS -type: application -version: 1.0.0 - -dependencies: -- name: junitreporter - version: 1.0.0 - repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/README.md b/instance-applications/113-ibm-kmodels/README.md deleted file mode 100644 index cd4553e8f..000000000 --- a/instance-applications/113-ibm-kmodels/README.md +++ /dev/null @@ -1,3 +0,0 @@ -IBM Kmodels -=============================================================================== -Deploy and configure kmodels storage with configurable version \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml deleted file mode 100644 index 1d9553fbc..000000000 --- a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "137" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml deleted file mode 100644 index c549d4ffb..000000000 --- a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: km-s3-secret - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "138" - {{- if eq .Values.mas_aibroker_storage_provider "aws" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" - {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - {{- end }} - {{- if eq .Values.mas_aibroker_storage_ssl "false" }} - serving.kserve.io/s3-usehttps: "0" - {{- else }} - serving.kserve.io/s3-usehttps: "1" - {{- end }} - {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} - serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" - {{- end }} -stringData: - AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" - AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" - S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" - S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" - S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml deleted file mode 100644 index 7f1eb294d..000000000 --- a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -apiVersion: security.istio.io/v1beta1 -kind: PeerAuthentication -metadata: - name: default - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "139" -spec: - mtls: - mode: PERMISSIVE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: ds-pipeline-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "140" -spec: - host: ds-pipeline-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 8888 - tls: - mode: DISABLE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: minio-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "141" -spec: - host: minio-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 9000 - tls: - mode: DISABLE diff --git a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml deleted file mode 100644 index d18856881..000000000 --- a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "142" -spec: - podSelector: - matchLabels: - kmodels: instance - part-of: kmodels - policyTypes: - - Ingress - ingress: - - ports: - - port: 3000 - - port: 8443 - ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: ds-pipelines-km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "143" -spec: - podSelector: - matchLabels: - app: ds-pipeline-instance - component: data-science-pipelines - ingress: - - ports: - - protocol: TCP - port: 8888 - from: - - podSelector: - matchLabels: - app: km-controller - policyTypes: - - Ingress diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml deleted file mode 100644 index 0df630860..000000000 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml +++ /dev/null @@ -1,125 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "144" - labels: - app: km-store -data: - STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" - # Certificate files folder (default: /etc/ssl/certs) - CERTS_PATH: "/etc/ssl/certs" - # Private key (default: tls.key) - CERT_PRIVATE_KEY: "tls.key" - # Public certificate (default: tls.crt) - CERT_PUBLIC_CERTIFICATE: "tls.crt" - # Set to true to enable https server (default: true) - SUPPORT_HTTPS: "true" - ---- -apiVersion: v1 -kind: Service -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "145" -spec: - ports: - - name: http - port: 3000 - targetPort: http - - name: https - port: 8443 - targetPort: https - selector: - app: km-store - type: ClusterIP - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "146" - labels: - app: km-store - component: store - kmodels: instance - part-of: kmodels -spec: - replicas: 1 - selector: - matchLabels: - app: km-store - kmodels: instance - part-of: kmodels - template: - metadata: - labels: - app: km-store - component: store - kmodels: instance - part-of: kmodels - spec: - restartPolicy: Always - volumes: - - name: ssh-key - secret: - secretName: "{{ .Values.ssh_secret_name }}" - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: store - image: "{{ .Values.image_store }}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - - name: https - containerPort: 8443 - envFrom: - - configMapRef: - name: km-store - - secretRef: - name: km-s3-secret - resources: - requests: - memory: "64Mi" - cpu: "50m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "100m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 5 - periodSeconds: 500 - volumeMounts: - - mountPath: "/etc/ssl/certs" - name: ssh-key - readOnly: true diff --git a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml deleted file mode 100644 index dec6716e2..000000000 --- a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ /dev/null @@ -1,142 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "147" ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-role - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "148" -rules: - - verbs: - - list - - watch - apiGroups: - - '' - resources: - - events - - pods ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-binding - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "149" -subjects: - - kind: ServiceAccount - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: km-watcher-role - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "150" - labels: - app: km-watcher -data: - PIPELINES: "{{ .Values.aibroker_namespace }}" - TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" - ---- -apiVersion: v1 -kind: Service -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "151" -spec: - ports: - - name: http - port: 3000 - targetPort: http - selector: - app: km-watcher - type: ClusterIP - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "152" - labels: - app: km-watcher - component: watcher -spec: - replicas: 1 - selector: - matchLabels: - app: km-watcher - template: - metadata: - labels: - app: km-watcher - component: watcher - spec: - serviceAccountName: km-watcher - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: watcher - image: "{{ .Values.image_watcher}}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - resources: - requests: - memory: "64Mi" - cpu: "50m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "100m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /version - port: 3000 - scheme: HTTP - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /version - port: 3000 - scheme: HTTP - initialDelaySeconds: 5 - periodSeconds: 500 - envFrom: - - configMapRef: - name: km-watcher - - secretRef: - name: km-s3-secret diff --git a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml deleted file mode 100644 index 7839ab53a..000000000 --- a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml +++ /dev/null @@ -1,169 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "153" - labels: - app: km-controller -data: - DOCKER_SERVER: "{{ .Values.docker_server }}" - PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - DOCKER_SECRETS_NAME: "ibm-entitlement" - CONNECTOR_IMAGE_PREFIX: '' - PIPELINE_STEP_IMAGE_PREFIX: '' - PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" - CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" - {{- if .Values.mas_aibroker_saas }} - DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" - {{- else }} - DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" - {{- end }} - PLATFORM: openshift - - ---- -apiVersion: v1 -kind: Service -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "154" -spec: - ports: - - name: http - port: 3000 - targetPort: http - - name: https - port: 8443 - targetPort: https - selector: - app: km-controller - type: ClusterIP - - ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: km-controller-pvc - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "155" -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - resources: - requests: - storage: 1Gi - storageClassName: "{{ .Values.primary_storage_class }}" - - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "156" - - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "157" - labels: - app: km-controller - component: controller -spec: - replicas: 1 - revisionHistoryLimit: 1 - selector: - matchLabels: - app: km-controller - template: - metadata: - labels: - app: km-controller - component: controller - spec: - serviceAccountName: km-controller - volumes: - - name: storage - persistentVolumeClaim: - claimName: km-controller-pvc - - name: ssh-key - secret: - secretName: "{{ .Values.ssh_secret_name }}" - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: controller - image: "{{ .Values.image_controller}}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - - name: https - containerPort: 8443 - resources: - requests: - memory: "128Mi" - cpu: "100m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "200m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /api/v1/version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /api/v1/version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 5 - periodSeconds: 500 - env: - - name: KMODELS_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: KMODELS_ID - valueFrom: - fieldRef: - fieldPath: metadata.namespace - envFrom: - - configMapRef: - name: km-controller - - secretRef: - name: km-s3-secret - volumeMounts: - - name: storage - mountPath: "/storage" - - name: ssh-key - mountPath: "/etc/ssl/certs" - readOnly: true diff --git a/instance-applications/113-ibm-kmodels/values.yaml b/instance-applications/113-ibm-kmodels/values.yaml deleted file mode 100644 index 3d5c279ce..000000000 --- a/instance-applications/113-ibm-kmodels/values.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -run_sync_hooks: true - -aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" - -mas_aibroker_storage_provider: "aws" -mas_aibroker_storage_ssl: "true" - -# following are the variable need to injected via environment variable -mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" -mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" -mas_aibroker_storage_host: "mas_aibroker_storage_host" -mas_aibroker_storage_port: "mas_aibroker_storage_port" -mas_aibroker_storage_region: "mas_aibroker_storage_region" - -ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" - -# vars file for kmodels -pullSecretName: "ibm-entitlement" - -docker_server: "MAS_ICR_CP/aibroker" - -tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" -mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" -primary_storage_class: "PRIMARY_STORAGE_CLASS" - -# Bucket names -mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" -mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" -mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - -#container images -image_store: "MAS_ICR_CP/aibroker/store:1.0.2" -image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" -image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" - -mas_aibroker_pipeline_steps_tag: 1.0.0 -mas_aibroker_connector_tag: 1.0.0 - -#saas -mas_aibroker_saas: "MAS_AIBROKER_SAAS" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml deleted file mode 100644 index 96a455712..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml +++ /dev/null @@ -1,89 +0,0 @@ -{{- if not (empty .Values.ibm_kmodel) }} ---- -# IBM Maximo Kmodels -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "040" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/113-ibm-kmodels - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" - run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" - aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" - mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" - ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" - pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" - docker_server: "{{ .Values.ibm_kmodel.docker_server }}" - tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" - primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" - mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" - mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" - mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" - image_store: "{{ .Values.ibm_kmodel.image_store }}" - image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" - image_controller: "{{ .Values.ibm_kmodel.image_controller }}" - mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" - mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" - - junitreporter: - reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: kmodelapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 58c3edcc8..fd221d586 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -38,12 +38,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 3e382150d..8f0244b2c 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -48,13 +48,4 @@ devops: custom_sa: custom_sa_namespace: - custom_sa_details: - -ibm_minio: - minio_namespace: "minio" - minio_instance_name: "minio" - minio_root_user: "minio" - minio_root_password: "minio123" - minio_storage_class: "default" - minio_storage_size: "40Gi" - minio_image: "quay.io/minio/minio:latest" \ No newline at end of file + custom_sa_details: \ No newline at end of file From f2ddf71d6cd93a817b8f5cd1f9f76763a867f31c Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 3 Apr 2025 11:30:22 +0530 Subject: [PATCH 066/491] remove spaces and comments --- .../templates/030-ibm-odh-app.yaml | 7 ------- root-applications/ibm-aibroker-instance-root/values.yaml | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 1e71ca0fe..3ecaf302e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -45,10 +45,8 @@ spec: odh_channel: "{{ .Values.ibm_odh.odh_channel }}" odh_catalog_source: "{{ .Values.ibm_odh.odh_catalog_source }}" odh_operator_version: "{{ .Values.ibm_odh.odh_operator_version }}" - aibroker_namespace: "{{ .Values.ibm_odh.aibroker_namespace }}" pull_secret_name: "{{ .Values.ibm_odh.pull_secret_name }}" - # Storage vars mas_aibroker_storage_provider: "{{ .Values.ibm_odh.mas_aibroker_storage_provider }}" mas_aibroker_storage_accesskey: "{{ .Values.ibm_odh.mas_aibroker_storage_accesskey }}" mas_aibroker_storage_secretkey: "{{ .Values.ibm_odh.mas_aibroker_storage_secretkey }}" @@ -56,20 +54,15 @@ spec: mas_aibroker_storage_port: "{{ .Values.ibm_odh.mas_aibroker_storage_port }}" mas_aibroker_storage_ssl: "{{ .Values.ibm_odh.mas_aibroker_storage_ssl }}" mas_aibroker_storage_region: "{{ .Values.ibm_odh.mas_aibroker_storage_region }}" - - # MariaDB mas_aibroker_db_host: "{{ .Values.ibm_odh.mas_aibroker_db_host }}" mas_aibroker_db_port: "{{ .Values.ibm_odh.mas_aibroker_db_port }}" mas_aibroker_db_user: "{{ .Values.ibm_odh.mas_aibroker_db_user }}" mas_aibroker_db_database: "{{ .Values.ibm_odh.mas_aibroker_db_database }}" - mas_aibroker_db_secret_key: "{{ .Values.ibm_odh.mas_aibroker_db_secret_key }}" mas_aibroker_db_secret_name: "{{ .Values.ibm_odh.mas_aibroker_db_secret_name }}" mas_aibroker_db_secret_value: "{{ .Values.ibm_odh.mas_aibroker_db_secret_value }}" - mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_odh.mas_aibroker_storage_pipelines_bucket }}" primary_storage_class: "{{ .Values.ibm_odh.primary_storage_class }}" - {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 481dc8e0a..fd8da8e3d 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -74,8 +74,8 @@ ibm_odh: aibroker_namespace: "mas_sremat_aibroker" pull_secret_name: "ibm_entitlement" mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_accesskey: "" + mas_aibroker_storage_secretkey: "" mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" From b45ac5bdda811e556ab90cbea4f291bde99de368 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 3 Apr 2025 11:37:06 +0530 Subject: [PATCH 067/491] fix indent --- .../112-ibm-odh/templates/10-odh-dspa-aws.yaml | 2 +- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml index 6c11e9a10..cb014b4d4 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-wave: "131" stringData: accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" - secretkey: "{{ .Values.mas_aibroker_storage_secretkey}}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" host: "{{ .Values.mas_aibroker_storage_host }}" region: "{{ .Values.mas_aibroker_storage_region }}" ssl: "{{ .Values.mas_aibroker_storage_ssl }}" diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 70209fcff..f922b21f4 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -13,7 +13,7 @@ metadata: openshift.io/display-name: Minio Data Connection stringData: accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" - secretkey: "{{ .Values.mas_aibroker_storage_secretkey}}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" ssl: "{{ .Values.mas_aibroker_storage_ssl }}" From e57357eb455c77b38f14bc7e8bef4a7ddd50d89f Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 3 Apr 2025 11:56:21 +0530 Subject: [PATCH 068/491] remove quotes --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index f922b21f4..ae999faa9 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -12,11 +12,11 @@ metadata: opendatahub.io/connection-type: s3 openshift.io/display-name: Minio Data Connection stringData: - accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" - secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" - host: "{{ .Values.mas_aibroker_storage_host }}" - port: "{{ .Values.mas_aibroker_storage_port }}" - ssl: "{{ .Values.mas_aibroker_storage_ssl }}" + accesskey: {{ .Values.mas_aibroker_storage_accesskey }} + secretkey: {{ .Values.mas_aibroker_storage_secretkey }} + host: {{ .Values.mas_aibroker_storage_host }} + port: {{ .Values.mas_aibroker_storage_port }} + ssl: {{ .Values.mas_aibroker_storage_ssl }} --- apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 kind: DataSciencePipelinesApplication From 5e5419575a3c20dc281cb2557209c10499146aad Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 13:03:53 +0530 Subject: [PATCH 069/491] Update 01-odh-pipeline-operator-subcription.yaml --- .../templates/01-odh-pipeline-operator-subcription.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 10fe0e395..cb65ec434 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -2,11 +2,12 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines-operator-rh + name: openshift-pipelines namespace: "{{ .Values.openshift_namespace }}" annotations: argocd.argoproj.io/sync-wave: "116" spec: - package_name: "openshift-pipelines-operator-rh" - package_channel: "{{ .Values.pipeline_channel }}" - catalog_source: "{{ .Values.pipeline_catalog_source }}" \ No newline at end of file + channel: {{ .Values.pipeline_channel }} + name: Openshift-pipelines + source: {{ .Values.pipeline_catalog_source }} + sourceNamespace: {{ .Values.openshift_namespace }} From 3a09a828895b7cf6eeed4d92e21506bb486795cc Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 14:44:13 +0530 Subject: [PATCH 070/491] Update 01-odh-pipeline-operator-subcription.yaml --- .../01-odh-pipeline-operator-subcription.yaml | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index cb65ec434..4a06d06ca 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,13 +1,28 @@ + +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: {{ .Release.Name }}-operatorgroup + namespace: {{ .Values.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "116" +spec: + targetNamespaces: + - {{ .Values.namespace }} + --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines - namespace: "{{ .Values.openshift_namespace }}" - annotations: + name: {{ .Values.operatorName }} + namespace: {{ .Values.namespace }} + annotations: argocd.argoproj.io/sync-wave: "116" spec: - channel: {{ .Values.pipeline_channel }} - name: Openshift-pipelines - source: {{ .Values.pipeline_catalog_source }} - sourceNamespace: {{ .Values.openshift_namespace }} + channel: {{ .Values.channel }} + name: {{ .Values.operatorName }} + source: {{ .Values.source }} + sourceNamespace: {{ .Values.sourceNamespace }} + + From 4df71ead6acde93869866763d5bf84bd25de441a Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 14:45:52 +0530 Subject: [PATCH 071/491] Update values.yaml --- instance-applications/112-ibm-odh/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index c9f262d87..264a64e77 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -11,6 +11,12 @@ odh-channel: "fast" odh-catalog-source: "community-operators" odh-operator-version: "opendatahub-operator.v2.11.1" +namespace: "openshift-operators" +channel: "latest" +operatorName: "openshift-pipelines-operator" +source: "redhat-operators" +sourceNamespace: "openshift-marketplace" + aibroker-namespace: "mas-sremat-aibroker" pull-secret-name: "ibm-entitlement" # Storage vars From 64179a01e1998ce26710b86f1476f55bd1c56dfa Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 3 Apr 2025 14:51:33 +0530 Subject: [PATCH 072/491] changes for kmodels --- .../113-ibm-kmodels/Chart.yaml | 11 ++ .../113-ibm-kmodels/README.md | 3 + .../templates/01-kmodel-namespace.yaml | 7 + .../templates/02-kmodel-secret.yaml | 31 ++++ .../templates/03-kmodel-istio.yaml | 47 +++++ .../templates/04-kmodel-networkpolicies.yaml | 43 +++++ .../templates/05-kmodel-store.yaml | 125 +++++++++++++ .../templates/06-kmodel-watcher.yaml | 142 +++++++++++++++ .../templates/07-kmodel-controller.yaml | 169 ++++++++++++++++++ .../113-ibm-kmodels/values.yaml | 41 +++++ .../templates/040-ibm-kmodels-app.yaml | 89 +++++++++ .../ibm-aibroker-instance-root/values.yaml | 31 ++++ .../templates/099-instance-appset.yaml | 7 +- 13 files changed, 745 insertions(+), 1 deletion(-) create mode 100644 instance-applications/113-ibm-kmodels/Chart.yaml create mode 100644 instance-applications/113-ibm-kmodels/README.md create mode 100644 instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml create mode 100644 instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml create mode 100644 instance-applications/113-ibm-kmodels/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml diff --git a/instance-applications/113-ibm-kmodels/Chart.yaml b/instance-applications/113-ibm-kmodels/Chart.yaml new file mode 100644 index 000000000..21648d971 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-kmodels +description: IBM KMODELS +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/README.md b/instance-applications/113-ibm-kmodels/README.md new file mode 100644 index 000000000..cd4553e8f --- /dev/null +++ b/instance-applications/113-ibm-kmodels/README.md @@ -0,0 +1,3 @@ +IBM Kmodels +=============================================================================== +Deploy and configure kmodels storage with configurable version \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml new file mode 100644 index 000000000..1d9553fbc --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "137" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml new file mode 100644 index 000000000..c549d4ffb --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -0,0 +1,31 @@ +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "138" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml new file mode 100644 index 000000000..e9272d02a --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -0,0 +1,47 @@ +--- +apiVersion: security.istio.io/v1beta1 +kind: PeerAuthentication +metadata: + name: default + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +spec: + mtls: + mode: PERMISSIVE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: ds-pipeline-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "140" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: ds-pipeline-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 8888 + tls: + mode: DISABLE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: minio-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "141" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: minio-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 9000 + tls: + mode: DISABLE diff --git a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml new file mode 100644 index 000000000..d18856881 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "142" +spec: + podSelector: + matchLabels: + kmodels: instance + part-of: kmodels + policyTypes: + - Ingress + ingress: + - ports: + - port: 3000 + - port: 8443 + +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: ds-pipelines-km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "143" +spec: + podSelector: + matchLabels: + app: ds-pipeline-instance + component: data-science-pipelines + ingress: + - ports: + - protocol: TCP + port: 8888 + from: + - podSelector: + matchLabels: + app: km-controller + policyTypes: + - Ingress diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml new file mode 100644 index 000000000..0df630860 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml @@ -0,0 +1,125 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "144" + labels: + app: km-store +data: + STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + # Certificate files folder (default: /etc/ssl/certs) + CERTS_PATH: "/etc/ssl/certs" + # Private key (default: tls.key) + CERT_PRIVATE_KEY: "tls.key" + # Public certificate (default: tls.crt) + CERT_PUBLIC_CERTIFICATE: "tls.crt" + # Set to true to enable https server (default: true) + SUPPORT_HTTPS: "true" + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "145" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-store + type: ClusterIP + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "146" + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels +spec: + replicas: 1 + selector: + matchLabels: + app: km-store + kmodels: instance + part-of: kmodels + template: + metadata: + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels + spec: + restartPolicy: Always + volumes: + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: store + image: "{{ .Values.image_store }}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + envFrom: + - configMapRef: + name: km-store + - secretRef: + name: km-s3-secret + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + volumeMounts: + - mountPath: "/etc/ssl/certs" + name: ssh-key + readOnly: true diff --git a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml new file mode 100644 index 000000000..dec6716e2 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -0,0 +1,142 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "147" +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-role + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "148" +rules: + - verbs: + - list + - watch + apiGroups: + - '' + resources: + - events + - pods +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-binding + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "149" +subjects: + - kind: ServiceAccount + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: km-watcher-role + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "150" + labels: + app: km-watcher +data: + PIPELINES: "{{ .Values.aibroker_namespace }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "151" +spec: + ports: + - name: http + port: 3000 + targetPort: http + selector: + app: km-watcher + type: ClusterIP + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "152" + labels: + app: km-watcher + component: watcher +spec: + replicas: 1 + selector: + matchLabels: + app: km-watcher + template: + metadata: + labels: + app: km-watcher + component: watcher + spec: + serviceAccountName: km-watcher + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: watcher + image: "{{ .Values.image_watcher}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 5 + periodSeconds: 500 + envFrom: + - configMapRef: + name: km-watcher + - secretRef: + name: km-s3-secret diff --git a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml new file mode 100644 index 000000000..7839ab53a --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -0,0 +1,169 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "153" + labels: + app: km-controller +data: + DOCKER_SERVER: "{{ .Values.docker_server }}" + PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + DOCKER_SECRETS_NAME: "ibm-entitlement" + CONNECTOR_IMAGE_PREFIX: '' + PIPELINE_STEP_IMAGE_PREFIX: '' + PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" + CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" + {{- if .Values.mas_aibroker_saas }} + DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" + {{- else }} + DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" + {{- end }} + PLATFORM: openshift + + +--- +apiVersion: v1 +kind: Service +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "154" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-controller + type: ClusterIP + + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: km-controller-pvc + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "155" +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + resources: + requests: + storage: 1Gi + storageClassName: "{{ .Values.primary_storage_class }}" + + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "156" + + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "157" + labels: + app: km-controller + component: controller +spec: + replicas: 1 + revisionHistoryLimit: 1 + selector: + matchLabels: + app: km-controller + template: + metadata: + labels: + app: km-controller + component: controller + spec: + serviceAccountName: km-controller + volumes: + - name: storage + persistentVolumeClaim: + claimName: km-controller-pvc + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: controller + image: "{{ .Values.image_controller}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + resources: + requests: + memory: "128Mi" + cpu: "100m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "200m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + env: + - name: KMODELS_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: KMODELS_ID + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: km-controller + - secretRef: + name: km-s3-secret + volumeMounts: + - name: storage + mountPath: "/storage" + - name: ssh-key + mountPath: "/etc/ssl/certs" + readOnly: true diff --git a/instance-applications/113-ibm-kmodels/values.yaml b/instance-applications/113-ibm-kmodels/values.yaml new file mode 100644 index 000000000..3d5c279ce --- /dev/null +++ b/instance-applications/113-ibm-kmodels/values.yaml @@ -0,0 +1,41 @@ +--- +run_sync_hooks: true + +aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" + +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_ssl: "true" + +# following are the variable need to injected via environment variable +mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" +mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" +mas_aibroker_storage_host: "mas_aibroker_storage_host" +mas_aibroker_storage_port: "mas_aibroker_storage_port" +mas_aibroker_storage_region: "mas_aibroker_storage_region" + +ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" + +# vars file for kmodels +pullSecretName: "ibm-entitlement" + +docker_server: "MAS_ICR_CP/aibroker" + +tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" +mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" +primary_storage_class: "PRIMARY_STORAGE_CLASS" + +# Bucket names +mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" +mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" +mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + +#container images +image_store: "MAS_ICR_CP/aibroker/store:1.0.2" +image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" +image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + +mas_aibroker_pipeline_steps_tag: 1.0.0 +mas_aibroker_connector_tag: 1.0.0 + +#saas +mas_aibroker_saas: "MAS_AIBROKER_SAAS" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml new file mode 100644 index 000000000..a7e7c2fc8 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml @@ -0,0 +1,89 @@ +{{- if not (empty .Values.ibm_kmodel) }} +--- +# IBM Maximo Kmodels +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "040" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/113-ibm-kmodel + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" + aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" + mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" + ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" + pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" + docker_server: "{{ .Values.ibm_kmodel.docker_server }}" + tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" + primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" + mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" + mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" + image_store: "{{ .Values.ibm_kmodel.image_store }}" + image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" + image_controller: "{{ .Values.ibm_kmodel.image_controller }}" + mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" + mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" + + junitreporter: + reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: kmodelapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index fd8da8e3d..9997b17df 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -93,3 +93,34 @@ ibm_odh: mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" primary_storage_class: "nfs-client" + + +ibm_kmodel: + openshift_namespace: "openshift-operators" + run_sync_hooks: true + aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" + # vars file for kmodels + pullSecretName: "ibm-entitlement" + docker_server: "MAS_ICR_CP/aibroker" + tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" + mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" + primary_storage_class: "PRIMARY_STORAGE_CLASS" + # Bucket names + mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + #container images + image_store: "MAS_ICR_CP/aibroker/store:1.0.2" + image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" + image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + mas_aibroker_pipeline_steps_tag: 1.0.0 + mas_aibroker_connector_tag: 1.0.0 \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index fd221d586..58c3edcc8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -38,7 +38,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From c18d3781e5bacf5c4ff1b56270c7db01f86e74b0 Mon Sep 17 00:00:00 2001 From: Yogeshkumar Date: Thu, 3 Apr 2025 15:09:45 +0530 Subject: [PATCH 073/491] Update values.yaml --- instance-applications/112-ibm-odh/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 264a64e77..3749c431e 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -13,7 +13,7 @@ odh-operator-version: "opendatahub-operator.v2.11.1" namespace: "openshift-operators" channel: "latest" -operatorName: "openshift-pipelines-operator" +operatorName: "openshift-pipelines-operator-rh" source: "redhat-operators" sourceNamespace: "openshift-marketplace" From 589bff6a0122b542da6ef816df36a14c08127612 Mon Sep 17 00:00:00 2001 From: Drashti-Malviya Date: Thu, 3 Apr 2025 20:51:42 +0530 Subject: [PATCH 074/491] correct kmodel file name --- .../templates/040-ibm-kmodels-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml index a7e7c2fc8..96a455712 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml @@ -27,7 +27,7 @@ spec: namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/113-ibm-kmodel + path: instance-applications/113-ibm-kmodels targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} From 5c67f1347744c1dffbac19d7e1ab6a138eb7092b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 3 Apr 2025 21:10:13 +0530 Subject: [PATCH 075/491] namespace update --- .../templates/02-odh-serverless-subscription.yaml | 10 ++++++++++ .../ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index a60fc6ebf..30afd1d74 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -1,3 +1,13 @@ +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-serverless + argocd.argoproj.io/sync-wave: "117" + +--- + apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 9997b17df..342e244e7 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -62,7 +62,7 @@ ibm_odh: openshift_namespace: "openshift-operators" pipeline_channel: "latest" pipeline_catalog_source: "redhat-operators" - service_mesh_namespace: "openshift-operators" + service_mesh_namespace: "openshift-serverless" service_mesh_channel: "stable" service_mesh_catalog_source: "redhat-operators" serverless_channel: "stable" From cc32773b7b1907918ca52beabe61d208e74572fc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 08:14:51 +0530 Subject: [PATCH 076/491] namespace serverless created helm chart --- .../templates/02-odh-serverless-subscription.yaml | 10 ++++++++++ .../ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index a60fc6ebf..30afd1d74 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -1,3 +1,13 @@ +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-serverless + argocd.argoproj.io/sync-wave: "117" + +--- + apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 9997b17df..342e244e7 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -62,7 +62,7 @@ ibm_odh: openshift_namespace: "openshift-operators" pipeline_channel: "latest" pipeline_catalog_source: "redhat-operators" - service_mesh_namespace: "openshift-operators" + service_mesh_namespace: "openshift-serverless" service_mesh_channel: "stable" service_mesh_catalog_source: "redhat-operators" serverless_channel: "stable" From f906589663a4184e5a21a55ac7c7b433e6b8cfd2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 08:36:22 +0530 Subject: [PATCH 077/491] servicemeshoperator subscription --- .../03-odh-servicemesh-operator-sa.yaml | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 6ea35bdd2..845700079 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -2,13 +2,20 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: servicemeshoperator - namespace: "{{ .Values.service_mesh_namespace }}" - package_name: "servicemeshoperator" - package_channel: "{{ .Values.service_mesh_channel }}" - catalog_source: "{{ .Values.service_mesh_catalog_source }}" - annotations: - argocd.argoproj.io/sync-wave: "119" + name: servicemeshoperator + namespace: "{{ .Values.service_mesh_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "119" + labels: + app.kubernetes.io/name: Servicemesh +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + channel: stable + name: servicemeshoperator + source: redhat-operators + sourceNamespace: openshift-marketplace --- apiVersion: v1 kind: ServiceAccount @@ -16,4 +23,4 @@ metadata: name: istio-operator namespace: "{{ .Values.service_mesh_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "120" \ No newline at end of file + argocd.argoproj.io/sync-wave: "120" From 3513162faa54b6793bbb0bb1df4dd2c8a5c97f19 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 09:12:39 +0530 Subject: [PATCH 078/491] servicemesh --- .../03-odh-servicemesh-operator-sa.yaml | 43 +++++++++++++++---- instance-applications/112-ibm-odh/values.yaml | 1 + 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 845700079..932eeec89 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -1,21 +1,48 @@ +# --- +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: servicemeshoperator +# namespace: "{{ .Values.service_mesh_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "119" +# labels: +# app.kubernetes.io/name: Servicemesh +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# channel: stable +# name: servicemeshoperator +# source: redhat-operators +# sourceNamespace: openshift-marketplace +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: rh-service-mesh-operator-operatorgroup + namespace: {{ .Values.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "119" +spec: + targetNamespaces: + - {{ .Values.namespace }} + + --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: servicemeshoperator - namespace: "{{ .Values.service_mesh_namespace }}" + namespace: {{ .Values.namespace }} annotations: argocd.argoproj.io/sync-wave: "119" - labels: - app.kubernetes.io/name: Servicemesh -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} spec: channel: stable name: servicemeshoperator - source: redhat-operators - sourceNamespace: openshift-marketplace + source: {{ .Values.service-mesh-catalog-source }} + sourceNamespace: {{ .Values.service-mesh-sourceNamespace }} + --- apiVersion: v1 kind: ServiceAccount diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 3749c431e..5e53ae10a 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -5,6 +5,7 @@ pipeline-catalog-source: "redhat-operators" service-mesh-namespace: "openshift-operators" service-mesh-channel: "stable" service-mesh-catalog-source: "redhat-operators" +service-mesh-sourceNamespace: "openshift-marketplace" serverless-channel: "stable" authorino-catalog-source: "community-operators" odh-channel: "fast" From 5c434c7aa0e6529209c8999f05a40b3cc6f5715a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 09:15:44 +0530 Subject: [PATCH 079/491] intend --- .../112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 932eeec89..61b4d58b2 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -50,4 +50,4 @@ metadata: name: istio-operator namespace: "{{ .Values.service_mesh_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "120" + argocd.argoproj.io/sync-wave: "120" \ No newline at end of file From c476532d60e6fe0f238701d798c8c2e8b483ced8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 09:19:57 +0530 Subject: [PATCH 080/491] pipeline --- .../templates/01-odh-pipeline-operator-subcription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 4a06d06ca..3386ebb18 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -3,7 +3,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: {{ .Release.Name }}-operatorgroup + name: openshift-pipelines-operator namespace: {{ .Values.namespace }} annotations: argocd.argoproj.io/sync-wave: "116" From 861cd8c92e911f08a903d6395c0f5e1de0372a97 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 10:02:21 +0530 Subject: [PATCH 081/491] fixed _ in templates --- .../03-odh-servicemesh-operator-sa.yaml | 4 +- instance-applications/112-ibm-odh/values.yaml | 66 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 61b4d58b2..39b28828c 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -40,8 +40,8 @@ metadata: spec: channel: stable name: servicemeshoperator - source: {{ .Values.service-mesh-catalog-source }} - sourceNamespace: {{ .Values.service-mesh-sourceNamespace }} + source: {{ .Values.service_mesh_catalog_source }} + sourceNamespace: {{ .Values.service_mesh_sourceNamespace }} --- apiVersion: v1 diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 5e53ae10a..06b798288 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -1,43 +1,43 @@ --- -openshift-namespace: "openshift-operators" -pipeline-channel: "latest" -pipeline-catalog-source: "redhat-operators" -service-mesh-namespace: "openshift-operators" -service-mesh-channel: "stable" -service-mesh-catalog-source: "redhat-operators" -service-mesh-sourceNamespace: "openshift-marketplace" -serverless-channel: "stable" -authorino-catalog-source: "community-operators" -odh-channel: "fast" -odh-catalog-source: "community-operators" -odh-operator-version: "opendatahub-operator.v2.11.1" +openshift_namespace: "openshift-operators" +pipeline_channel: "latest" +pipeline_catalog_source: "redhat-operators" +service_mesh_namespace: "openshift-operators" +service_mesh_channel: "stable" +service_mesh_catalog_source: "redhat-operators" +service_mesh_sourceNamespace: "openshift-marketplace" +serverless_channel: "stable" +authorino_catalog_source: "community-operators" +odh_channel: "fast" +odh_catalog_source: "community-operators" +odh_operator_version: "opendatahub-operator.v2.11.1" namespace: "openshift-operators" channel: "latest" -operatorName: "openshift-pipelines-operator-rh" -source: "redhat-operators" -sourceNamespace: "openshift-marketplace" +operatorName: "openshift_pipelines_operator_rh" +source: "redhat_operators" +sourceNamespace: "openshift_marketplace" -aibroker-namespace: "mas-sremat-aibroker" -pull-secret-name: "ibm-entitlement" +aibroker_namespace: "mas_sremat_aibroker" +pull_secret_name: "ibm_entitlement" # Storage vars -mas-aibroker-storage-provider: "aws" -mas-aibroker-storage-accesskey: "aibroker-storage-accesskey" -mas-aibroker-storage-secretkey: "aibroker-storage-secretkey" -mas-aibroker-storage-host: "mas-aibroker-storage-host" -mas-aibroker-storage-port: "mas-aibroker-storage-port" -mas-aibroker-storage-ssl: "mas-aibroker-storage-ssl" -mas-aibroker-storage-region: "mas-aibroker-storage-region" +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_accesskey: "aibroker_storage_accesskey" +mas_aibroker_storage_secretkey: "aibroker_storage_secretkey" +mas_aibroker_storage_host: "mas_aibroker_storage_host" +mas_aibroker_storage_port: "mas_aibroker_storage_port" +mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" +mas_aibroker_storage_region: "mas_aibroker_storage_region" # MariaDB -mas-aibroker-db-host: "mas-aibroker-db-host" -mas-aibroker-db-port: "mas-aibroker-db-port" -mas-aibroker-db-user: "mas-aibroker-db-user" -mas-aibroker-db-database: "mas-aibroker-db-database" +mas_aibroker_db_host: "mas_aibroker_db_host" +mas_aibroker_db_port: "mas_aibroker_db_port" +mas_aibroker_db_user: "mas_aibroker_db_user" +mas_aibroker_db_database: "mas_aibroker_db_database" -mas-aibroker-db-secret-key: "mas-aibroker-db-secret-key" -mas-aibroker-db-secret-name: "mas-aibroker-db-secret-name" -mas-aibroker-db-secret-value: "mas-aibroker-db-secret-value" +mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" +mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" +mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" -mas-aibroker-storage-pipelines-bucket: "mas-aibroker-storage-pipelines-bucket" -primary-storage-class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" +mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" +primary_storage_class: "defaultStorageClasses" #"{{ defaultStorageClasses.rwx }}" From 50549583c76a945fb1b52a871fbd7f7e057da2d6 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 10:19:46 +0530 Subject: [PATCH 082/491] update name --- instance-applications/112-ibm-odh/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 06b798288..e0228b2ba 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -14,7 +14,7 @@ odh_operator_version: "opendatahub-operator.v2.11.1" namespace: "openshift-operators" channel: "latest" -operatorName: "openshift_pipelines_operator_rh" +operatorName: "openshift-pipelines-operator-rh" source: "redhat_operators" sourceNamespace: "openshift_marketplace" From 146d018a1e7d2e740fc68e4dbb1e2e234640af1b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 10:37:39 +0530 Subject: [PATCH 083/491] pipeline operator helm update --- .../01-odh-pipeline-operator-subcription.yaml | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 3386ebb18..e3d47dec6 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,28 +1,24 @@ - --- + apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-pipelines-operator - namespace: {{ .Values.namespace }} - annotations: + name: openshift-pipelines-operator + namespace: openshift-operators + annotations: argocd.argoproj.io/sync-wave: "116" -spec: - targetNamespaces: - - {{ .Values.namespace }} - --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: {{ .Values.operatorName }} - namespace: {{ .Values.namespace }} - annotations: + name: openshift-pipelines-operator-rh + namespace: openshift-operators + annotations: argocd.argoproj.io/sync-wave: "116" spec: - channel: {{ .Values.channel }} - name: {{ .Values.operatorName }} - source: {{ .Values.source }} - sourceNamespace: {{ .Values.sourceNamespace }} - + channel: latest + installPlanApproval: Automatic + name: openshift-operators + source: redhat-operators + sourceNamespace: openshift-marketplace From 621007c46d319bc97abfcfe619f8a3b47fbf318c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 11:27:24 +0530 Subject: [PATCH 084/491] only pipeline operator --- .../02-odh-serverless-subscription.yaml | 31 ------ .../03-odh-servicemesh-operator-sa.yaml | 53 ---------- .../templates/04-odh-authorino-operator.yaml | 11 --- .../templates/05-odh-operator-job.yaml | 98 ------------------- .../05-odh-operator-subcription.yaml | 15 --- .../templates/06-odh-namespace.yaml | 7 -- .../templates/07-odh-external-secret-db.yaml | 12 --- .../templates/08-odh-dsc-init.yaml | 34 ------- .../09-odh-data-science-cluster.yaml | 26 ----- .../templates/10-odh-dspa-aws.yaml | 53 ---------- .../templates/10-odh-dspa-local.yaml | 21 ---- .../templates/10-odh-dspa-minio.yaml | 56 ----------- .../112-ibm-odh/templates/11-odh.yaml | 10 -- 13 files changed, 427 deletions(-) delete mode 100644 instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/11-odh.yaml diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml deleted file mode 100644 index 30afd1d74..000000000 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- - -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-serverless - argocd.argoproj.io/sync-wave: "117" - ---- - -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: operatorgroup - namespace: openshift-serverless - annotations: - argocd.argoproj.io/sync-wave: "117" ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: serverless-operator - namespace: openshift-serverless - annotations: - argocd.argoproj.io/sync-wave: "118" -spec: - channel: stable - installPlanApproval: Automatic - name: serverless-operator - source: redhat-operators - sourceNamespace: openshift-marketplace diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml deleted file mode 100644 index 39b28828c..000000000 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# --- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: servicemeshoperator -# namespace: "{{ .Values.service_mesh_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "119" -# labels: -# app.kubernetes.io/name: Servicemesh -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# channel: stable -# name: servicemeshoperator -# source: redhat-operators -# sourceNamespace: openshift-marketplace ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: rh-service-mesh-operator-operatorgroup - namespace: {{ .Values.namespace }} - annotations: - argocd.argoproj.io/sync-wave: "119" -spec: - targetNamespaces: - - {{ .Values.namespace }} - - ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: servicemeshoperator - namespace: {{ .Values.namespace }} - annotations: - argocd.argoproj.io/sync-wave: "119" -spec: - channel: stable - name: servicemeshoperator - source: {{ .Values.service_mesh_catalog_source }} - sourceNamespace: {{ .Values.service_mesh_sourceNamespace }} - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: istio-operator - namespace: "{{ .Values.service_mesh_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "120" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml deleted file mode 100644 index 5c1405ee1..000000000 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: authorino-operator - nnamespace: "{{ .Values.openshift_namespace }}" - package_name: "authorino-operator" - package_channel: "{{ .Values.serverless_channel }}" # This looks wrong, but that's what was in the original template - catalog_source: "{{ .Values.authorino_catalog_source }}" - annotations: - argocd.argoproj.io/sync-wave: "121" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml deleted file mode 100644 index 020d15635..000000000 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ /dev/null @@ -1,98 +0,0 @@ - -{{ $ns := "openshift-operators"}} -{{ $role_name := "odh-installplan-ra" }} -{{ $sa_name := "odh-installplan-sa" }} -{{ $rb_name := "odh-installplan-rb" }} - ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - name: {{ $sa_name }} - namespace: {{ $ns }} - annotations: - argocd.argoproj.io/sync-wave: "122" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} - ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ $role_name }} - annotations: - argocd.argoproj.io/sync-wave: "123" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -rules: - - verbs: - - patch - resources: - - installplan - - ---- - -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - annotations: - argocd.argoproj.io/sync-wave: "124" - namespace: "{{ $ns }}" - name: "odh-installplan" - labels: - app: "odh-installplan" -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: "odh-installplan" -subjects: - - apiGroup: "" - kind: ServiceAccount - name: "odh-installplan" - namespace: {{ $ns }} - - ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: installplan-patch - namespace: {{ .Values.namespace }} - annotations: - argocd.argoproj.io/sync-wave: "125" -spec: - template: - spec: - serviceAccountName: {{ .Values.serviceAccountName }} - containers: - - name: Installplan-job - image: quay.io/ibmmas/cli:latest - imagePullPolicy: IfNotPresent - resources: - limits: - cpu: 200m - memory: 512Mi - requests: - cpu: 10m - memory: 64Mi - command: - - /bin/sh - - -c - - | - clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("{{ .Values.odhOperatorVersion }}")) | .metadata.name') - if [ -n "$clusterServiceVersionNames" ]; then - oc patch installplan $clusterServiceVersionNames -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' - echo "InstallPlan $clusterServiceVersionNames approved successfully." - else - echo "No InstallPlan found for {{ .Values.odhOperatorVersion }}." - exit 1 - fi - restartPolicy: OnFailure diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml deleted file mode 100644 index ac2cb84a9..000000000 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: opendatahub-operator - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "126" -spec: - channel: "{{ .Values.odh_channel }}" - installPlanApproval: Manual - name: opendatahub-operator - source: "{{ .Values.odh_catalog_source }}" - sourceNamespace: openshift-marketplace - startingCSV: "{{ .Values.odh_operator_version }}" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml deleted file mode 100644 index 50801bf35..000000000 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# create new workspace is not needed , because argocd will create new namespace bydefault ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "127" diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml deleted file mode 100644 index a748c64c6..000000000 --- a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.mas_aibroker_db_secret_name }}" - namespace: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "128" -type: Opaque -# stringData: -# password: "{{ .Values.mas_aibroker_db_secret_value }}" # need to verify is it b64enc -data: - password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} diff --git a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml deleted file mode 100644 index c2ece7b65..000000000 --- a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml +++ /dev/null @@ -1,34 +0,0 @@ - ---- -apiVersion: dscinitialization.opendatahub.io/v1 -kind: DSCInitialization -metadata: - annotations: - argocd.argoproj.io/sync-wave: "129" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - finalizers: - - dscinitialization.opendatahub.io/finalizer - labels: - app.kubernetes.io/created-by: opendatahub-operator - app.kubernetes.io/instance: default - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: dscinitialization - app.kubernetes.io/part-of: opendatahub-operator - name: default-dsci -spec: - applicationsNamespace: opendatahub - monitoring: - managementState: Managed - namespace: opendatahub - serviceMesh: - auth: - audiences: - - 'https://kubernetes.default.svc' - controlPlane: - metricsCollection: Istio - name: data-science-smcp - namespace: istio-system - managementState: Managed - trustedCABundle: - customCABundle: '' - managementState: Managed diff --git a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml deleted file mode 100644 index ba9315cb5..000000000 --- a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -kind: DataScienceCluster -apiVersion: datasciencecluster.opendatahub.io/v1 -metadata: - annotations: - argocd.argoproj.io/sync-wave: "130" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - labels: - app.kubernetes.io/created-by: opendatahub-operator - app.kubernetes.io/instance: default - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: datasciencecluster - app.kubernetes.io/part-of: opendatahub-operator - name: default-dsc -spec: - components: - datasciencepipelines: - managementState: Managed - kserve: - managementState: Managed - serving: - ingressGateway: - certificate: - type: SelfSigned - managementState: Managed - name: knative-serving diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml deleted file mode 100644 index cb014b4d4..000000000 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -{{- if eq .Values.mas_aibroker_storage_provider "aws" }} -apiVersion: v1 -kind: Secret -metadata: - name: ds-pipeline-s3-instance - namespace: "{{ .Values.aibroker_namespace }}" - labels: - opendatahub.io/dashboard: 'false' - opendatahub.io/managed: 'true' - annotations: - opendatahub.io/connection-type: s3 - openshift.io/display-name: AWS S3 Connection - argocd.argoproj.io/sync-wave: "131" -stringData: - accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" - secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" - host: "{{ .Values.mas_aibroker_storage_host }}" - region: "{{ .Values.mas_aibroker_storage_region }}" - ssl: "{{ .Values.mas_aibroker_storage_ssl }}" ---- -apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 -kind: DataSciencePipelinesApplication -metadata: - name: instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "132" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - dspVersion: v1 - database: - disableHealthCheck: true - customExtraParams: '{"tls":"false"}' - externalDB: - host: "{{ .Values.mas_aibroker_db_host }}" - port: "{{ .Values.mas_aibroker_db_port }}" - username: "{{ .Values.mas_aibroker_db_user }}" - pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" - passwordSecret: - name: "{{ .Values.mas_aibroker_db_secret_name }}" - key: password - objectStorage: - disableHealthCheck: true - externalStorage: - host: "{{ .Values.mas_aibroker_storage_host }}" - bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - s3CredentialsSecret: - accessKey: accesskey - secretKey: secretkey - secretName: ds-pipeline-s3-instance - scheme: https -{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml deleted file mode 100644 index 003a84a92..000000000 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -{{- if eq .Values.mas_aibroker_storage_provider "local" }} -apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 -kind: DataSciencePipelinesApplication -metadata: - name: instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "133" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - database: - disableHealthCheck: true - objectStorage: - disableHealthCheck: true - minio: - deploy: true - image: 'quay.io/minio/minio' - pvcSize: 40Gi - storageClassName: {{ .Values.primary_storage_class }} -{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml deleted file mode 100644 index ae999faa9..000000000 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{{- if eq .Values.mas_aibroker_storage_provider "minio" }} -apiVersion: v1 -kind: Secret -metadata: - name: ds-pipeline-s3-instance - namespace: "{{ .Values.aibroker_namespace }}" - labels: - opendatahub.io/dashboard: "false" - opendatahub.io/managed: "true" - annotations: - argocd.argoproj.io/sync-wave: "134" - opendatahub.io/connection-type: s3 - openshift.io/display-name: Minio Data Connection -stringData: - accesskey: {{ .Values.mas_aibroker_storage_accesskey }} - secretkey: {{ .Values.mas_aibroker_storage_secretkey }} - host: {{ .Values.mas_aibroker_storage_host }} - port: {{ .Values.mas_aibroker_storage_port }} - ssl: {{ .Values.mas_aibroker_storage_ssl }} ---- -apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 -kind: DataSciencePipelinesApplication -metadata: - name: instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "135" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - dspVersion: v1 - database: - disableHealthCheck: true - customExtraParams: '{"tls":"false"}' - externalDB: - host: "{{ .Values.mas_aibroker_db_host }}" - port: "{{ .Values.mas_aibroker_db_port }}" - username: "{{ .Values.mas_aibroker_db_user }}" - pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" - passwordSecret: - name: "{{ .Values.mas_aibroker_db_secret_name }}" - key: password - - objectStorage: - disableHealthCheck: true - externalStorage: - host: "{{ .Values.mas_aibroker_storage_host }}" - port: "{{ .Values.mas_aibroker_storage_port }}" - bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - storageClassName: "{{ .Values.primary_storage_class }}" - s3CredentialsSecret: - accessKey: accesskey - secretKey: secretkey - secretName: ds-pipeline-s3-instance - scheme: http - -{{- end }} diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml deleted file mode 100644 index 936cfd5cf..000000000 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: pipeline-runner-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "136" -imagePullSecrets: - - name: "{{ .Values.pull_secret_name }}" From 8ebde9c594943cd710d712d2031db07c225a7693 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 11:40:53 +0530 Subject: [PATCH 085/491] pipeline name update --- .../01-odh-pipeline-operator-subcription.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index e3d47dec6..c971e3055 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,24 +1,24 @@ ---- +# --- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: openshift-pipelines-operator - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "116" +# apiVersion: operators.coreos.com/v1 +# kind: OperatorGroup +# metadata: +# name: openshift-pipelines-operator +# namespace: openshift-operators +# annotations: +# argocd.argoproj.io/sync-wave: "116" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines-operator-rh + name: openshift-pipelines-operator namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "116" spec: channel: latest installPlanApproval: Automatic - name: openshift-operators + name: openshift-pipelines-operator-rh source: redhat-operators sourceNamespace: openshift-marketplace From dd0ad69bb703924a2a7a55389798ad5de91ccc45 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 11:58:34 +0530 Subject: [PATCH 086/491] subscription update --- .../01-odh-pipeline-operator-subcription.yaml | 28 ++++++------------- instance-applications/112-ibm-odh/values.yaml | 5 ++-- .../templates/030-ibm-odh-app.yaml | 4 +-- .../ibm-aibroker-instance-root/values.yaml | 4 +-- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index c971e3055..64080cbb3 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,24 +1,14 @@ -# --- - -# apiVersion: operators.coreos.com/v1 -# kind: OperatorGroup -# metadata: -# name: openshift-pipelines-operator -# namespace: openshift-operators -# annotations: -# argocd.argoproj.io/sync-wave: "116" --- + apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines-operator - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "116" + name: openshift-pipelines-operator + namespace: openshift-operators spec: - channel: latest - installPlanApproval: Automatic - name: openshift-pipelines-operator-rh - source: redhat-operators - sourceNamespace: openshift-marketplace - + channel: {{ .Values.odh_pipeline_channel }} + installPlanApproval: {{ .Values.odh_pipeline_installplan }} + name: openshift-pipelines-operator-rh + source: redhat-operators + sourceNamespace: openshift-marketplace + diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index e0228b2ba..b720a0cd5 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -1,7 +1,8 @@ --- openshift_namespace: "openshift-operators" -pipeline_channel: "latest" -pipeline_catalog_source: "redhat-operators" +odh_pipeline_channel: "latest" +odh_pipeline_installplan: "Automatic" + service_mesh_namespace: "openshift-operators" service_mesh_channel: "stable" service_mesh_catalog_source: "redhat-operators" diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 3ecaf302e..3f8e6c14f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -35,8 +35,8 @@ spec: - name: {{ .Values.avp.values_varname }} value: | openshift_namespace: "{{ .Values.ibm_odh.openshift_namespace }}" - pipeline_channel: "{{ .Values.ibm_odh.pipeline_channel }}" - pipeline_catalog_source: "{{ .Values.ibm_odh.pipeline_catalog_source }}" + odh_pipeline_channel: "{{ .Values.ibm_odh.odh_pipeline_channel }}" + odh_pipeline_installplan: "{{ .Values.ibm_odh.odh_pipeline_installplan }}" service_mesh_namespace: "{{ .Values.ibm_odh.service_mesh_namespace }}" service_mesh_channel: "{{ .Values.ibm_odh.service_mesh_channel }}" service_mesh_catalog_source: "{{ .Values.ibm_odh.service_mesh_catalog_source }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 342e244e7..4ba3622ee 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -60,8 +60,8 @@ ibm_minio: ibm_odh: openshift_namespace: "openshift-operators" - pipeline_channel: "latest" - pipeline_catalog_source: "redhat-operators" + odh_pipeline_channel: "latest" + odh_pipeline_installplan: "Automatic" service_mesh_namespace: "openshift-serverless" service_mesh_channel: "stable" service_mesh_catalog_source: "redhat-operators" From 3cb27eff977377883b1bd37ff98ecdd45de65fff Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 12:04:49 +0530 Subject: [PATCH 087/491] 02 serverless --- .../01-odh-pipeline-operator-subcription.yaml | 2 + .../02-odh-serverless-subscription.yaml | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 64080cbb3..7456d007f 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -5,6 +5,8 @@ kind: Subscription metadata: name: openshift-pipelines-operator namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "116" spec: channel: {{ .Values.odh_pipeline_channel }} installPlanApproval: {{ .Values.odh_pipeline_installplan }} diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml new file mode 100644 index 000000000..3119d7ea6 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -0,0 +1,37 @@ +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "117" + +# --- + +# apiVersion: operators.coreos.com/v1 +# kind: OperatorGroup +# metadata: +# name: operatorgroup +# namespace: openshift-serverless +# annotations: +# argocd.argoproj.io/sync-wave: "117" +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: serverless-operator + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "118" +spec: + channel: stable + installPlanApproval: Automatic + name: serverless-operator + source: redhat-operators + sourceNamespace: openshift-marketplace + + + + + From 4cfd72cbc68e15a026074a83f256c966cfffc5af Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 12:14:07 +0530 Subject: [PATCH 088/491] operator group added --- .../02-odh-serverless-subscription.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index 3119d7ea6..e5eb4a00e 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -7,15 +7,15 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "117" -# --- - -# apiVersion: operators.coreos.com/v1 -# kind: OperatorGroup -# metadata: -# name: operatorgroup -# namespace: openshift-serverless -# annotations: -# argocd.argoproj.io/sync-wave: "117" +--- + +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: operatorgroup + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "117" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription From cabc559c3192993855cb13fdfdc72ad603dc7f3d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 12:21:24 +0530 Subject: [PATCH 089/491] service mesh update --- .../03-odh-servicemesh-operator-sa.yaml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml new file mode 100644 index 000000000..314b7d056 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -0,0 +1,53 @@ +# --- +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: servicemeshoperator +# namespace: "{{ .Values.service_mesh_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "119" +# labels: +# app.kubernetes.io/name: Servicemesh +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# channel: stable +# name: servicemeshoperator +# source: redhat-operators +# sourceNamespace: openshift-marketplace +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-servicemesh-operator + namespace: {{ .Values.service_mesh_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "119" +spec: + targetNamespaces: + - {{ .Values.service_mesh_namespace }} + + +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: servicemeshoperator + namespace: {{ .Values.service_mesh_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "119" +spec: + channel: stable + name: servicemeshoperator + source: {{ .Values.service_mesh_catalog_source }} + sourceNamespace: {{ .Values.service_mesh_sourceNamespace }} + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: istio-operator + namespace: "{{ .Values.service_mesh_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "120" \ No newline at end of file From c721f6cd276a860f9010df4e6ea7d8f5453e3c04 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 13:29:28 +0530 Subject: [PATCH 090/491] fix 03 service mesh --- .../03-odh-servicemesh-operator-sa.yaml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 314b7d056..7a93bf70f 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -20,13 +20,13 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-servicemesh-operator - namespace: {{ .Values.service_mesh_namespace }} + name: servicemesh-operator-group + namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "119" spec: targetNamespaces: - - {{ .Values.service_mesh_namespace }} + - openshift-operators --- @@ -34,20 +34,20 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: servicemeshoperator - namespace: {{ .Values.service_mesh_namespace }} + namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "119" spec: channel: stable name: servicemeshoperator - source: {{ .Values.service_mesh_catalog_source }} - sourceNamespace: {{ .Values.service_mesh_sourceNamespace }} + source: redhat-operators + sourceNamespace: openshift-marketplace ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: istio-operator - namespace: "{{ .Values.service_mesh_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "120" \ No newline at end of file +# --- +# apiVersion: v1 +# kind: ServiceAccount +# metadata: +# name: istio-operator +# namespace: "{{ .Values.service_mesh_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "120" \ No newline at end of file From cf065dcc9e3d006f63ea763c0fb04f8ee584d8d9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 14:41:41 +0530 Subject: [PATCH 091/491] 03 commented --- .../03-odh-servicemesh-operator-sa.yaml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 7a93bf70f..0f0aea949 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -16,32 +16,32 @@ # name: servicemeshoperator # source: redhat-operators # sourceNamespace: openshift-marketplace ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: servicemesh-operator-group - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "119" -spec: - targetNamespaces: - - openshift-operators +# --- +# apiVersion: operators.coreos.com/v1 +# kind: OperatorGroup +# metadata: +# name: servicemesh-operator-group +# namespace: openshift-operators +# annotations: +# argocd.argoproj.io/sync-wave: "119" +# spec: +# targetNamespaces: +# - openshift-operators ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: servicemeshoperator - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "119" -spec: - channel: stable - name: servicemeshoperator - source: redhat-operators - sourceNamespace: openshift-marketplace +# --- +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: servicemeshoperator +# namespace: openshift-operators +# annotations: +# argocd.argoproj.io/sync-wave: "119" +# spec: +# channel: stable +# name: servicemeshoperator +# source: redhat-operators +# sourceNamespace: openshift-marketplace # --- # apiVersion: v1 From 08cdb66ea500f9a99910305acf12975fa3d794d7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 17:37:56 +0530 Subject: [PATCH 092/491] odh comment --- .../01-odh-pipeline-operator-subcription.yaml | 28 ++++---- .../02-odh-serverless-subscription.yaml | 64 +++++++++---------- .../03-odh-servicemesh-operator-sa.yaml | 5 +- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 7456d007f..102e0034e 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,16 +1,16 @@ ---- +# --- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: openshift-pipelines-operator - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "116" -spec: - channel: {{ .Values.odh_pipeline_channel }} - installPlanApproval: {{ .Values.odh_pipeline_installplan }} - name: openshift-pipelines-operator-rh - source: redhat-operators - sourceNamespace: openshift-marketplace +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: openshift-pipelines-operator +# namespace: openshift-operators +# annotations: +# argocd.argoproj.io/sync-wave: "116" +# spec: +# channel: {{ .Values.odh_pipeline_channel }} +# installPlanApproval: {{ .Values.odh_pipeline_installplan }} +# name: openshift-pipelines-operator-rh +# source: redhat-operators +# sourceNamespace: openshift-marketplace diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index e5eb4a00e..871ec195e 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -1,35 +1,35 @@ ---- - -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-serverless - annotations: - argocd.argoproj.io/sync-wave: "117" - ---- - -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: operatorgroup - namespace: openshift-serverless - annotations: - argocd.argoproj.io/sync-wave: "117" ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: serverless-operator - namespace: openshift-serverless - annotations: - argocd.argoproj.io/sync-wave: "118" -spec: - channel: stable - installPlanApproval: Automatic - name: serverless-operator - source: redhat-operators - sourceNamespace: openshift-marketplace +# --- + +# apiVersion: v1 +# kind: Namespace +# metadata: +# name: openshift-serverless +# annotations: +# argocd.argoproj.io/sync-wave: "117" + +# --- + +# apiVersion: operators.coreos.com/v1 +# kind: OperatorGroup +# metadata: +# name: operatorgroup +# namespace: openshift-serverless +# annotations: +# argocd.argoproj.io/sync-wave: "117" +# --- +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: serverless-operator +# namespace: openshift-serverless +# annotations: +# argocd.argoproj.io/sync-wave: "118" +# spec: +# channel: stable +# installPlanApproval: Automatic +# name: serverless-operator +# source: redhat-operators +# sourceNamespace: openshift-marketplace diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 0f0aea949..24855003b 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -16,7 +16,8 @@ # name: servicemeshoperator # source: redhat-operators # sourceNamespace: openshift-marketplace -# --- +# --- +################### # apiVersion: operators.coreos.com/v1 # kind: OperatorGroup # metadata: @@ -42,7 +43,7 @@ # name: servicemeshoperator # source: redhat-operators # sourceNamespace: openshift-marketplace - +################### # --- # apiVersion: v1 # kind: ServiceAccount From 48b2fa365443cb8b6299d79ac7d109b43ea86df0 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 17:50:37 +0530 Subject: [PATCH 093/491] odh kmodel commented --- .../templates/099-instance-appset.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 58c3edcc8..88b287643 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -34,16 +34,16 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + # - git: + # repoURL: "{{ .Values.generator.repo_url }}" + # revision: "{{ .Values.generator.revision }}" + # files: + # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + # - git: + # repoURL: "{{ .Values.generator.repo_url }}" + # revision: "{{ .Values.generator.revision }}" + # files: + # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From d524645d38cf7ac806e2c5a75e39959800c20b39 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 18:21:52 +0530 Subject: [PATCH 094/491] enable odh --- .../01-odh-pipeline-operator-subcription.yaml | 28 ++++---- .../02-odh-serverless-subscription.yaml | 64 +++++++++---------- .../templates/099-instance-appset.yaml | 10 +-- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 102e0034e..7456d007f 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -1,16 +1,16 @@ -# --- +--- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: openshift-pipelines-operator -# namespace: openshift-operators -# annotations: -# argocd.argoproj.io/sync-wave: "116" -# spec: -# channel: {{ .Values.odh_pipeline_channel }} -# installPlanApproval: {{ .Values.odh_pipeline_installplan }} -# name: openshift-pipelines-operator-rh -# source: redhat-operators -# sourceNamespace: openshift-marketplace +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: openshift-pipelines-operator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "116" +spec: + channel: {{ .Values.odh_pipeline_channel }} + installPlanApproval: {{ .Values.odh_pipeline_installplan }} + name: openshift-pipelines-operator-rh + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index 871ec195e..e5eb4a00e 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -1,35 +1,35 @@ -# --- - -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: openshift-serverless -# annotations: -# argocd.argoproj.io/sync-wave: "117" - -# --- - -# apiVersion: operators.coreos.com/v1 -# kind: OperatorGroup -# metadata: -# name: operatorgroup -# namespace: openshift-serverless -# annotations: -# argocd.argoproj.io/sync-wave: "117" -# --- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: serverless-operator -# namespace: openshift-serverless -# annotations: -# argocd.argoproj.io/sync-wave: "118" -# spec: -# channel: stable -# installPlanApproval: Automatic -# name: serverless-operator -# source: redhat-operators -# sourceNamespace: openshift-marketplace +--- + +apiVersion: v1 +kind: Namespace +metadata: + name: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "117" + +--- + +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: operatorgroup + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "117" +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: serverless-operator + namespace: openshift-serverless + annotations: + argocd.argoproj.io/sync-wave: "118" +spec: + channel: stable + installPlanApproval: Automatic + name: serverless-operator + source: redhat-operators + sourceNamespace: openshift-marketplace diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 88b287643..3c1954d04 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -34,11 +34,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" - # - git: - # repoURL: "{{ .Values.generator.repo_url }}" - # revision: "{{ .Values.generator.revision }}" - # files: - # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" # - git: # repoURL: "{{ .Values.generator.repo_url }}" # revision: "{{ .Values.generator.revision }}" From 285298fcc93d04c9e38306cb69646b37f9659c7d Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 18:27:44 +0530 Subject: [PATCH 095/491] odh servicemesh --- .../03-odh-servicemesh-operator-sa.yaml | 77 ++++++------------- 1 file changed, 24 insertions(+), 53 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 24855003b..f6da32a52 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -1,54 +1,25 @@ -# --- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: servicemeshoperator -# namespace: "{{ .Values.service_mesh_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "119" -# labels: -# app.kubernetes.io/name: Servicemesh -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# channel: stable -# name: servicemeshoperator -# source: redhat-operators -# sourceNamespace: openshift-marketplace -# --- -################### -# apiVersion: operators.coreos.com/v1 -# kind: OperatorGroup -# metadata: -# name: servicemesh-operator-group -# namespace: openshift-operators -# annotations: -# argocd.argoproj.io/sync-wave: "119" -# spec: -# targetNamespaces: -# - openshift-operators +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: servicemesh-operator-group + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "119" +spec: + targetNamespaces: + - openshift-operators - -# --- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: servicemeshoperator -# namespace: openshift-operators -# annotations: -# argocd.argoproj.io/sync-wave: "119" -# spec: -# channel: stable -# name: servicemeshoperator -# source: redhat-operators -# sourceNamespace: openshift-marketplace -################### -# --- -# apiVersion: v1 -# kind: ServiceAccount -# metadata: -# name: istio-operator -# namespace: "{{ .Values.service_mesh_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "120" \ No newline at end of file +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: servicemeshoperator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "119" +spec: + channel: stable + name: servicemeshoperator + source: redhat-operators + sourceNamespace: openshift-marketplace \ No newline at end of file From 4b6750c62f766315d07f42b0da8cb3734dd53561 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 4 Apr 2025 18:38:23 +0530 Subject: [PATCH 096/491] 03 servivemesh update --- .../03-odh-servicemesh-operator-sa.yaml | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index f6da32a52..593807c49 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -1,15 +1,3 @@ ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: servicemesh-operator-group - namespace: openshift-operators - annotations: - argocd.argoproj.io/sync-wave: "119" -spec: - targetNamespaces: - - openshift-operators - --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription @@ -17,9 +5,30 @@ metadata: name: servicemeshoperator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "119" + argocd.argoproj.io/sync-wave: "118" spec: channel: stable name: servicemeshoperator source: redhat-operators - sourceNamespace: openshift-marketplace \ No newline at end of file + sourceNamespace: openshift-marketplace + +# --- +# apiVersion: operators.coreos.com/v1 +# kind: OperatorGroup +# metadata: +# name: servicemesh-operator-group +# namespace: openshift-operators +# annotations: +# argocd.argoproj.io/sync-wave: "119" +# spec: +# targetNamespaces: +# - openshift-operators +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: istio-operator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "119" + From 8c6d34092a39040bf31ab3d9dc03d8050f227f16 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 18:48:38 +0530 Subject: [PATCH 097/491] 04-authorino --- .../templates/04-odh-authorino-operator.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml new file mode 100644 index 000000000..311b13522 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: authorino-operator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "121" +spec: + channel: stable + name: authorino-operator + source: operatorhubio-catalog + sourceNamespace: olm \ No newline at end of file From 22aa8d474339f9fbf088ae6d69fb50a65711e0cf Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 18:51:41 +0530 Subject: [PATCH 098/491] 04-authorino --- .../112-ibm-odh/templates/04-odh-authorino-operator.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml index 311b13522..49c2e8280 100644 --- a/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml +++ b/instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml @@ -9,5 +9,5 @@ metadata: spec: channel: stable name: authorino-operator - source: operatorhubio-catalog - sourceNamespace: olm \ No newline at end of file + source: community-operators + sourceNamespace: openshift-marketplace \ No newline at end of file From 80cadba7912dcc1288cdad9a86b736963529b117 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 18:56:52 +0530 Subject: [PATCH 099/491] 04-authorino --- .../templates/05-odh-operator-subcription.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml new file mode 100644 index 000000000..750d8be63 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: opendatahub-operator + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "126" +spec: + channel: fast + installPlanApproval: Manual + name: opendatahub-operator + source: community-operators + sourceNamespace: openshift-marketplace + startingCSV: "opendatahub-operator.v2.11.1" \ No newline at end of file From ec49f2a773e99ce160e46679456595a147073c60 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 19:00:00 +0530 Subject: [PATCH 100/491] 05-operator-job --- .../templates/05-odh-operator-job.yaml | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml new file mode 100644 index 000000000..6519b2840 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -0,0 +1,96 @@ + +{{ $ns := "openshift-operators"}} +{{ $role_name := "odh-installplan-ra" }} +{{ $sa_name := "odh-installplan-sa" }} +{{ $rb_name := "odh-installplan-rb" }} + +--- +kind: ServiceAccount +apiVersion: v1 +metadata: + name: {{ $sa_name }} + namespace: {{ $ns }} + annotations: + argocd.argoproj.io/sync-wave: "122" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} + +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ $role_name }} + annotations: + argocd.argoproj.io/sync-wave: "123" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +rules: + - verbs: + - patch + resources: + - installplan + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "124" + namespace: "{{ $ns }}" + name: "odh-installplan" + labels: + app: "odh-installplan" +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: "odh-installplan" +subjects: + - apiGroup: "" + kind: ServiceAccount + name: "odh-installplan" + namespace: {{ $ns }} + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: installplan-patch + namespace: {{ .Values.namespace }} + annotations: + argocd.argoproj.io/sync-wave: "125" +spec: + template: + spec: + serviceAccountName: {{ .Values.serviceAccountName }} + containers: + - name: Installplan-job + image: quay.io/ibmmas/cli:latest + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + command: + - /bin/sh + - -c + - | + clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("{{ .Values.odhOperatorVersion }}")) | .metadata.name') + if [ -n "$clusterServiceVersionNames" ]; then + oc patch installplan $clusterServiceVersionNames -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' + echo "InstallPlan $clusterServiceVersionNames approved successfully." + else + echo "No InstallPlan found for {{ .Values.odhOperatorVersion }}." + exit 1 + fi + restartPolicy: OnFailure From 675974590b7120888718f08380bece661fdc418f Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 19:05:57 +0530 Subject: [PATCH 101/491] 05-operator-job sync --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 8 ++++---- .../templates/05-odh-operator-subcription.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 6519b2840..696f4008f 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -11,7 +11,7 @@ metadata: name: {{ $sa_name }} namespace: {{ $ns }} annotations: - argocd.argoproj.io/sync-wave: "122" + argocd.argoproj.io/sync-wave: "123" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} @@ -23,7 +23,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ $role_name }} annotations: - argocd.argoproj.io/sync-wave: "123" + argocd.argoproj.io/sync-wave: "124" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} @@ -40,7 +40,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - argocd.argoproj.io/sync-wave: "124" + argocd.argoproj.io/sync-wave: "125" namespace: "{{ $ns }}" name: "odh-installplan" labels: @@ -65,7 +65,7 @@ metadata: name: installplan-patch namespace: {{ .Values.namespace }} annotations: - argocd.argoproj.io/sync-wave: "125" + argocd.argoproj.io/sync-wave: "126" spec: template: spec: diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 750d8be63..02e355d37 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "126" + argocd.argoproj.io/sync-wave: "122" spec: channel: fast installPlanApproval: Manual From f048a98bd18ab67c91ed31fc0f3cd281636260db Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 4 Apr 2025 19:13:03 +0530 Subject: [PATCH 102/491] 05-operator-job only job --- .../templates/05-odh-operator-job.yaml | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 696f4008f..25185e24c 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,62 +1,62 @@ -{{ $ns := "openshift-operators"}} -{{ $role_name := "odh-installplan-ra" }} -{{ $sa_name := "odh-installplan-sa" }} -{{ $rb_name := "odh-installplan-rb" }} +# {{ $ns := "openshift-operators"}} +# {{ $role_name := "odh-installplan-ra" }} +# {{ $sa_name := "odh-installplan-sa" }} +# {{ $rb_name := "odh-installplan-rb" }} ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - name: {{ $sa_name }} - namespace: {{ $ns }} - annotations: - argocd.argoproj.io/sync-wave: "123" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} +# --- +# kind: ServiceAccount +# apiVersion: v1 +# metadata: +# name: {{ $sa_name }} +# namespace: {{ $ns }} +# annotations: +# argocd.argoproj.io/sync-wave: "123" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ $role_name }} - annotations: - argocd.argoproj.io/sync-wave: "124" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -rules: - - verbs: - - patch - resources: - - installplan +# --- +# kind: Role +# apiVersion: rbac.authorization.k8s.io/v1 +# metadata: +# name: {{ $role_name }} +# annotations: +# argocd.argoproj.io/sync-wave: "124" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# rules: +# - verbs: +# - patch +# resources: +# - installplan ---- +# --- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - annotations: - argocd.argoproj.io/sync-wave: "125" - namespace: "{{ $ns }}" - name: "odh-installplan" - labels: - app: "odh-installplan" -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: "odh-installplan" -subjects: - - apiGroup: "" - kind: ServiceAccount - name: "odh-installplan" - namespace: {{ $ns }} +# apiVersion: rbac.authorization.k8s.io/v1 +# kind: RoleBinding +# metadata: +# annotations: +# argocd.argoproj.io/sync-wave: "125" +# namespace: "{{ $ns }}" +# name: "odh-installplan" +# labels: +# app: "odh-installplan" +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# roleRef: +# apiGroup: rbac.authorization.k8s.io +# kind: Role +# name: "odh-installplan" +# subjects: +# - apiGroup: "" +# kind: ServiceAccount +# name: "odh-installplan" +# namespace: {{ $ns }} --- apiVersion: batch/v1 From 4609fc2a72bd42cacd7154adc01d44e7f40b621c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 11:06:05 +0530 Subject: [PATCH 103/491] odh job file update --- .../templates/05-odh-operator-job.yaml | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 25185e24c..ac62ff75e 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -58,18 +58,56 @@ # name: "odh-installplan" # namespace: {{ $ns }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: installplan-approver + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "125" +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: installplan-approver + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "125" +rules: + - apiGroups: ["operators.coreos.com"] + resources: ["installplans"] + verbs: ["get", "list", "patch"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: installplan-approver + namespace: openshift-operators + annotations: + argocd.argoproj.io/sync-wave: "125" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: installplan-approver +subjects: + - kind: ServiceAccount + name: installplan-approver + namespace: openshift-operators --- apiVersion: batch/v1 kind: Job metadata: name: installplan-patch - namespace: {{ .Values.namespace }} + namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "126" + "helm.sh/hook": post-install + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded spec: template: spec: - serviceAccountName: {{ .Values.serviceAccountName }} + serviceAccountName: installplan-approver containers: - name: Installplan-job image: quay.io/ibmmas/cli:latest @@ -85,7 +123,7 @@ spec: - /bin/sh - -c - | - clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("{{ .Values.odhOperatorVersion }}")) | .metadata.name') + clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') if [ -n "$clusterServiceVersionNames" ]; then oc patch installplan $clusterServiceVersionNames -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' echo "InstallPlan $clusterServiceVersionNames approved successfully." @@ -94,3 +132,4 @@ spec: exit 1 fi restartPolicy: OnFailure + From 087b779cdbf270cd9baf4714b503d8ed285fcff7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 11:18:16 +0530 Subject: [PATCH 104/491] odh job --- .../templates/05-odh-operator-job.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index ac62ff75e..9deabd671 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -123,13 +123,12 @@ spec: - /bin/sh - -c - | - clusterServiceVersionNames=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') - if [ -n "$clusterServiceVersionNames" ]; then - oc patch installplan $clusterServiceVersionNames -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' - echo "InstallPlan $clusterServiceVersionNames approved successfully." - else - echo "No InstallPlan found for {{ .Values.odhOperatorVersion }}." - exit 1 - fi - restartPolicy: OnFailure - + for i in $(seq 1 20); do + IP=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') + if [ "$IP" ]; then + oc patch installplan $IP -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' + break + fi + sleep 5 + done + restartPolicy: OnFailure \ No newline at end of file From 40f52fe4a5b7dd59fcc6a9c514a03d026bc54b35 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 11:26:47 +0530 Subject: [PATCH 105/491] sync update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 9deabd671..1570e5d62 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -65,7 +65,7 @@ metadata: name: installplan-approver namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "125" + argocd.argoproj.io/sync-wave: "123" --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -73,7 +73,7 @@ metadata: name: installplan-approver namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "125" + argocd.argoproj.io/sync-wave: "124" rules: - apiGroups: ["operators.coreos.com"] resources: ["installplans"] From a1db86a305b2ef709a18ddb6db6b932724ec2c44 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 11:29:24 +0530 Subject: [PATCH 106/491] sync job odh --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 1570e5d62..fcd9fe6ea 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -124,9 +124,9 @@ spec: - -c - | for i in $(seq 1 20); do - IP=$(oc get installplan -n {{ .Values.namespace | default "openshift-operators" }} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') + IP=$(oc get installplan -n "openshift-operators" -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') if [ "$IP" ]; then - oc patch installplan $IP -n {{ .Values.namespace | default "openshift-operators" }} --type merge --patch '{"spec":{"approved":true}}' + oc patch installplan $IP -n "openshift-operators" --type merge --patch '{"spec":{"approved":true}}' break fi sleep 5 From 4569217c064a80348205716cf7ac13032eecc33e Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 12:11:22 +0530 Subject: [PATCH 107/491] created namespace 06 file added --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml new file mode 100644 index 000000000..7c47263fc --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + argocd.argoproj.io/sync-wave: "122" \ No newline at end of file From 5f5822d3f143f1570265e8f5874b791ba2e4eba0 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 12:17:35 +0530 Subject: [PATCH 108/491] Revert "created namespace" This reverts commit 4569217c064a80348205716cf7ac13032eecc33e. --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml deleted file mode 100644 index 7c47263fc..000000000 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "122" \ No newline at end of file From 103ed3b4454c71d8f09b9e78c7d985be67f2b6be Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 12:21:24 +0530 Subject: [PATCH 109/491] Create 06-odh-namespace.yaml --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml new file mode 100644 index 000000000..daf664b3e --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "122" \ No newline at end of file From 311e712b94775a6968239c73dd49207d52a9fa3c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 12:25:48 +0530 Subject: [PATCH 110/491] Update 06-odh-namespace.yaml --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index daf664b3e..ec85b61e3 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -4,4 +4,4 @@ kind: Namespace metadata: name: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "122" \ No newline at end of file + argocd.argoproj.io/sync-wave: "127" \ No newline at end of file From 59b41eaed454627fdfba230ecf654631e36a28ee Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 13:39:21 +0530 Subject: [PATCH 111/491] Update 05-odh-operator-job.yaml --- .../templates/05-odh-operator-job.yaml | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index fcd9fe6ea..c1961f70e 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,63 +1,3 @@ - -# {{ $ns := "openshift-operators"}} -# {{ $role_name := "odh-installplan-ra" }} -# {{ $sa_name := "odh-installplan-sa" }} -# {{ $rb_name := "odh-installplan-rb" }} - -# --- -# kind: ServiceAccount -# apiVersion: v1 -# metadata: -# name: {{ $sa_name }} -# namespace: {{ $ns }} -# annotations: -# argocd.argoproj.io/sync-wave: "123" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} - -# --- -# kind: Role -# apiVersion: rbac.authorization.k8s.io/v1 -# metadata: -# name: {{ $role_name }} -# annotations: -# argocd.argoproj.io/sync-wave: "124" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# rules: -# - verbs: -# - patch -# resources: -# - installplan - -# --- - -# apiVersion: rbac.authorization.k8s.io/v1 -# kind: RoleBinding -# metadata: -# annotations: -# argocd.argoproj.io/sync-wave: "125" -# namespace: "{{ $ns }}" -# name: "odh-installplan" -# labels: -# app: "odh-installplan" -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# roleRef: -# apiGroup: rbac.authorization.k8s.io -# kind: Role -# name: "odh-installplan" -# subjects: -# - apiGroup: "" -# kind: ServiceAccount -# name: "odh-installplan" -# namespace: {{ $ns }} - --- apiVersion: v1 kind: ServiceAccount @@ -124,7 +64,7 @@ spec: - -c - | for i in $(seq 1 20); do - IP=$(oc get installplan -n "openshift-operators" -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] | contains("opendatahub-operator.v2.11.1")) | .metadata.name') + IP=$(oc get installplan -n openshift-operators -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == "opendatahub-operator.v2.11.1") | .metadata.name') if [ "$IP" ]; then oc patch installplan $IP -n "openshift-operators" --type merge --patch '{"spec":{"approved":true}}' break From e252ddbf5ec58f2f3132963f27b7220c11f35fb1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 13:59:53 +0530 Subject: [PATCH 112/491] Delete 06-odh-namespace.yaml --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml deleted file mode 100644 index ec85b61e3..000000000 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "127" \ No newline at end of file From 50a44e014319bcb599c82ad7eb7873224af656af Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 14:15:12 +0530 Subject: [PATCH 113/491] sync update --- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 02e355d37..b880fcfd5 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "122" + argocd.argoproj.io/sync-wave: "127" spec: channel: fast installPlanApproval: Manual From 7863d1dbfae7bea317d7a32545bba0be9e54d44a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 14:36:13 +0530 Subject: [PATCH 114/491] update target namespace --- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index b880fcfd5..cbca2e5da 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -12,4 +12,5 @@ spec: name: opendatahub-operator source: community-operators sourceNamespace: openshift-marketplace + targetNamespaces: openshift-operators startingCSV: "opendatahub-operator.v2.11.1" \ No newline at end of file From 4eb2860489a0962e6430bcfc1818cf42fb9ed3cf Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 14:55:35 +0530 Subject: [PATCH 115/491] update hook --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index c1961f70e..d68ce786e 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -42,8 +42,6 @@ metadata: namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "126" - "helm.sh/hook": post-install - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded spec: template: spec: From 097d67df091c8ca592020ed1f2bed87cae698ab4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 15:09:18 +0530 Subject: [PATCH 116/491] update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index d68ce786e..b9fb7d558 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -47,7 +47,7 @@ spec: spec: serviceAccountName: installplan-approver containers: - - name: Installplan-job + - name: installplanjob image: quay.io/ibmmas/cli:latest imagePullPolicy: IfNotPresent resources: diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index cbca2e5da..14b45bb53 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -5,7 +5,7 @@ metadata: name: opendatahub-operator namespace: openshift-operators annotations: - argocd.argoproj.io/sync-wave: "127" + argocd.argoproj.io/sync-wave: "126" spec: channel: fast installPlanApproval: Manual From 5bd9ad2f7b3536804d4b54874b1970be23bdf122 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 15:14:30 +0530 Subject: [PATCH 117/491] update job --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index b9fb7d558..693d3159c 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -38,7 +38,7 @@ subjects: apiVersion: batch/v1 kind: Job metadata: - name: installplan-patch + name: installplanpatch namespace: openshift-operators annotations: argocd.argoproj.io/sync-wave: "126" From 499de7781961fcb89335366ef11f42f0d34a523d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 16:41:14 +0530 Subject: [PATCH 118/491] 06 namespace --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml new file mode 100644 index 000000000..25b61c146 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "128" \ No newline at end of file From ed6aa2c7ca13c6f00b75bd3349787cf914638dec Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 16:58:12 +0530 Subject: [PATCH 119/491] Create 07-odh-external-secret-db.yaml --- .../templates/07-odh-external-secret-db.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml new file mode 100644 index 000000000..8aef1f22c --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + namespace: "{{ .Values.aibroker_namespace }}" + argocd.argoproj.io/sync-wave: "129" +type: Opaque +stringData: + password: "{{ .Values.mas_aibroker_db_secret_value }}" +# data: +# password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} \ No newline at end of file From 2d2ab323d325957e2582bb2c331abfdfc9c8587a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:01:58 +0530 Subject: [PATCH 120/491] Update 07-odh-external-secret-db.yaml --- .../112-ibm-odh/templates/07-odh-external-secret-db.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml index 8aef1f22c..3dbb91196 100644 --- a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -4,7 +4,8 @@ kind: Secret metadata: name: "{{ .Values.mas_aibroker_db_secret_name }}" namespace: "{{ .Values.aibroker_namespace }}" - argocd.argoproj.io/sync-wave: "129" + annotations: + argocd.argoproj.io/sync-wave: "129" type: Opaque stringData: password: "{{ .Values.mas_aibroker_db_secret_value }}" From d75f0d7c85b0be8846ed8bcc2dba7bf6227870e3 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:07:32 +0530 Subject: [PATCH 121/491] created opendatahub namespace and added 08 file --- .../templates/06-odh-namespace.yaml | 8 +++++ .../templates/08-odh-dsc-init.yaml | 33 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index 25b61c146..6e423862c 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -3,5 +3,13 @@ apiVersion: v1 kind: Namespace metadata: name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "128" + +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "opendatahub" annotations: argocd.argoproj.io/sync-wave: "128" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml new file mode 100644 index 000000000..6d4a80664 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml @@ -0,0 +1,33 @@ +--- +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + annotations: + argocd.argoproj.io/sync-wave: "130" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + finalizers: + - dscinitialization.opendatahub.io/finalizer + labels: + app.kubernetes.io/created-by: opendatahub-operator + app.kubernetes.io/instance: default + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: dscinitialization + app.kubernetes.io/part-of: opendatahub-operator + name: default-dsci +spec: + applicationsNamespace: opendatahub + monitoring: + managementState: Managed + namespace: opendatahub + serviceMesh: + auth: + audiences: + - 'https://kubernetes.default.svc' + controlPlane: + metricsCollection: Istio + name: data-science-smcp + namespace: istio-system + managementState: Managed + trustedCABundle: + customCABundle: '' + managementState: Managed \ No newline at end of file From a356d2812e4c649701b0c1bcf16313c842020be7 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:12:23 +0530 Subject: [PATCH 122/491] Create 09-odh-data-science-cluster.yaml --- .../09-odh-data-science-cluster.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml diff --git a/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml new file mode 100644 index 000000000..f78f04c59 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/09-odh-data-science-cluster.yaml @@ -0,0 +1,26 @@ +--- +kind: DataScienceCluster +apiVersion: datasciencecluster.opendatahub.io/v1 +metadata: + annotations: + argocd.argoproj.io/sync-wave: "131" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + labels: + app.kubernetes.io/created-by: opendatahub-operator + app.kubernetes.io/instance: default + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: datasciencecluster + app.kubernetes.io/part-of: opendatahub-operator + name: default-dsc +spec: + components: + datasciencepipelines: + managementState: Managed + kserve: + managementState: Managed + serving: + ingressGateway: + certificate: + type: SelfSigned + managementState: Managed + name: knative-serving \ No newline at end of file From 332c8064bd6f1992c7eaac92bcb42e1688a0f43a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:17:16 +0530 Subject: [PATCH 123/491] DataSciencePipelinesApplication added --- .../templates/10-odh-dspa-aws.yaml | 53 ++++++++++++++++++ .../templates/10-odh-dspa-local.yaml | 21 +++++++ .../templates/10-odh-dspa-minio.yaml | 56 +++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml new file mode 100644 index 000000000..b33c0152a --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml @@ -0,0 +1,53 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "aws" }} +apiVersion: v1 +kind: Secret +metadata: + name: ds-pipeline-s3-instance + namespace: "{{ .Values.aibroker_namespace }}" + labels: + opendatahub.io/dashboard: 'false' + opendatahub.io/managed: 'true' + annotations: + opendatahub.io/connection-type: s3 + openshift.io/display-name: AWS S3 Connection + argocd.argoproj.io/sync-wave: "132" +stringData: + accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" + host: "{{ .Values.mas_aibroker_storage_host }}" + region: "{{ .Values.mas_aibroker_storage_region }}" + ssl: "{{ .Values.mas_aibroker_storage_ssl }}" +--- +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + dspVersion: v1 + database: + disableHealthCheck: true + customExtraParams: '{"tls":"false"}' + externalDB: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + username: "{{ .Values.mas_aibroker_db_user }}" + pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" + passwordSecret: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + key: password + objectStorage: + disableHealthCheck: true + externalStorage: + host: "{{ .Values.mas_aibroker_storage_host }}" + bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + s3CredentialsSecret: + accessKey: accesskey + secretKey: secretkey + secretName: ds-pipeline-s3-instance + scheme: https +{{- end }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml new file mode 100644 index 000000000..f9745e5f4 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml @@ -0,0 +1,21 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "local" }} +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + database: + disableHealthCheck: true + objectStorage: + disableHealthCheck: true + minio: + deploy: true + image: 'quay.io/minio/minio' + pvcSize: 40Gi + storageClassName: {{ .Values.primary_storage_class }} +{{- end }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml new file mode 100644 index 000000000..a739ede36 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -0,0 +1,56 @@ +{{- if eq .Values.mas_aibroker_storage_provider "minio" }} +apiVersion: v1 +kind: Secret +metadata: + name: ds-pipeline-s3-instance + namespace: "{{ .Values.aibroker_namespace }}" + labels: + opendatahub.io/dashboard: "false" + opendatahub.io/managed: "true" + annotations: + argocd.argoproj.io/sync-wave: "132" + opendatahub.io/connection-type: s3 + openshift.io/display-name: Minio Data Connection +stringData: + accesskey: {{ .Values.mas_aibroker_storage_accesskey }} + secretkey: {{ .Values.mas_aibroker_storage_secretkey }} + host: {{ .Values.mas_aibroker_storage_host }} + port: {{ .Values.mas_aibroker_storage_port }} + ssl: {{ .Values.mas_aibroker_storage_ssl }} +--- +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "135" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + dspVersion: v1 + database: + disableHealthCheck: true + customExtraParams: '{"tls":"false"}' + externalDB: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + username: "{{ .Values.mas_aibroker_db_user }}" + pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" + passwordSecret: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + key: password + + objectStorage: + disableHealthCheck: true + externalStorage: + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + storageClassName: "{{ .Values.primary_storage_class }}" + s3CredentialsSecret: + accessKey: accesskey + secretKey: secretkey + secretName: ds-pipeline-s3-instance + scheme: http + +{{- end }} \ No newline at end of file From 8ae2a9fdb7a11da021742e8049e29312cc2c951a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:24:15 +0530 Subject: [PATCH 124/491] string values upadated --- .../112-ibm-odh/templates/10-odh-dspa-local.yaml | 2 +- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml index f9745e5f4..86193c624 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml @@ -17,5 +17,5 @@ spec: deploy: true image: 'quay.io/minio/minio' pvcSize: 40Gi - storageClassName: {{ .Values.primary_storage_class }} + storageClassName: "{{ .Values.primary_storage_class }}" {{- end }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index a739ede36..3c5d381a9 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: ds-pipeline-s3-instance + name: namespace: "{{ .Values.aibroker_namespace }}" labels: opendatahub.io/dashboard: "false" @@ -12,11 +12,11 @@ metadata: opendatahub.io/connection-type: s3 openshift.io/display-name: Minio Data Connection stringData: - accesskey: {{ .Values.mas_aibroker_storage_accesskey }} - secretkey: {{ .Values.mas_aibroker_storage_secretkey }} - host: {{ .Values.mas_aibroker_storage_host }} - port: {{ .Values.mas_aibroker_storage_port }} - ssl: {{ .Values.mas_aibroker_storage_ssl }} + accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + ssl: "{{ .Values.mas_aibroker_storage_ssl }}" --- apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 kind: DataSciencePipelinesApplication From 64f2e288b3fa88cd26d89d8a5c8620dff4b648c2 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:28:34 +0530 Subject: [PATCH 125/491] Update 10-odh-dspa-minio.yaml --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 3c5d381a9..04025010c 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: + name: ds-pipeline-s3-instance namespace: "{{ .Values.aibroker_namespace }}" labels: opendatahub.io/dashboard: "false" From ac1dcef416eef4ac7f6c272a2a72428d3ba7f352 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 17:36:22 +0530 Subject: [PATCH 126/491] removed files --- .../templates/10-odh-dspa-aws.yaml | 53 ------------------- .../templates/10-odh-dspa-local.yaml | 21 -------- 2 files changed, 74 deletions(-) delete mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml delete mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml deleted file mode 100644 index b33c0152a..000000000 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -{{- if eq .Values.mas_aibroker_storage_provider "aws" }} -apiVersion: v1 -kind: Secret -metadata: - name: ds-pipeline-s3-instance - namespace: "{{ .Values.aibroker_namespace }}" - labels: - opendatahub.io/dashboard: 'false' - opendatahub.io/managed: 'true' - annotations: - opendatahub.io/connection-type: s3 - openshift.io/display-name: AWS S3 Connection - argocd.argoproj.io/sync-wave: "132" -stringData: - accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" - secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" - host: "{{ .Values.mas_aibroker_storage_host }}" - region: "{{ .Values.mas_aibroker_storage_region }}" - ssl: "{{ .Values.mas_aibroker_storage_ssl }}" ---- -apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 -kind: DataSciencePipelinesApplication -metadata: - name: instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "132" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - dspVersion: v1 - database: - disableHealthCheck: true - customExtraParams: '{"tls":"false"}' - externalDB: - host: "{{ .Values.mas_aibroker_db_host }}" - port: "{{ .Values.mas_aibroker_db_port }}" - username: "{{ .Values.mas_aibroker_db_user }}" - pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" - passwordSecret: - name: "{{ .Values.mas_aibroker_db_secret_name }}" - key: password - objectStorage: - disableHealthCheck: true - externalStorage: - host: "{{ .Values.mas_aibroker_storage_host }}" - bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - s3CredentialsSecret: - accessKey: accesskey - secretKey: secretkey - secretName: ds-pipeline-s3-instance - scheme: https -{{- end }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml deleted file mode 100644 index 86193c624..000000000 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -{{- if eq .Values.mas_aibroker_storage_provider "local" }} -apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 -kind: DataSciencePipelinesApplication -metadata: - name: instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "132" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - database: - disableHealthCheck: true - objectStorage: - disableHealthCheck: true - minio: - deploy: true - image: 'quay.io/minio/minio' - pvcSize: 40Gi - storageClassName: "{{ .Values.primary_storage_class }}" -{{- end }} \ No newline at end of file From ca7a9f4d57893536624a2c042fe6594f321d0726 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 18:03:14 +0530 Subject: [PATCH 127/491] ServiceAccount created --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 04025010c..2c91a17bb 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -1,4 +1,16 @@ {{- if eq .Values.mas_aibroker_storage_provider "minio" }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pipeline-runner-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" +imagePullSecrets: + - name: "{{ .Values.pull_secret_name }}" + +--- apiVersion: v1 kind: Secret metadata: From 00ed8492a055fcc9f44a780696383a910f9ab225 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 19:35:31 +0530 Subject: [PATCH 128/491] echo patch update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 693d3159c..a1a8ae4aa 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -64,6 +64,7 @@ spec: for i in $(seq 1 20); do IP=$(oc get installplan -n openshift-operators -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == "opendatahub-operator.v2.11.1") | .metadata.name') if [ "$IP" ]; then + echo "Approving InstallPlan for ODH: $IP" oc patch installplan $IP -n "openshift-operators" --type merge --patch '{"spec":{"approved":true}}' break fi From 82b0ea418e04db6077fc65eff328ca7976405338 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 19:37:26 +0530 Subject: [PATCH 129/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index a1a8ae4aa..9aed1afa1 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -61,6 +61,9 @@ spec: - /bin/sh - -c - | + echo "Waiting for InstallPlans to be created..." + sleep 60 + for i in $(seq 1 20); do IP=$(oc get installplan -n openshift-operators -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == "opendatahub-operator.v2.11.1") | .metadata.name') if [ "$IP" ]; then @@ -68,6 +71,7 @@ spec: oc patch installplan $IP -n "openshift-operators" --type merge --patch '{"spec":{"approved":true}}' break fi - sleep 5 + echo "InstallPlan not found. Retry $i..." + sleep 15 done restartPolicy: OnFailure \ No newline at end of file From defafbe01307365af1496285b0839b94a6188a91 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 7 Apr 2025 19:44:13 +0530 Subject: [PATCH 130/491] job echo update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 9aed1afa1..8317ab539 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -68,7 +68,7 @@ spec: IP=$(oc get installplan -n openshift-operators -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == "opendatahub-operator.v2.11.1") | .metadata.name') if [ "$IP" ]; then echo "Approving InstallPlan for ODH: $IP" - oc patch installplan $IP -n "openshift-operators" --type merge --patch '{"spec":{"approved":true}}' + oc patch installplan $IP -n openshift-operators --type merge --patch '{"spec":{"approved":true}}' break fi echo "InstallPlan not found. Retry $i..." From 56744389eadcfb6fd1a903d75aa01610820952ad Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 20:24:20 +0530 Subject: [PATCH 131/491] Revert "removed files" This reverts commit ac1dcef416eef4ac7f6c272a2a72428d3ba7f352. --- .../templates/10-odh-dspa-aws.yaml | 53 +++++++++++++++++++ .../templates/10-odh-dspa-local.yaml | 21 ++++++++ 2 files changed, 74 insertions(+) create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml create mode 100644 instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml new file mode 100644 index 000000000..b33c0152a --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-aws.yaml @@ -0,0 +1,53 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "aws" }} +apiVersion: v1 +kind: Secret +metadata: + name: ds-pipeline-s3-instance + namespace: "{{ .Values.aibroker_namespace }}" + labels: + opendatahub.io/dashboard: 'false' + opendatahub.io/managed: 'true' + annotations: + opendatahub.io/connection-type: s3 + openshift.io/display-name: AWS S3 Connection + argocd.argoproj.io/sync-wave: "132" +stringData: + accesskey: "{{ .Values.mas_aibroker_storage_accesskey }}" + secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" + host: "{{ .Values.mas_aibroker_storage_host }}" + region: "{{ .Values.mas_aibroker_storage_region }}" + ssl: "{{ .Values.mas_aibroker_storage_ssl }}" +--- +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + dspVersion: v1 + database: + disableHealthCheck: true + customExtraParams: '{"tls":"false"}' + externalDB: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + username: "{{ .Values.mas_aibroker_db_user }}" + pipelineDBName: "{{ .Values.mas_aibroker_db_database }}" + passwordSecret: + name: "{{ .Values.mas_aibroker_db_secret_name }}" + key: password + objectStorage: + disableHealthCheck: true + externalStorage: + host: "{{ .Values.mas_aibroker_storage_host }}" + bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + s3CredentialsSecret: + accessKey: accesskey + secretKey: secretkey + secretName: ds-pipeline-s3-instance + scheme: https +{{- end }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml new file mode 100644 index 000000000..86193c624 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-local.yaml @@ -0,0 +1,21 @@ +--- +{{- if eq .Values.mas_aibroker_storage_provider "local" }} +apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 +kind: DataSciencePipelinesApplication +metadata: + name: instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + database: + disableHealthCheck: true + objectStorage: + disableHealthCheck: true + minio: + deploy: true + image: 'quay.io/minio/minio' + pvcSize: 40Gi + storageClassName: "{{ .Values.primary_storage_class }}" +{{- end }} \ No newline at end of file From 5fcfd15a540e7340369ef3566bf71fa4f020ede2 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 20:24:36 +0530 Subject: [PATCH 132/491] sync order updated --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 2c91a17bb..655e9610b 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -20,7 +20,7 @@ metadata: opendatahub.io/dashboard: "false" opendatahub.io/managed: "true" annotations: - argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-wave: "133" opendatahub.io/connection-type: s3 openshift.io/display-name: Minio Data Connection stringData: @@ -36,7 +36,7 @@ metadata: name: instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "135" + argocd.argoproj.io/sync-wave: "134" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: dspVersion: v1 From c12ccb80d9643841c443c437e8176970add9002c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 20:33:26 +0530 Subject: [PATCH 133/491] Update 10-odh-dspa-minio.yaml --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 655e9610b..22e0ce420 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -6,7 +6,7 @@ metadata: name: pipeline-runner-instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "132" + argocd.argoproj.io/sync-wave: "133" imagePullSecrets: - name: "{{ .Values.pull_secret_name }}" @@ -20,7 +20,7 @@ metadata: opendatahub.io/dashboard: "false" opendatahub.io/managed: "true" annotations: - argocd.argoproj.io/sync-wave: "133" + argocd.argoproj.io/sync-wave: "132" opendatahub.io/connection-type: s3 openshift.io/display-name: Minio Data Connection stringData: From 7893039418812161d95474d218edfc5277435047 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 7 Apr 2025 20:42:10 +0530 Subject: [PATCH 134/491] service account added at the end --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 13 +------------ .../112-ibm-odh/templates/11-odh.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 instance-applications/112-ibm-odh/templates/11-odh.yaml diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index 22e0ce420..ec3549e2e 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -1,15 +1,4 @@ {{- if eq .Values.mas_aibroker_storage_provider "minio" }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: pipeline-runner-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "133" -imagePullSecrets: - - name: "{{ .Values.pull_secret_name }}" - --- apiVersion: v1 kind: Secret @@ -36,7 +25,7 @@ metadata: name: instance namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "134" + argocd.argoproj.io/sync-wave: "133" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: dspVersion: v1 diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml new file mode 100644 index 000000000..1086a9c94 --- /dev/null +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pipeline-runner-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "135" +imagePullSecrets: + - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file From 488042062f441ce871028712917fbc6dcb5b0de3 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 10:35:55 +0530 Subject: [PATCH 135/491] Update 11-odh.yaml commented impagePullSecrets --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 1086a9c94..b576a3fc5 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -6,5 +6,5 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "135" -imagePullSecrets: - - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file +# imagePullSecrets: +# - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file From c38339b501a8cbd2f401667fc39e488a2b32c60f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Apr 2025 10:57:21 +0530 Subject: [PATCH 136/491] Namespace Update mas-MAS_INSTANCE_ID-aibroker to mas_sremat_aibroker instance appset update --- .../ibm-aibroker-instance-root/values.yaml | 4 ++-- .../templates/099-instance-appset.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4ba3622ee..a38db128b 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -98,7 +98,7 @@ ibm_odh: ibm_kmodel: openshift_namespace: "openshift-operators" run_sync_hooks: true - aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" + aibroker_namespace: "mas_sremat_aibroker" mas_aibroker_storage_provider: "aws" mas_aibroker_storage_ssl: "true" # following are the variable need to injected via environment variable @@ -107,7 +107,7 @@ ibm_kmodel: mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" + ssh_secret_name: "sremat-internal-aibroker-tls" # vars file for kmodels pullSecretName: "ibm-entitlement" docker_server: "MAS_ICR_CP/aibroker" diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 3c1954d04..58c3edcc8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -39,11 +39,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - # - git: - # repoURL: "{{ .Values.generator.repo_url }}" - # revision: "{{ .Values.generator.revision }}" - # files: - # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From ae9db39873f4c2633d1f9a7633cfa9042e387875 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 11:02:40 +0530 Subject: [PATCH 137/491] Update 11-odh.yaml --- .../112-ibm-odh/templates/11-odh.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index b576a3fc5..3fd29a5e9 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,10 +1,10 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: pipeline-runner-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "135" +# --- +# apiVersion: v1 +# kind: ServiceAccount +# metadata: +# name: pipeline-runner-instance +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "135" # imagePullSecrets: # - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file From 6a7c8e02b8fd7afdecfdc81fd5419a8c28da513d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Apr 2025 13:38:14 +0530 Subject: [PATCH 138/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index a38db128b..9290acebc 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -98,7 +98,7 @@ ibm_odh: ibm_kmodel: openshift_namespace: "openshift-operators" run_sync_hooks: true - aibroker_namespace: "mas_sremat_aibroker" + aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "aws" mas_aibroker_storage_ssl: "true" # following are the variable need to injected via environment variable From b42265756c10579dddefa417d846835746fae599 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Apr 2025 13:41:42 +0530 Subject: [PATCH 139/491] Update values.yaml --- instance-applications/113-ibm-kmodels/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-kmodels/values.yaml b/instance-applications/113-ibm-kmodels/values.yaml index 3d5c279ce..7efdc325f 100644 --- a/instance-applications/113-ibm-kmodels/values.yaml +++ b/instance-applications/113-ibm-kmodels/values.yaml @@ -1,7 +1,7 @@ --- run_sync_hooks: true -aibroker_namespace: "mas-MAS_INSTANCE_ID-aibroker" +aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "aws" mas_aibroker_storage_ssl: "true" @@ -13,7 +13,7 @@ mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" -ssh_secret_name: "MAS_INSTANCE_ID-internal-aibroker-tls" +ssh_secret_name: "sremat-internal-aibroker-tls" # vars file for kmodels pullSecretName: "ibm-entitlement" From 5ff8051c6b37a6554d8e7224857ab4a7ab1b7afc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Apr 2025 15:09:45 +0530 Subject: [PATCH 140/491] remove --- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 1 - .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 14b45bb53..750d8be63 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -12,5 +12,4 @@ spec: name: opendatahub-operator source: community-operators sourceNamespace: openshift-marketplace - targetNamespaces: openshift-operators startingCSV: "opendatahub-operator.v2.11.1" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index ec3549e2e..af7c75cfd 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -47,7 +47,6 @@ spec: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - storageClassName: "{{ .Values.primary_storage_class }}" s3CredentialsSecret: accessKey: accesskey secretKey: secretkey From b5331c17cc8d5a25550a3bb98edf0e57c063246d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 15:52:21 +0530 Subject: [PATCH 141/491] Update 11-odh.yaml created service account --- .../112-ibm-odh/templates/11-odh.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 3fd29a5e9..1086a9c94 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,10 +1,10 @@ -# --- -# apiVersion: v1 -# kind: ServiceAccount -# metadata: -# name: pipeline-runner-instance -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "135" -# imagePullSecrets: -# - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pipeline-runner-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "135" +imagePullSecrets: + - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file From efe9437e7fdb0c166c1394092a2e12dc19b780f0 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 16:31:18 +0530 Subject: [PATCH 142/491] Update 030-ibm-odh-app.yaml to ignore difference for the imagepullsecrets --- .../templates/030-ibm-odh-app.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 3f8e6c14f..4da69c498 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -21,6 +21,11 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} From d6418633fa9310a2edead1d7805b322190c9480d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 16:44:24 +0530 Subject: [PATCH 143/491] Update 030-ibm-odh-app.yaml ignoring labels and ownerReferences --- .../ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 4da69c498..44f1125aa 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -26,6 +26,8 @@ spec: kind: ServiceAccount jsonPointers: - /imagePullSecrets + - /metadata/labels + - /metadata/ownerReferences project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} From 973d6e71d3653cf8eb56c9ef1b4e92c08d81e515 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 16:48:37 +0530 Subject: [PATCH 144/491] Update 030-ibm-odh-app.yaml ignoring the difference for the annotations --- .../ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 44f1125aa..897058ec2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -27,6 +27,7 @@ spec: jsonPointers: - /imagePullSecrets - /metadata/labels + - /metadata/annotations - /metadata/ownerReferences project: "{{ .Values.argo.projects.apps }}" destination: From 0d42097e141a181db5398c95c592b5377cc1c38a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 8 Apr 2025 17:02:52 +0530 Subject: [PATCH 145/491] ibm-entitlement updated --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 1086a9c94..3ad58d20b 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -7,4 +7,4 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "135" imagePullSecrets: - - name: "{{ .Values.pull_secret_name }}" \ No newline at end of file + - name: "ibm-entitlement" \ No newline at end of file From 04a78db27e827345b0874b71b012a1815c277def Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 10:31:25 +0530 Subject: [PATCH 146/491] job added to patch service account --- .../112-ibm-odh/templates/11-odh.yaml | 60 +++++++++++++++++-- .../templates/030-ibm-odh-app.yaml | 16 ++--- 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 3ad58d20b..d890766e2 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,10 +1,60 @@ --- -apiVersion: v1 -kind: ServiceAccount +apiVersion: batch/v1 +kind: Job metadata: - name: pipeline-runner-instance + name: odh-sa-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }} namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "135" -imagePullSecrets: - - name: "ibm-entitlement" \ No newline at end of file +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + template: +{{- if .Values.custom_labels }} + metadata: + labels: +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + spec: + containers: + - name: run + image: quay.io/ibmmas/cli:latest + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + env: + - name: AIBROKER_NAMESPACE + value: {{ .Values.aibroker_namespace }} + command: + - /bin/sh + - -c + - | + + set -e + echo + echo "================================================================================" + echo "Provide ibm-entitlement-key image pull secret for 'pipeline-runner-instance' service accounts" + echo "================================================================================" + echo + + sleep 60 + + RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} -o=jsonpath="{.metadata.name}" --ignore-not-found) + if [[ -z "${RESOURCE_NAME}" ]]; then + echo "patching 'pipeline-runner-instance' sa..." + oc patch serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' + fi + + echo "Done patching 'pipeline-runner-instance' sa..." + + restartPolicy: Never + serviceAccountName: pipeline-runner-instance + backoffLimit: 4 + diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 897058ec2..f3d2bb553 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -21,14 +21,14 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - /metadata/labels - - /metadata/annotations - - /metadata/ownerReferences + # ignoreDifferences: + # - group: '*' + # kind: ServiceAccount + # jsonPointers: + # - /imagePullSecrets + # - /metadata/labels + # - /metadata/annotations + # - /metadata/ownerReferences project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} From 024f5fcd112c391eb4c5e4a59fac0faa8ea362cf Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 10:42:03 +0530 Subject: [PATCH 147/491] Update 11-odh.yaml added hardcoded namespace --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index d890766e2..4dadeef77 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -31,7 +31,7 @@ spec: memory: 64Mi env: - name: AIBROKER_NAMESPACE - value: {{ .Values.aibroker_namespace }} + value: "{{ .Values.aibroker_namespace }}" command: - /bin/sh - -c @@ -46,10 +46,10 @@ spec: sleep 60 - RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} -o=jsonpath="{.metadata.name}" --ignore-not-found) + RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n mas-sremat-aibroker -o=jsonpath="{.metadata.name}" --ignore-not-found) if [[ -z "${RESOURCE_NAME}" ]]; then echo "patching 'pipeline-runner-instance' sa..." - oc patch serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' + oc patch serviceaccount pipeline-runner-instance -n mas-sremat-aibroker --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' fi echo "Done patching 'pipeline-runner-instance' sa..." From 01dcfd1cf3656a40872e16f4f13e1356308451c5 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 10:58:43 +0530 Subject: [PATCH 148/491] added SA , Role , RoleBinding and Job --- .../112-ibm-odh/templates/11-odh.yaml | 63 ++++++++++++++----- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 4dadeef77..19893c422 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,3 +1,43 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: odh-sa + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "135" + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: patch-serviceaccount-role + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "136" +rules: + - apiGroups: [""] + resources: ["serviceaccounts"] + verbs: ["get", "patch"] + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: patch-serviceaccount-binding + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "137" +subjects: + - kind: ServiceAccount + name: odh-sa + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + kind: Role + name: patch-serviceaccount-role + apiGroup: rbac.authorization.k8s.io + + --- apiVersion: batch/v1 kind: Job @@ -6,17 +46,11 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "135" -{{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} spec: template: -{{- if .Values.custom_labels }} - metadata: - labels: -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} spec: containers: - name: run @@ -36,7 +70,6 @@ spec: - /bin/sh - -c - | - set -e echo echo "================================================================================" @@ -46,15 +79,15 @@ spec: sleep 60 - RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n mas-sremat-aibroker -o=jsonpath="{.metadata.name}" --ignore-not-found) - if [[ -z "${RESOURCE_NAME}" ]]; then - echo "patching 'pipeline-runner-instance' sa..." - oc patch serviceaccount pipeline-runner-instance -n mas-sremat-aibroker --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' + RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n mas-sremat-aibroker -o=jsonpath="{.metadata.name}" --ignore-not-found) + if [[ -n "${RESOURCE_NAME}" ]]; then + echo "Patching 'pipeline-runner-instance' sa..." + oc patch serviceaccount pipeline-runner-instance -n mas-sremat-aibroker --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' + else + echo "'pipeline-runner-instance' service account not found." fi echo "Done patching 'pipeline-runner-instance' sa..." - restartPolicy: Never - serviceAccountName: pipeline-runner-instance - backoffLimit: 4 - + serviceAccountName: odh-sa + backoffLimit: 3 From d833a7c13dcfb5dba9a362261605bf293d72f2f2 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 10:59:35 +0530 Subject: [PATCH 149/491] sync wave updated --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 19893c422..e45538f88 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -45,10 +45,7 @@ metadata: name: odh-sa-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }} namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "135" - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} + argocd.argoproj.io/sync-wave: "138" spec: template: spec: From 89fff502a9677cc0b45cbbb6c9617bcc6d6d0ef3 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 11:30:54 +0530 Subject: [PATCH 150/491] added namespace values --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index e45538f88..64221c2c4 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -76,10 +76,10 @@ spec: sleep 60 - RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n mas-sremat-aibroker -o=jsonpath="{.metadata.name}" --ignore-not-found) + RESOURCE_NAME=$(oc get serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} -o=jsonpath="{.metadata.name}" --ignore-not-found) if [[ -n "${RESOURCE_NAME}" ]]; then echo "Patching 'pipeline-runner-instance' sa..." - oc patch serviceaccount pipeline-runner-instance -n mas-sremat-aibroker --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' + oc patch serviceaccount pipeline-runner-instance -n ${AIBROKER_NAMESPACE} --type='merge' -p '{"imagePullSecrets":[{"name":"ibm-entitlement"}]}' else echo "'pipeline-runner-instance' service account not found." fi From 6b90ec88593cc66e3a70aae862e94edbeaebae2a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 13:20:55 +0530 Subject: [PATCH 151/491] custom value --- .../03-odh-servicemesh-operator-sa.yaml | 13 +------------ .../templates/05-odh-operator-job.yaml | 19 ++++++++++++------- .../05-odh-operator-subcription.yaml | 2 +- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index 593807c49..a95f6ef11 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -11,18 +11,7 @@ spec: name: servicemeshoperator source: redhat-operators sourceNamespace: openshift-marketplace - -# --- -# apiVersion: operators.coreos.com/v1 -# kind: OperatorGroup -# metadata: -# name: servicemesh-operator-group -# namespace: openshift-operators -# annotations: -# argocd.argoproj.io/sync-wave: "119" -# spec: -# targetNamespaces: -# - openshift-operators + --- apiVersion: v1 kind: ServiceAccount diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 8317ab539..f860bcbf6 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: installplan-approver - namespace: openshift-operators + namespace: {{ .Values.openshift_namespace }} annotations: argocd.argoproj.io/sync-wave: "123" --- @@ -11,7 +11,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: installplan-approver - namespace: openshift-operators + namespace: {{ .Values.openshift_namespace }} annotations: argocd.argoproj.io/sync-wave: "124" rules: @@ -23,7 +23,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: installplan-approver - namespace: openshift-operators + namespace: {{ .Values.openshift_namespace }} annotations: argocd.argoproj.io/sync-wave: "125" roleRef: @@ -33,13 +33,13 @@ roleRef: subjects: - kind: ServiceAccount name: installplan-approver - namespace: openshift-operators + namespace: {{ .Values.openshift_namespace }} --- apiVersion: batch/v1 kind: Job metadata: name: installplanpatch - namespace: openshift-operators + namespace: {{ .Values.openshift_namespace }} annotations: argocd.argoproj.io/sync-wave: "126" spec: @@ -57,6 +57,11 @@ spec: requests: cpu: 10m memory: 64Mi + env: + - name: ODH_NAMESPACE + value: "{{ .Values.openshift_namespace }}" + - name: ODH_VERSION + value: "{{ .Values.odh_operator_version }}" command: - /bin/sh - -c @@ -65,10 +70,10 @@ spec: sleep 60 for i in $(seq 1 20); do - IP=$(oc get installplan -n openshift-operators -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == "opendatahub-operator.v2.11.1") | .metadata.name') + IP=$(oc get installplan -n ${ODH_NAMESPACE} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == ${ODH_VERSION}) | .metadata.name') if [ "$IP" ]; then echo "Approving InstallPlan for ODH: $IP" - oc patch installplan $IP -n openshift-operators --type merge --patch '{"spec":{"approved":true}}' + oc patch installplan $IP -n ${ODH_NAMESPACE} --type merge --patch '{"spec":{"approved":true}}' break fi echo "InstallPlan not found. Retry $i..." diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 750d8be63..3a5c0f959 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -12,4 +12,4 @@ spec: name: opendatahub-operator source: community-operators sourceNamespace: openshift-marketplace - startingCSV: "opendatahub-operator.v2.11.1" \ No newline at end of file + startingCSV: {{ .Values.odh_operator_version }} \ No newline at end of file From 4c96db90c09bf82ac6d915e99d06f7b753eabe59 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 13:52:31 +0530 Subject: [PATCH 152/491] odh namespace --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 2 +- .../112-ibm-odh/templates/08-odh-dsc-init.yaml | 4 ++-- .../ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index 6e423862c..c317d9f42 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -10,6 +10,6 @@ metadata: apiVersion: v1 kind: Namespace metadata: - name: "opendatahub" + name: "{{ .Values.odh_namespace }}" annotations: argocd.argoproj.io/sync-wave: "128" \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml index 6d4a80664..2d748dbdc 100644 --- a/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml +++ b/instance-applications/112-ibm-odh/templates/08-odh-dsc-init.yaml @@ -15,10 +15,10 @@ metadata: app.kubernetes.io/part-of: opendatahub-operator name: default-dsci spec: - applicationsNamespace: opendatahub + applicationsNamespace: "{{ .Values.odh_namespace }}" monitoring: managementState: Managed - namespace: opendatahub + namespace: "{{ .Values.odh_namespace }}" serviceMesh: auth: audiences: diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index f3d2bb553..26dc4bc69 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -45,6 +45,7 @@ spec: openshift_namespace: "{{ .Values.ibm_odh.openshift_namespace }}" odh_pipeline_channel: "{{ .Values.ibm_odh.odh_pipeline_channel }}" odh_pipeline_installplan: "{{ .Values.ibm_odh.odh_pipeline_installplan }}" + odh_namespace: "{{ .Values.ibm_odh.odh_namespace }}" service_mesh_namespace: "{{ .Values.ibm_odh.service_mesh_namespace }}" service_mesh_channel: "{{ .Values.ibm_odh.service_mesh_channel }}" service_mesh_catalog_source: "{{ .Values.ibm_odh.service_mesh_catalog_source }}" From d647af7d889ee29895a19ca6ad5b38bdf908688e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 14:05:55 +0530 Subject: [PATCH 153/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index f860bcbf6..47705b0c1 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -57,7 +57,7 @@ spec: requests: cpu: 10m memory: 64Mi - env: + env: - name: ODH_NAMESPACE value: "{{ .Values.openshift_namespace }}" - name: ODH_VERSION From 3496048bcba3a52668d787fdbc7a35193ac441aa Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 14:18:27 +0530 Subject: [PATCH 154/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 47705b0c1..ae4fe7858 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -70,7 +70,7 @@ spec: sleep 60 for i in $(seq 1 20); do - IP=$(oc get installplan -n ${ODH_NAMESPACE} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == ${ODH_VERSION}) | .metadata.name') + IP=$(oc get installplan -n ${ODH_NAMESPACE} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == $ODH_VERSION ) | .metadata.name') if [ "$IP" ]; then echo "Approving InstallPlan for ODH: $IP" oc patch installplan $IP -n ${ODH_NAMESPACE} --type merge --patch '{"spec":{"approved":true}}' From a4d090fff3799fe1eaff4c8607d3897b9081718b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 14:35:36 +0530 Subject: [PATCH 155/491] jq arg ODH_VERSION Added --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index ae4fe7858..1f5db2289 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -70,7 +70,9 @@ spec: sleep 60 for i in $(seq 1 20); do - IP=$(oc get installplan -n ${ODH_NAMESPACE} -o json | jq -r '.items[] | select(.spec.clusterServiceVersionNames[] == $ODH_VERSION ) | .metadata.name') + IP=$(oc get installplan -n "${ODH_NAMESPACE}" -o json \ + | jq -r --arg ODH_VERSION "$ODH_VERSION" '.items[] | select(.spec.clusterServiceVersionNames[] == $ODH_VERSION) | .metadata.name') + if [ "$IP" ]; then echo "Approving InstallPlan for ODH: $IP" oc patch installplan $IP -n ${ODH_NAMESPACE} --type merge --patch '{"spec":{"approved":true}}' From 524580af17fa43a48134da5b39b71bf696a25577 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Apr 2025 14:40:49 +0530 Subject: [PATCH 156/491] Update 05-odh-operator-job.yaml --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 1f5db2289..a0bfad0a4 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -38,7 +38,7 @@ subjects: apiVersion: batch/v1 kind: Job metadata: - name: installplanpatch + name: installplanpatch-{{ .Values.odh_operator_version }} namespace: {{ .Values.openshift_namespace }} annotations: argocd.argoproj.io/sync-wave: "126" From 0a26399c0fef9f59968fa60dba30b9dc4ece4fb6 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 16:28:09 +0530 Subject: [PATCH 157/491] Create 08-kmodel-ca_Certificate.yaml added certificate issuer and certificate --- .../templates/08-kmodel-ca_Certificate.yaml | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml new file mode 100644 index 000000000..91fec8217 --- /dev/null +++ b/instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml @@ -0,0 +1,52 @@ +--- +apiVersion: cert-manager.io/v1 +kind: Issuer +metadata: + name: "kmodel-ca-issuer" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "158" +spec: + selfSigned: {} + +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "kmodel-ca-certificate" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "158" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + secretName: "{{ .Values.ssh_secret_name }}" + duration: "175200h0m0s" + renewBefore: "2160h0m0s" + keystores: + pkcs12: + create: true + passwordSecretRef: + key: password + name: "{{ .Values.ssh_secret_name }}" + issuerRef: + name: "kmodel-ca-issuer" + kind: Issuer + isCA: true + usages: + - cert sign + - digital signature + - key encipherment + - server auth + commonName: "ca.kmodel" + subject: + countries: + - GB + streetAddresses: + - London + localities: + - London + organizationalUnits: + - IBM Maximo Application Suite kmodel \ No newline at end of file From e930eb12e6d5262ee0fd6418d39b08924038d0ff Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 16:33:52 +0530 Subject: [PATCH 158/491] sync wave changed --- ...odel-ca_Certificate.yaml => 05-kmodel-ca_Certificate.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename instance-applications/113-ibm-kmodels/templates/{08-kmodel-ca_Certificate.yaml => 05-kmodel-ca_Certificate.yaml} (92%) diff --git a/instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml similarity index 92% rename from instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml rename to instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 91fec8217..3bd92151e 100644 --- a/instance-applications/113-ibm-kmodels/templates/08-kmodel-ca_Certificate.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -5,7 +5,7 @@ metadata: name: "kmodel-ca-issuer" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "158" + argocd.argoproj.io/sync-wave: "144" spec: selfSigned: {} @@ -16,7 +16,7 @@ metadata: name: "kmodel-ca-certificate" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "158" + argocd.argoproj.io/sync-wave: "144" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} From 5f4cd37bfcfe50b58e04a01e8b3b845a11ef16a5 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 9 Apr 2025 16:42:06 +0530 Subject: [PATCH 159/491] Update 05-kmodel-ca_Certificate.yaml --- .../113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 3bd92151e..08b547e6a 100644 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -13,7 +13,7 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "kmodel-ca-certificate" + name: "{{ .Values.ssh_secret_name }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "144" From 91e1523d258b80b7ac489edf276819d3b9b15f56 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 10 Apr 2025 13:41:39 +0530 Subject: [PATCH 160/491] added aibroker service code . --- main.py | 5 + .../ibm-mas-cluster-root/README.md | 2 + .../099-aibroker-instance-appset.yaml | 131 ++++++++++++++++++ .../templates/099-instance-appset.yaml | 116 ++++++++++++++-- 4 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml diff --git a/main.py b/main.py index 24f63c52c..022c092ed 100644 --- a/main.py +++ b/main.py @@ -79,3 +79,8 @@ def instance_root_app_set(): return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml", "Instance Root Application Set") env.macro(instance_root_app_set) + def aibroker_instance_root_app_set(): + return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml", "AiBroker Instance Root Application Set") + env.macro(aibroker_instance_root_app_set) + + diff --git a/root-applications/ibm-mas-cluster-root/README.md b/root-applications/ibm-mas-cluster-root/README.md index 69501b008..6a3c21af5 100644 --- a/root-applications/ibm-mas-cluster-root/README.md +++ b/root-applications/ibm-mas-cluster-root/README.md @@ -3,3 +3,5 @@ IBM MAS Cluster Root Application Installs various ArgoCD Applications for managing dependencies shared by MAS instances on the target cluster. Also installs the MAS Instance Root ArgoCD ApplicationSet (`099-instance-appset.yaml`) responsible for generating a set of IBM MAS Instance Root ArgoCD Applications for managing MAS instances on the target cluster. + +Also installs the Aibroker Instance Root ArgoCD ApplicationSet (`099-Aibroker-instance-appset.yaml`) responsible for generating a set of IBM Aibroker Instance Root ArgoCD Applications for managing Aibroker instances on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml new file mode 100644 index 000000000..25e51675f --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -0,0 +1,131 @@ + +--- +# IBM AiBroker Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: aibroker-instance-appset.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' +# region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "099" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "aibroker-instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + # region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-instance-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 58c3edcc8..5dc50c500 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -1,4 +1,5 @@ + --- # IBM Maximo Application Suite Instance Application Set apiVersion: argoproj.io/v1alpha1 @@ -8,7 +9,7 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "099" @@ -28,22 +29,117 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -51,7 +147,7 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -69,7 +165,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root + path: root-applications/ibm-mas-instance-root helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" @@ -87,7 +183,9 @@ spec: {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} + {{- end }} + - name: "mas_catalog_version" + value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps @@ -128,4 +226,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file + revisionHistoryLimit: 1 From a48fac1d332b0e9aa2c47ffe4fee2913d4ad92e4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 10 Apr 2025 14:29:34 +0530 Subject: [PATCH 161/491] Update 05-kmodel-ca_Certificate.yaml added labels and the certificate name --- .../113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 08b547e6a..7793fc776 100644 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -6,6 +6,10 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "144" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} spec: selfSigned: {} @@ -13,7 +17,7 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "{{ .Values.ssh_secret_name }}" + name: "sremat-internal-aibroker-tls-certificate" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "144" From 0dd8680ff1e671fcc93ade550a0fb0f4534ec427 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 10 Apr 2025 14:38:20 +0530 Subject: [PATCH 162/491] Update 05-kmodel-ca_Certificate.yaml removed p12 certificate code --- .../templates/05-kmodel-ca_Certificate.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 7793fc776..9d0fa60f5 100644 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -17,7 +17,7 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "sremat-internal-aibroker-tls-certificate" + name: "{{ .Values.ssh_secret_name }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "144" @@ -29,12 +29,12 @@ spec: secretName: "{{ .Values.ssh_secret_name }}" duration: "175200h0m0s" renewBefore: "2160h0m0s" - keystores: - pkcs12: - create: true - passwordSecretRef: - key: password - name: "{{ .Values.ssh_secret_name }}" + # keystores: + # pkcs12: + # create: true + # passwordSecretRef: + # key: password + # name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" kind: Issuer From 5bee36ac847386d795dc64a1b8a23510e84f635d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:00:37 +0530 Subject: [PATCH 163/491] aibroker --- .../113-ibm-kmodels/README.md | 4 +- .../templates/05-kmodel-store.yaml | 246 ++++++------- .../templates/06-kmodel-watcher.yaml | 278 +++++++-------- .../templates/07-kmodel-controller.yaml | 322 +++++++++--------- .../114-ibm-aibroker/Chart.yaml | 11 + .../114-ibm-aibroker/README.md | 3 + .../01-aibroker-minio-secret.yaml.yaml | 12 + .../114-ibm-aibroker/values.yaml | 41 +++ .../templates/050-ibm-aibroker-app.yaml | 110 ++++++ .../ibm-aibroker-instance-root/values.yaml | 76 ++++- .../templates/099-instance-appset.yaml | 113 +----- 11 files changed, 687 insertions(+), 529 deletions(-) create mode 100644 instance-applications/114-ibm-aibroker/Chart.yaml create mode 100644 instance-applications/114-ibm-aibroker/README.md create mode 100644 instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml create mode 100644 instance-applications/114-ibm-aibroker/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml diff --git a/instance-applications/113-ibm-kmodels/README.md b/instance-applications/113-ibm-kmodels/README.md index cd4553e8f..131097f1a 100644 --- a/instance-applications/113-ibm-kmodels/README.md +++ b/instance-applications/113-ibm-kmodels/README.md @@ -1,3 +1,3 @@ -IBM Kmodels +IBM AIBroker =============================================================================== -Deploy and configure kmodels storage with configurable version \ No newline at end of file +Deploy and configure aibroker storage with configurable version \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml index 0df630860..235592615 100644 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml @@ -1,125 +1,125 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "144" - labels: - app: km-store -data: - STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" - # Certificate files folder (default: /etc/ssl/certs) - CERTS_PATH: "/etc/ssl/certs" - # Private key (default: tls.key) - CERT_PRIVATE_KEY: "tls.key" - # Public certificate (default: tls.crt) - CERT_PUBLIC_CERTIFICATE: "tls.crt" - # Set to true to enable https server (default: true) - SUPPORT_HTTPS: "true" +# --- +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: km-store +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "144" +# labels: +# app: km-store +# data: +# STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" +# # Certificate files folder (default: /etc/ssl/certs) +# CERTS_PATH: "/etc/ssl/certs" +# # Private key (default: tls.key) +# CERT_PRIVATE_KEY: "tls.key" +# # Public certificate (default: tls.crt) +# CERT_PUBLIC_CERTIFICATE: "tls.crt" +# # Set to true to enable https server (default: true) +# SUPPORT_HTTPS: "true" ---- -apiVersion: v1 -kind: Service -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "145" -spec: - ports: - - name: http - port: 3000 - targetPort: http - - name: https - port: 8443 - targetPort: https - selector: - app: km-store - type: ClusterIP +# --- +# apiVersion: v1 +# kind: Service +# metadata: +# name: km-store +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "145" +# spec: +# ports: +# - name: http +# port: 3000 +# targetPort: http +# - name: https +# port: 8443 +# targetPort: https +# selector: +# app: km-store +# type: ClusterIP ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-store - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "146" - labels: - app: km-store - component: store - kmodels: instance - part-of: kmodels -spec: - replicas: 1 - selector: - matchLabels: - app: km-store - kmodels: instance - part-of: kmodels - template: - metadata: - labels: - app: km-store - component: store - kmodels: instance - part-of: kmodels - spec: - restartPolicy: Always - volumes: - - name: ssh-key - secret: - secretName: "{{ .Values.ssh_secret_name }}" - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: store - image: "{{ .Values.image_store }}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - - name: https - containerPort: 8443 - envFrom: - - configMapRef: - name: km-store - - secretRef: - name: km-s3-secret - resources: - requests: - memory: "64Mi" - cpu: "50m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "100m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 5 - periodSeconds: 500 - volumeMounts: - - mountPath: "/etc/ssl/certs" - name: ssh-key - readOnly: true +# --- +# apiVersion: apps/v1 +# kind: Deployment +# metadata: +# name: km-store +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "146" +# labels: +# app: km-store +# component: store +# kmodels: instance +# part-of: kmodels +# spec: +# replicas: 1 +# selector: +# matchLabels: +# app: km-store +# kmodels: instance +# part-of: kmodels +# template: +# metadata: +# labels: +# app: km-store +# component: store +# kmodels: instance +# part-of: kmodels +# spec: +# restartPolicy: Always +# volumes: +# - name: ssh-key +# secret: +# secretName: "{{ .Values.ssh_secret_name }}" +# imagePullSecrets: +# - name: "{{ .Values.pullSecretName }}" +# containers: +# - name: store +# image: "{{ .Values.image_store }}" +# imagePullPolicy: Always +# securityContext: +# readOnlyRootFilesystem: false +# allowPrivilegeEscalation: false +# privileged: false +# runAsNonRoot: true +# capabilities: +# drop: +# - ALL +# ports: +# - name: http +# containerPort: 3000 +# - name: https +# containerPort: 8443 +# envFrom: +# - configMapRef: +# name: km-store +# - secretRef: +# name: km-s3-secret +# resources: +# requests: +# memory: "64Mi" +# cpu: "50m" +# ephemeral-storage: "1Gi" +# limits: +# memory: "256Mi" +# cpu: "100m" +# ephemeral-storage: "2Gi" +# livenessProbe: +# httpGet: +# path: /version +# port: 8443 +# scheme: HTTPS +# initialDelaySeconds: 15 +# periodSeconds: 500 +# readinessProbe: +# httpGet: +# path: /version +# port: 8443 +# scheme: HTTPS +# initialDelaySeconds: 5 +# periodSeconds: 500 +# volumeMounts: +# - mountPath: "/etc/ssl/certs" +# name: ssh-key +# readOnly: true diff --git a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml index dec6716e2..c62507f1f 100644 --- a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -1,142 +1,142 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "147" ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-role - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "148" -rules: - - verbs: - - list - - watch - apiGroups: - - '' - resources: - - events - - pods ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-binding - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "149" -subjects: - - kind: ServiceAccount - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: km-watcher-role +# --- +# apiVersion: v1 +# kind: ServiceAccount +# metadata: +# name: km-watcher +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "147" +# --- +# kind: Role +# apiVersion: rbac.authorization.k8s.io/v1 +# metadata: +# name: km-watcher-role +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "148" +# rules: +# - verbs: +# - list +# - watch +# apiGroups: +# - '' +# resources: +# - events +# - pods +# --- +# kind: RoleBinding +# apiVersion: rbac.authorization.k8s.io/v1 +# metadata: +# name: km-watcher-binding +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "149" +# subjects: +# - kind: ServiceAccount +# name: km-watcher +# namespace: "{{ .Values.aibroker_namespace }}" +# roleRef: +# apiGroup: rbac.authorization.k8s.io +# kind: Role +# name: km-watcher-role ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "150" - labels: - app: km-watcher -data: - PIPELINES: "{{ .Values.aibroker_namespace }}" - TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" +# --- +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: km-watcher +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "150" +# labels: +# app: km-watcher +# data: +# PIPELINES: "{{ .Values.aibroker_namespace }}" +# TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" +# EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" ---- -apiVersion: v1 -kind: Service -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "151" -spec: - ports: - - name: http - port: 3000 - targetPort: http - selector: - app: km-watcher - type: ClusterIP +# --- +# apiVersion: v1 +# kind: Service +# metadata: +# name: km-watcher +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "151" +# spec: +# ports: +# - name: http +# port: 3000 +# targetPort: http +# selector: +# app: km-watcher +# type: ClusterIP ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "152" - labels: - app: km-watcher - component: watcher -spec: - replicas: 1 - selector: - matchLabels: - app: km-watcher - template: - metadata: - labels: - app: km-watcher - component: watcher - spec: - serviceAccountName: km-watcher - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: watcher - image: "{{ .Values.image_watcher}}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - resources: - requests: - memory: "64Mi" - cpu: "50m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "100m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /version - port: 3000 - scheme: HTTP - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /version - port: 3000 - scheme: HTTP - initialDelaySeconds: 5 - periodSeconds: 500 - envFrom: - - configMapRef: - name: km-watcher - - secretRef: - name: km-s3-secret +# --- +# apiVersion: apps/v1 +# kind: Deployment +# metadata: +# name: km-watcher +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "152" +# labels: +# app: km-watcher +# component: watcher +# spec: +# replicas: 1 +# selector: +# matchLabels: +# app: km-watcher +# template: +# metadata: +# labels: +# app: km-watcher +# component: watcher +# spec: +# serviceAccountName: km-watcher +# imagePullSecrets: +# - name: "{{ .Values.pullSecretName }}" +# containers: +# - name: watcher +# image: "{{ .Values.image_watcher}}" +# imagePullPolicy: Always +# securityContext: +# readOnlyRootFilesystem: false +# allowPrivilegeEscalation: false +# privileged: false +# runAsNonRoot: true +# capabilities: +# drop: +# - ALL +# ports: +# - name: http +# containerPort: 3000 +# resources: +# requests: +# memory: "64Mi" +# cpu: "50m" +# ephemeral-storage: "1Gi" +# limits: +# memory: "256Mi" +# cpu: "100m" +# ephemeral-storage: "2Gi" +# livenessProbe: +# httpGet: +# path: /version +# port: 3000 +# scheme: HTTP +# initialDelaySeconds: 15 +# periodSeconds: 500 +# readinessProbe: +# httpGet: +# path: /version +# port: 3000 +# scheme: HTTP +# initialDelaySeconds: 5 +# periodSeconds: 500 +# envFrom: +# - configMapRef: +# name: km-watcher +# - secretRef: +# name: km-s3-secret diff --git a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml index 7839ab53a..1c0b98cf9 100644 --- a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -1,169 +1,169 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "153" - labels: - app: km-controller -data: - DOCKER_SERVER: "{{ .Values.docker_server }}" - PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - DOCKER_SECRETS_NAME: "ibm-entitlement" - CONNECTOR_IMAGE_PREFIX: '' - PIPELINE_STEP_IMAGE_PREFIX: '' - PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" - CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" - {{- if .Values.mas_aibroker_saas }} - DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" - {{- else }} - DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" - {{- end }} - PLATFORM: openshift +# --- +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: km-controller +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "153" +# labels: +# app: km-controller +# data: +# DOCKER_SERVER: "{{ .Values.docker_server }}" +# PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" +# TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" +# DOCKER_SECRETS_NAME: "ibm-entitlement" +# CONNECTOR_IMAGE_PREFIX: '' +# PIPELINE_STEP_IMAGE_PREFIX: '' +# PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" +# CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" +# {{- if .Values.mas_aibroker_saas }} +# DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" +# {{- else }} +# DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" +# {{- end }} +# PLATFORM: openshift ---- -apiVersion: v1 -kind: Service -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "154" -spec: - ports: - - name: http - port: 3000 - targetPort: http - - name: https - port: 8443 - targetPort: https - selector: - app: km-controller - type: ClusterIP +# --- +# apiVersion: v1 +# kind: Service +# metadata: +# name: km-controller +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "154" +# spec: +# ports: +# - name: http +# port: 3000 +# targetPort: http +# - name: https +# port: 8443 +# targetPort: https +# selector: +# app: km-controller +# type: ClusterIP ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: km-controller-pvc - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "155" -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - resources: - requests: - storage: 1Gi - storageClassName: "{{ .Values.primary_storage_class }}" +# --- +# apiVersion: v1 +# kind: PersistentVolumeClaim +# metadata: +# name: km-controller-pvc +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "155" +# spec: +# accessModes: +# - ReadWriteOnce +# volumeMode: Filesystem +# resources: +# requests: +# storage: 1Gi +# storageClassName: "{{ .Values.primary_storage_class }}" ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "156" +# --- +# apiVersion: v1 +# kind: ServiceAccount +# metadata: +# name: km-controller +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "156" ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "157" - labels: - app: km-controller - component: controller -spec: - replicas: 1 - revisionHistoryLimit: 1 - selector: - matchLabels: - app: km-controller - template: - metadata: - labels: - app: km-controller - component: controller - spec: - serviceAccountName: km-controller - volumes: - - name: storage - persistentVolumeClaim: - claimName: km-controller-pvc - - name: ssh-key - secret: - secretName: "{{ .Values.ssh_secret_name }}" - imagePullSecrets: - - name: "{{ .Values.pullSecretName }}" - containers: - - name: controller - image: "{{ .Values.image_controller}}" - imagePullPolicy: Always - securityContext: - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - privileged: false - runAsNonRoot: true - capabilities: - drop: - - ALL - ports: - - name: http - containerPort: 3000 - - name: https - containerPort: 8443 - resources: - requests: - memory: "128Mi" - cpu: "100m" - ephemeral-storage: "1Gi" - limits: - memory: "256Mi" - cpu: "200m" - ephemeral-storage: "2Gi" - livenessProbe: - httpGet: - path: /api/v1/version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 15 - periodSeconds: 500 - readinessProbe: - httpGet: - path: /api/v1/version - port: 8443 - scheme: HTTPS - initialDelaySeconds: 5 - periodSeconds: 500 - env: - - name: KMODELS_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: KMODELS_ID - valueFrom: - fieldRef: - fieldPath: metadata.namespace - envFrom: - - configMapRef: - name: km-controller - - secretRef: - name: km-s3-secret - volumeMounts: - - name: storage - mountPath: "/storage" - - name: ssh-key - mountPath: "/etc/ssl/certs" - readOnly: true +# --- +# apiVersion: apps/v1 +# kind: Deployment +# metadata: +# name: km-controller +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "157" +# labels: +# app: km-controller +# component: controller +# spec: +# replicas: 1 +# revisionHistoryLimit: 1 +# selector: +# matchLabels: +# app: km-controller +# template: +# metadata: +# labels: +# app: km-controller +# component: controller +# spec: +# serviceAccountName: km-controller +# volumes: +# - name: storage +# persistentVolumeClaim: +# claimName: km-controller-pvc +# - name: ssh-key +# secret: +# secretName: "{{ .Values.ssh_secret_name }}" +# imagePullSecrets: +# - name: "{{ .Values.pullSecretName }}" +# containers: +# - name: controller +# image: "{{ .Values.image_controller}}" +# imagePullPolicy: Always +# securityContext: +# readOnlyRootFilesystem: false +# allowPrivilegeEscalation: false +# privileged: false +# runAsNonRoot: true +# capabilities: +# drop: +# - ALL +# ports: +# - name: http +# containerPort: 3000 +# - name: https +# containerPort: 8443 +# resources: +# requests: +# memory: "128Mi" +# cpu: "100m" +# ephemeral-storage: "1Gi" +# limits: +# memory: "256Mi" +# cpu: "200m" +# ephemeral-storage: "2Gi" +# livenessProbe: +# httpGet: +# path: /api/v1/version +# port: 8443 +# scheme: HTTPS +# initialDelaySeconds: 15 +# periodSeconds: 500 +# readinessProbe: +# httpGet: +# path: /api/v1/version +# port: 8443 +# scheme: HTTPS +# initialDelaySeconds: 5 +# periodSeconds: 500 +# env: +# - name: KMODELS_NAMESPACE +# valueFrom: +# fieldRef: +# fieldPath: metadata.namespace +# - name: KMODELS_ID +# valueFrom: +# fieldRef: +# fieldPath: metadata.namespace +# envFrom: +# - configMapRef: +# name: km-controller +# - secretRef: +# name: km-s3-secret +# volumeMounts: +# - name: storage +# mountPath: "/storage" +# - name: ssh-key +# mountPath: "/etc/ssl/certs" +# readOnly: true diff --git a/instance-applications/114-ibm-aibroker/Chart.yaml b/instance-applications/114-ibm-aibroker/Chart.yaml new file mode 100644 index 000000000..21648d971 --- /dev/null +++ b/instance-applications/114-ibm-aibroker/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-kmodels +description: IBM KMODELS +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/114-ibm-aibroker/README.md b/instance-applications/114-ibm-aibroker/README.md new file mode 100644 index 000000000..cd4553e8f --- /dev/null +++ b/instance-applications/114-ibm-aibroker/README.md @@ -0,0 +1,3 @@ +IBM Kmodels +=============================================================================== +Deploy and configure kmodels storage with configurable version \ No newline at end of file diff --git a/instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml b/instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml new file mode 100644 index 000000000..a6829edb7 --- /dev/null +++ b/instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_minio_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "160" +stringData: + username: "{{ .Values.mas_aibroker_storage_accesskey }}" + password: "{{ .Values.mas_aibroker_storage_secretkey }}" +type: Opaque \ No newline at end of file diff --git a/instance-applications/114-ibm-aibroker/values.yaml b/instance-applications/114-ibm-aibroker/values.yaml new file mode 100644 index 000000000..7efdc325f --- /dev/null +++ b/instance-applications/114-ibm-aibroker/values.yaml @@ -0,0 +1,41 @@ +--- +run_sync_hooks: true + +aibroker_namespace: "mas-sremat-aibroker" + +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_ssl: "true" + +# following are the variable need to injected via environment variable +mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" +mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" +mas_aibroker_storage_host: "mas_aibroker_storage_host" +mas_aibroker_storage_port: "mas_aibroker_storage_port" +mas_aibroker_storage_region: "mas_aibroker_storage_region" + +ssh_secret_name: "sremat-internal-aibroker-tls" + +# vars file for kmodels +pullSecretName: "ibm-entitlement" + +docker_server: "MAS_ICR_CP/aibroker" + +tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" +mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" +primary_storage_class: "PRIMARY_STORAGE_CLASS" + +# Bucket names +mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" +mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" +mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + +#container images +image_store: "MAS_ICR_CP/aibroker/store:1.0.2" +image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" +image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + +mas_aibroker_pipeline_steps_tag: 1.0.0 +mas_aibroker_connector_tag: 1.0.0 + +#saas +mas_aibroker_saas: "MAS_AIBROKER_SAAS" diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml new file mode 100644 index 000000000..01efb6444 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml @@ -0,0 +1,110 @@ +{{- if not (empty .Values.ibm_aibroker) }} +--- +# IBM Maximo aibroker +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: aibroker.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "050" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_aibroker.aibroker_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/114-ibm-aibroker + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + aibroker_namespace: "{{ .Values.ibm_aibroker.aibroker_namespace }}" + mas_instance_id: "{{ .Values.ibm_aibroker.mas_instance_id }}" + + mas_aibroker_minio_secret: "{{ .Values.ibm_aibroker.mas_aibroker_minio_secret }}" + mas_aibroker_mariadb_secret: "{{ .Values.ibm_aibroker.mas_aibroker_mariadb_secret }}" + mas_aibroker_db_user: "{{ .Values.ibm_aibroker.mas_aibroker_db_user }}" + mas_aibroker_db_secret_value: "{{ .Values.ibm_aibroker.mas_aibroker_db_secret_value }}" + + mas_aibroker_watsonx_secret: "{{ .Values.ibm_aibroker.mas_aibroker_watsonx_secret }}" + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker.mas_aibroker_watsonxai_project_id }}" + + s3_apikey: "{{ .Values.ibm_aibroker.s3_apikey }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker.mas_aibroker_storage_secretkey }}" + + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker.mas_aibroker_storage_port }}" + + mas_aibroker_sls_registration_key_secret: "{{ .Values.ibm_aibroker.mas_aibroker_sls_registration_key_secret }}" + mas_aibroker_db_host: "{{ .Values.ibm_aibroker.mas_aibroker_db_host }}" + mas_aibroker_db_port: "{{ .Values.ibm_aibroker.mas_aibroker_db_port }}" + mas_aibroker_db_secret_name: "{{ .Values.ibm_aibroker.mas_aibroker_db_secret_name }}" + + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_pipelines_bucket }}" + mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_tenants_bucket }}" + mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_templates_bucket }}" + + slscfg: "{{ .Values.ibm_aibroker.slscfg }}" + + mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker.mas_aibroker_dro_token_secret }}" + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker.mas_aibroker_dro_cacert_secret }}" + + drocfg: "{{ .Values.ibm_aibroker.drocfg }}" + mas_aibroker_db2_jdbc_secret: "{{ .Values.ibm_aibroker.mas_aibroker_db2_jdbc_secret }}" + jdbccfg: "{{ .Values.ibm_aibroker.jdbccfg }}" + + mas_entitlement_username: "{{ .Values.ibm_aibroker.mas_entitlement_username }}" + mas_entitlement_key: "{{ .Values.ibm_aibroker.mas_entitlement_key }}" + artifactory_username: "{{ .Values.ibm_aibroker.artifactory_username }}" + artifactory_token: "{{ .Values.ibm_aibroker.artifactory_token }}" + mas_app_channel: "{{ .Values.ibm_aibroker.mas_app_channel }}" + + mas_catalog_source: "{{ .Values.ibm_aibroker.mas_catalog_source }}" + + junitreporter: + reporter_name: "ibm-aibroker-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: aibrokerapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 9290acebc..78ed5d378 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -123,4 +123,78 @@ ibm_kmodel: image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" mas_aibroker_pipeline_steps_tag: 1.0.0 - mas_aibroker_connector_tag: 1.0.0 \ No newline at end of file + mas_aibroker_connector_tag: 1.0.0 + +ibm_aibroker: + mas_instance_id: "sremat" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + + # Minio + mas_aibroker_minio_secret: "{{ mas_app_id }}-miniocfg" + + # MariaDB + mas_aibroker_mariadb_secret: "{{ mas_app_id }}-mariadbcfg" + mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" + mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" + + # WatsonX + mas_aibroker_watsonx_secret: "{{ mas_app_id }}-watsonxcfg" + mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" + mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" + mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" + + # S3 + s3_apikey: "S3_APIKEY" + mas_aibroker_storage_accesskey: "true" + mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" + + mas_aibroker_storage_host: "true" + mas_aibroker_storage_port: "true" + + # SLS + mas_aibroker_sls_registration_key_secret: "sls-registration-key" + + mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" + mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" + mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" + + # Bucket names + mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" + mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" + mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + + slscfg: + registration_key: "registration_key" + + # DRO + mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + drocfg: + url: "{{ drocfg[1].spec.config.url }}" + ca: "ca.crt" + registration_key: "DRO_TOKEN" + + # JDBC + mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" + + jdbccfg: + username: "username" + password: "password" + url: "url" + sslenabled: "sslenabled" + ca: "ca" + + # MAS Entitlement + mas_entitlement_username: "MAS_ENTITLEMENT_USERNAME" + mas_entitlement_key: "MAS_ENTITLEMENT_KEY" + + # Development Registry Entitlement + artifactory_username: "ARTIFACTORY_USERNAME" + artifactory_token: "ARTIFACTORY_TOKEN" + + # Environment Variable: + mas_app_channel: "mas_app_channel" + + # aibroker vars + mas_catalog_source: "MAS_CATALOG_SOURCE" + \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 5dc50c500..59f3bb2b0 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -1,5 +1,4 @@ - --- # IBM Maximo Application Suite Instance Application Set apiVersion: argoproj.io/v1alpha1 @@ -9,7 +8,7 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' +# region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "099" @@ -29,117 +28,27 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -147,7 +56,7 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' + # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -165,7 +74,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-mas-instance-root + path: root-applications/ibm-aibroker-instance-root helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" @@ -183,9 +92,7 @@ spec: {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: "mas_catalog_version" - value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" + {{- end }} - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps @@ -226,4 +133,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 + revisionHistoryLimit: 1 \ No newline at end of file From 52ac7128bde6618da23cd91e6277f6e69c881d74 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:14:56 +0530 Subject: [PATCH 164/491] aibroker test --- .../Chart.yaml | 0 .../README.md | 0 .../01-aibroker-minio-secret.yaml.yaml | 2 +- .../values.yaml | 0 .../templates/01-kmodel-namespace.yaml | 7 --- .../templates/02-kmodel-secret.yaml | 31 ---------- .../templates/03-kmodel-istio.yaml | 47 ---------------- .../templates/04-kmodel-networkpolicies.yaml | 43 -------------- .../templates/05-kmodel-ca_Certificate.yaml | 56 ------------------- .../Chart.yaml | 0 .../README.md | 0 .../templates/01-kmodel-namespace.yaml | 7 +++ .../templates/02-kmodel-secret.yaml | 31 ++++++++++ .../templates/03-kmodel-istio.yaml | 47 ++++++++++++++++ .../templates/04-kmodel-networkpolicies.yaml | 43 ++++++++++++++ .../templates/05-kmodel-ca_Certificate.yaml | 56 +++++++++++++++++++ .../templates/05-kmodel-store.yaml | 0 .../templates/06-kmodel-watcher.yaml | 0 .../templates/07-kmodel-controller.yaml | 0 .../values.yaml | 0 .../ibm-aibroker-instance-root/values.yaml | 6 +- 21 files changed, 188 insertions(+), 188 deletions(-) rename instance-applications/{113-ibm-kmodels => 113-ibm-aibroker}/Chart.yaml (100%) rename instance-applications/{114-ibm-aibroker => 113-ibm-aibroker}/README.md (100%) rename instance-applications/{114-ibm-aibroker => 113-ibm-aibroker}/templates/01-aibroker-minio-secret.yaml.yaml (88%) rename instance-applications/{113-ibm-kmodels => 113-ibm-aibroker}/values.yaml (100%) delete mode 100644 instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml delete mode 100644 instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml rename instance-applications/{114-ibm-aibroker => 114-ibm-kmodels}/Chart.yaml (100%) rename instance-applications/{113-ibm-kmodels => 114-ibm-kmodels}/README.md (100%) create mode 100644 instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml create mode 100644 instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml create mode 100644 instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml create mode 100644 instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml create mode 100644 instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml rename instance-applications/{113-ibm-kmodels => 114-ibm-kmodels}/templates/05-kmodel-store.yaml (100%) rename instance-applications/{113-ibm-kmodels => 114-ibm-kmodels}/templates/06-kmodel-watcher.yaml (100%) rename instance-applications/{113-ibm-kmodels => 114-ibm-kmodels}/templates/07-kmodel-controller.yaml (100%) rename instance-applications/{114-ibm-aibroker => 114-ibm-kmodels}/values.yaml (100%) diff --git a/instance-applications/113-ibm-kmodels/Chart.yaml b/instance-applications/113-ibm-aibroker/Chart.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/Chart.yaml rename to instance-applications/113-ibm-aibroker/Chart.yaml diff --git a/instance-applications/114-ibm-aibroker/README.md b/instance-applications/113-ibm-aibroker/README.md similarity index 100% rename from instance-applications/114-ibm-aibroker/README.md rename to instance-applications/113-ibm-aibroker/README.md diff --git a/instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml similarity index 88% rename from instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml rename to instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml index a6829edb7..3f97868f8 100644 --- a/instance-applications/114-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml +++ b/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.mas_aibroker_minio_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "160" + argocd.argoproj.io/sync-wave: "140" stringData: username: "{{ .Values.mas_aibroker_storage_accesskey }}" password: "{{ .Values.mas_aibroker_storage_secretkey }}" diff --git a/instance-applications/113-ibm-kmodels/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/values.yaml rename to instance-applications/113-ibm-aibroker/values.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml deleted file mode 100644 index 1d9553fbc..000000000 --- a/instance-applications/113-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "137" \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml deleted file mode 100644 index c549d4ffb..000000000 --- a/instance-applications/113-ibm-kmodels/templates/02-kmodel-secret.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: km-s3-secret - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "138" - {{- if eq .Values.mas_aibroker_storage_provider "aws" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" - {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - {{- end }} - {{- if eq .Values.mas_aibroker_storage_ssl "false" }} - serving.kserve.io/s3-usehttps: "0" - {{- else }} - serving.kserve.io/s3-usehttps: "1" - {{- end }} - {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} - serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" - {{- end }} -stringData: - AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" - AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" - S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" - S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" - S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml deleted file mode 100644 index e9272d02a..000000000 --- a/instance-applications/113-ibm-kmodels/templates/03-kmodel-istio.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -apiVersion: security.istio.io/v1beta1 -kind: PeerAuthentication -metadata: - name: default - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "139" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -spec: - mtls: - mode: PERMISSIVE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: ds-pipeline-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "140" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - host: ds-pipeline-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 8888 - tls: - mode: DISABLE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: minio-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "141" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - host: minio-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 9000 - tls: - mode: DISABLE diff --git a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml deleted file mode 100644 index d18856881..000000000 --- a/instance-applications/113-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "142" -spec: - podSelector: - matchLabels: - kmodels: instance - part-of: kmodels - policyTypes: - - Ingress - ingress: - - ports: - - port: 3000 - - port: 8443 - ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: ds-pipelines-km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "143" -spec: - podSelector: - matchLabels: - app: ds-pipeline-instance - component: data-science-pipelines - ingress: - - ports: - - protocol: TCP - port: 8888 - from: - - podSelector: - matchLabels: - app: km-controller - policyTypes: - - Ingress diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml deleted file mode 100644 index 9d0fa60f5..000000000 --- a/instance-applications/113-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: "kmodel-ca-issuer" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "144" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -spec: - selfSigned: {} - ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: "{{ .Values.ssh_secret_name }}" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "144" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -spec: - secretName: "{{ .Values.ssh_secret_name }}" - duration: "175200h0m0s" - renewBefore: "2160h0m0s" - # keystores: - # pkcs12: - # create: true - # passwordSecretRef: - # key: password - # name: "{{ .Values.ssh_secret_name }}" - issuerRef: - name: "kmodel-ca-issuer" - kind: Issuer - isCA: true - usages: - - cert sign - - digital signature - - key encipherment - - server auth - commonName: "ca.kmodel" - subject: - countries: - - GB - streetAddresses: - - London - localities: - - London - organizationalUnits: - - IBM Maximo Application Suite kmodel \ No newline at end of file diff --git a/instance-applications/114-ibm-aibroker/Chart.yaml b/instance-applications/114-ibm-kmodels/Chart.yaml similarity index 100% rename from instance-applications/114-ibm-aibroker/Chart.yaml rename to instance-applications/114-ibm-kmodels/Chart.yaml diff --git a/instance-applications/113-ibm-kmodels/README.md b/instance-applications/114-ibm-kmodels/README.md similarity index 100% rename from instance-applications/113-ibm-kmodels/README.md rename to instance-applications/114-ibm-kmodels/README.md diff --git a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml new file mode 100644 index 000000000..e726d8c6f --- /dev/null +++ b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -0,0 +1,7 @@ +# --- +# apiVersion: v1 +# kind: Namespace +# metadata: +# name: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "137" \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml new file mode 100644 index 000000000..11369347f --- /dev/null +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -0,0 +1,31 @@ +# --- +# apiVersion: v1 +# kind: Secret +# type: Opaque +# metadata: +# name: km-s3-secret +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "138" +# {{- if eq .Values.mas_aibroker_storage_provider "aws" }} +# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" +# {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} +# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" +# {{- end }} +# {{- if eq .Values.mas_aibroker_storage_ssl "false" }} +# serving.kserve.io/s3-usehttps: "0" +# {{- else }} +# serving.kserve.io/s3-usehttps: "1" +# {{- end }} +# {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} +# serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" +# {{- end }} +# stringData: +# AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" +# AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" +# S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" +# S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" +# S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" +# S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" +# S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" +# S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml new file mode 100644 index 000000000..4b30cd169 --- /dev/null +++ b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -0,0 +1,47 @@ +# --- +# apiVersion: security.istio.io/v1beta1 +# kind: PeerAuthentication +# metadata: +# name: default +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "139" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +# spec: +# mtls: +# mode: PERMISSIVE +# --- +# apiVersion: networking.istio.io/v1beta1 +# kind: DestinationRule +# metadata: +# name: ds-pipeline-instance +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "140" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# host: ds-pipeline-instance.opendatahub.svc.cluster.local +# trafficPolicy: +# portLevelSettings: +# - port: +# number: 8888 +# tls: +# mode: DISABLE +# --- +# apiVersion: networking.istio.io/v1beta1 +# kind: DestinationRule +# metadata: +# name: minio-instance +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "141" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# host: minio-instance.opendatahub.svc.cluster.local +# trafficPolicy: +# portLevelSettings: +# - port: +# number: 9000 +# tls: +# mode: DISABLE diff --git a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml new file mode 100644 index 000000000..c52777c56 --- /dev/null +++ b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -0,0 +1,43 @@ +# --- +# apiVersion: networking.k8s.io/v1 +# kind: NetworkPolicy +# metadata: +# name: km-instance +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "142" +# spec: +# podSelector: +# matchLabels: +# kmodels: instance +# part-of: kmodels +# policyTypes: +# - Ingress +# ingress: +# - ports: +# - port: 3000 +# - port: 8443 + +# --- +# apiVersion: networking.k8s.io/v1 +# kind: NetworkPolicy +# metadata: +# name: ds-pipelines-km-instance +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "143" +# spec: +# podSelector: +# matchLabels: +# app: ds-pipeline-instance +# component: data-science-pipelines +# ingress: +# - ports: +# - protocol: TCP +# port: 8888 +# from: +# - podSelector: +# matchLabels: +# app: km-controller +# policyTypes: +# - Ingress diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml new file mode 100644 index 000000000..a32fa1f35 --- /dev/null +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -0,0 +1,56 @@ +# --- +# apiVersion: cert-manager.io/v1 +# kind: Issuer +# metadata: +# name: "kmodel-ca-issuer" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "144" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# selfSigned: {} + +# --- +# apiVersion: cert-manager.io/v1 +# kind: Certificate +# metadata: +# name: "{{ .Values.ssh_secret_name }}" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "144" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# secretName: "{{ .Values.ssh_secret_name }}" +# duration: "175200h0m0s" +# renewBefore: "2160h0m0s" +# # keystores: +# # pkcs12: +# # create: true +# # passwordSecretRef: +# # key: password +# # name: "{{ .Values.ssh_secret_name }}" +# issuerRef: +# name: "kmodel-ca-issuer" +# kind: Issuer +# isCA: true +# usages: +# - cert sign +# - digital signature +# - key encipherment +# - server auth +# commonName: "ca.kmodel" +# subject: +# countries: +# - GB +# streetAddresses: +# - London +# localities: +# - London +# organizationalUnits: +# - IBM Maximo Application Suite kmodel \ No newline at end of file diff --git a/instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/05-kmodel-store.yaml rename to instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/06-kmodel-watcher.yaml rename to instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml diff --git a/instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml similarity index 100% rename from instance-applications/113-ibm-kmodels/templates/07-kmodel-controller.yaml rename to instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml diff --git a/instance-applications/114-ibm-aibroker/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml similarity index 100% rename from instance-applications/114-ibm-aibroker/values.yaml rename to instance-applications/114-ibm-kmodels/values.yaml diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 78ed5d378..eec88ecdf 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -128,10 +128,10 @@ ibm_kmodel: ibm_aibroker: mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - + mas_aibroker_minio_secret: "minio_secret" # Minio - mas_aibroker_minio_secret: "{{ mas_app_id }}-miniocfg" - + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" # MariaDB mas_aibroker_mariadb_secret: "{{ mas_app_id }}-mariadbcfg" mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" From b270e301b7f3297b1748a98ad05c32751aceda1b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:38:47 +0530 Subject: [PATCH 165/491] update path --- .../templates/050-ibm-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml index 01efb6444..7208b97de 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml @@ -27,7 +27,7 @@ spec: namespace: "{{ .Values.ibm_aibroker.aibroker_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/114-ibm-aibroker + path: instance-applications/113-ibm-aibroker targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} From 9945759909cbd341cfcd66ad35fe7deb38064fc1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:43:12 +0530 Subject: [PATCH 166/491] update sync wave --- .../{050-ibm-aibroker-app.yaml => 040-ibm-aibroker-app.yaml} | 2 +- .../{040-ibm-kmodels-app.yaml => 050-ibm-kmodels-app.yaml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename root-applications/ibm-aibroker-instance-root/templates/{050-ibm-aibroker-app.yaml => 040-ibm-aibroker-app.yaml} (99%) rename root-applications/ibm-aibroker-instance-root/templates/{040-ibm-kmodels-app.yaml => 050-ibm-kmodels-app.yaml} (99%) diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml similarity index 99% rename from root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml rename to root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 7208b97de..a9a9a1b99 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -12,7 +12,7 @@ metadata: cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: - argocd.argoproj.io/sync-wave: "050" + argocd.argoproj.io/sync-wave: "040" healthCheckTimeout: "1800" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml similarity index 99% rename from root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml rename to root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index 96a455712..cd21c9aea 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -12,7 +12,7 @@ metadata: cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: - argocd.argoproj.io/sync-wave: "040" + argocd.argoproj.io/sync-wave: "050" healthCheckTimeout: "1800" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} From 48697d8da64be1acd533306b05a6720561262845 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:47:39 +0530 Subject: [PATCH 167/491] commented kmodel --- .../templates/099-instance-appset.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 59f3bb2b0..ba1adb747 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -39,11 +39,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + # - git: + # repoURL: "{{ .Values.generator.repo_url }}" + # revision: "{{ .Values.generator.revision }}" + # files: + # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 11953a5457eba7a96123a251715426379f1ebc5c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:49:57 +0530 Subject: [PATCH 168/491] kmodel commented argocd --- .../templates/050-ibm-kmodels-app.yaml | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index cd21c9aea..7d68d0ce9 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -1,89 +1,89 @@ -{{- if not (empty .Values.ibm_kmodel) }} ---- -# IBM Maximo Kmodels -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "050" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/113-ibm-kmodels - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" - run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" - aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" - mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" - ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" - pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" - docker_server: "{{ .Values.ibm_kmodel.docker_server }}" - tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" - primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" - mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" - mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" - mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" - image_store: "{{ .Values.ibm_kmodel.image_store }}" - image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" - image_controller: "{{ .Values.ibm_kmodel.image_controller }}" - mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" - mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" +# {{- if not (empty .Values.ibm_kmodel) }} +# --- +# # IBM Maximo Kmodels +# apiVersion: argoproj.io/v1alpha1 +# kind: Application +# metadata: +# name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} +# namespace: {{ .Values.argo.namespace }} +# labels: +# environment: '{{ .Values.account.id }}' +# region: '{{ .Values.region.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ .Values.instance.id }}' +# annotations: +# argocd.argoproj.io/sync-wave: "050" +# healthCheckTimeout: "1800" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} +# {{- end }} +# finalizers: +# - resources-finalizer.argocd.argoproj.io +# spec: +# project: "{{ .Values.argo.projects.apps }}" +# destination: +# server: {{ .Values.cluster.url }} +# namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" +# source: +# repoURL: "{{ .Values.source.repo_url }}" +# path: instance-applications/113-ibm-kmodels +# targetRevision: "{{ .Values.source.revision }}" +# plugin: +# name: {{ .Values.avp.name }} +# env: +# - name: {{ .Values.avp.values_varname }} +# value: | +# openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" +# run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" +# aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" +# mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" +# mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" +# mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" +# mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" +# mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" +# mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" +# mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" +# ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" +# pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" +# docker_server: "{{ .Values.ibm_kmodel.docker_server }}" +# tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" +# mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" +# primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" +# mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" +# mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" +# mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" +# image_store: "{{ .Values.ibm_kmodel.image_store }}" +# image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" +# image_controller: "{{ .Values.ibm_kmodel.image_controller }}" +# mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" +# mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" - junitreporter: - reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: kmodelapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} +# junitreporter: +# reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" +# cluster_id: "{{ .Values.cluster.id }}" +# devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" +# devops_build_number: "{{ .Values.devops.build_number }}" +# gitops_version: "{{ .Values.source.revision }}" +# - name: ARGOCD_APP_NAME +# value: kmodelapp +# {{- if not (empty .Values.avp.secret) }} +# - name: AVP_SECRET +# value: {{ .Values.avp.secret }} +# {{- end }} +# syncPolicy: +# automated: +# {{- if .Values.auto_delete }} +# prune: true +# {{- end }} +# selfHeal: true +# retry: +# limit: 20 +# syncOptions: +# - CreateNamespace=true +# managedNamespaceMetadata: +# labels: +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 8 }} +# {{- end }} +# {{- end }} From 48a0b7d98e3ca146ef8e1ab7d1dd7bbc13a48ae1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 12:55:20 +0530 Subject: [PATCH 169/491] mariadb secrete --- .../templates/02-aibroker-mariadb-secret.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml new file mode 100644 index 000000000..e44455a2b --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml @@ -0,0 +1,12 @@ +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_mariadb_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "141" +stringData: + username: "{{ .Values.mas_aibroker_db_user }}" + password: "{{ .Values.mas_aibroker_db_secret_value }}" +type: Opaque \ No newline at end of file From 213fdcaff4da6de2bdd41380b0a4a52ddb7b83bf Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 13:02:18 +0530 Subject: [PATCH 170/491] update values --- root-applications/ibm-aibroker-instance-root/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index eec88ecdf..ade750cbd 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -133,9 +133,9 @@ ibm_aibroker: mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" # MariaDB - mas_aibroker_mariadb_secret: "{{ mas_app_id }}-mariadbcfg" - mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" - mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" + mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" # WatsonX mas_aibroker_watsonx_secret: "{{ mas_app_id }}-watsonxcfg" From 90a7f17e2b0bda6ef389ec5b6f4f4717bc05eb9b Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 11 Apr 2025 14:17:49 +0530 Subject: [PATCH 171/491] values updated --- .../113-ibm-aibroker/values.yaml | 99 +++++++++++---- .../templates/099-instance-appset.yaml | 118 ++++++++++++++++-- 2 files changed, 177 insertions(+), 40 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 7efdc325f..e64853baa 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,41 +1,86 @@ --- -run_sync_hooks: true +mas_instance_id: "MAS_INSTANCE_ID" +aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' -aibroker_namespace: "mas-sremat-aibroker" +# Minio +mas_aibroker_minio_secret: "{{ mas_app_id }}-miniocfg" -mas_aibroker_storage_provider: "aws" -mas_aibroker_storage_ssl: "true" +# MariaDB +mas_aibroker_mariadb_secret: "{{ mas_app_id }}-mariadbcfg" +mas_aibroker_db_user: "MAS_AIBROKER_DB_USER" +mas_aibroker_db_secret_value: "MAS_AIBROKER_DB_SECRET_VALUE" -# following are the variable need to injected via environment variable -mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" -mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" -mas_aibroker_storage_host: "mas_aibroker_storage_host" -mas_aibroker_storage_port: "mas_aibroker_storage_port" -mas_aibroker_storage_region: "mas_aibroker_storage_region" +# WatsonX +mas_aibroker_watsonx_secret: "{{ mas_app_id }}-watsonxcfg" +mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" +mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" +mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" -ssh_secret_name: "sremat-internal-aibroker-tls" -# vars file for kmodels -pullSecretName: "ibm-entitlement" +# S3 +s3_apikey: "S3_APIKEY" +mas_aibroker_storage_accesskey: "true" +mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" -docker_server: "MAS_ICR_CP/aibroker" +mas_aibroker_storage_host: "true" +mas_aibroker_storage_port: "true" -tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" -mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" -primary_storage_class: "PRIMARY_STORAGE_CLASS" +# SLS +mas_aibroker_sls_registration_key_secret: "sls-registration-key" + + +mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" +mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" +mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" # Bucket names -mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" +mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" -mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" +mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + +slscfg: + registration_key: "registration_key" + +# DRO +mas_aibroker_dro_token_secret: "dro-token" +mas_aibroker_dro_cacert_secret: "dro-certificates" +drocfg: + url: "{{ drocfg[1].spec.config.url }}" + ca: "ca.crt" + registration_key: "DRO_TOKEN" + +# JDBC +mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" + +jdbccfg: + username: "username" + password: "password" + url: "url" + sslenabled: "sslenabled" + ca: "ca" + + +# MAS Entitlement +mas_entitlement_username: "MAS_ENTITLEMENT_USERNAME" +mas_entitlement_key: "MAS_ENTITLEMENT_KEY" + +# Development Registry Entitlement +artifactory_username: "ARTIFACTORY_USERNAME" +artifactory_token: "ARTIFACTORY_TOKEN" + +# Environment Variable: +mas_app_channel: "mas_app_channel" + +# aibroker vars +mas_catalog_source: "MAS_CATALOG_SOURCE" -#container images -image_store: "MAS_ICR_CP/aibroker/store:1.0.2" -image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" -image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" +# Source container registry +# ----------------------------------------------------------------------------- +mas_icr_cp: "cp.icr.io/cp" +mas_icr_cpopen: "icr.io/cpopen" -mas_aibroker_pipeline_steps_tag: 1.0.0 -mas_aibroker_connector_tag: 1.0.0 +cluster_domain: "_cluster_dns.resources[0].spec.baseDomain" +in_saas_env: "INSAASENV" -#saas -mas_aibroker_saas: "MAS_AIBROKER_SAAS" +#TENANT +mas_aibroker_tenant_name: "aibroker-{{ mas_aibroker_tenant_name }}" \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index ba1adb747..99efe4fdc 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -8,7 +8,7 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' annotations: argocd.argoproj.io/sync-wave: "099" @@ -28,27 +28,117 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-odh-install.yaml" - # - git: - # repoURL: "{{ .Values.generator.repo_url }}" - # revision: "{{ .Values.generator.revision }}" - # files: - # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-sls.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-workspaces.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-suite-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-db2u-databases.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-manage-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-iot-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-assist-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-facilities-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-visualinspection-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-optimizer-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-monitor-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-predict-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-health-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-masapp-configs.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-cp4d-services-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wsl.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-wml.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spark.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-spss.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -56,7 +146,7 @@ spec: name: "instance.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}" labels: environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' + region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.instance.id}}` }}' {{- if .Values.custom_labels }} @@ -74,7 +164,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root + path: root-applications/ibm-mas-instance-root helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" @@ -92,7 +182,9 @@ spec: {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - name: "notifications.slack_channel_id" value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} + {{- end }} + - name: "mas_catalog_version" + value: "{{ .Values.ibm_operator_catalog.mas_catalog_version }}" - name: argo.projects.rootapps value: "{{ .Values.argo.projects.rootapps }}" - name: argo.projects.apps From d78720d744ab69c4712b70e423ff70901d73c085 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 14:24:39 +0530 Subject: [PATCH 172/491] Update 099-aibroker-instance-appset.yaml --- .../templates/099-aibroker-instance-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 25e51675f..d73fba920 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -43,7 +43,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 3c66856789c079e2c13aeae1159958d1f3e4c983 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 14:30:29 +0530 Subject: [PATCH 173/491] Create 03-aibroker-watsonx-apikey-secret.yaml --- .../templates/03-aibroker-watsonx-apikey-secret.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml new file mode 100644 index 000000000..cb81ee4ec --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml @@ -0,0 +1,10 @@ +api_version: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_watsonx_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "134" +type: Opaque +stringData: + api_key: "{{ .Values.mas_aibroker_storage_accesskey }}" \ No newline at end of file From bd42a61831bfc2723ed78c075008ac2cca5b3017 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 14:32:09 +0530 Subject: [PATCH 174/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index ade750cbd..fae7f7bc1 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -138,7 +138,7 @@ ibm_aibroker: mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" # WatsonX - mas_aibroker_watsonx_secret: "{{ mas_app_id }}-watsonxcfg" + mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" From 26c9b480a45db72ca7a8e4ac4ddcc2c8ef64a164 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Apr 2025 14:58:36 +0530 Subject: [PATCH 175/491] sls --- .../templates/03-aibroker-watsonx-apikey-secret.yaml | 2 +- .../templates/04-aibroker-sls-tenant-details.yaml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml index cb81ee4ec..2d68da4f4 100644 --- a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml @@ -4,7 +4,7 @@ metadata: name: "{{ .Values.mas_aibroker_watsonx_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "134" + argocd.argoproj.io/sync-wave: "142" type: Opaque stringData: api_key: "{{ .Values.mas_aibroker_storage_accesskey }}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml new file mode 100644 index 000000000..ec46cd895 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml @@ -0,0 +1,11 @@ +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "143" +stringData: + SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" +type: Opaque \ No newline at end of file From 58efc8168cba9fe33706024c393f4627ae9767d7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 16 Apr 2025 15:15:47 +0530 Subject: [PATCH 176/491] intallplan update --- .../112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml index a95f6ef11..5d84a8cfc 100644 --- a/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml +++ b/instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml @@ -8,6 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "118" spec: channel: stable + installPlanApproval: Automatic name: servicemeshoperator source: redhat-operators sourceNamespace: openshift-marketplace From 7849baf2792e62c1ebe8c37cb6ab72c793193326 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 16 Apr 2025 15:35:50 +0530 Subject: [PATCH 177/491] odh namespace update --- .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 3a5c0f959..7d67b0c8b 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -3,7 +3,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: opendatahub-operator - namespace: openshift-operators + namespace: opendatahub annotations: argocd.argoproj.io/sync-wave: "126" spec: From 8b830a679ba244792279f9f74b6b7a6218d3681c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 16 Apr 2025 16:09:18 +0530 Subject: [PATCH 178/491] job namespace update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- instance-applications/112-ibm-odh/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index a0bfad0a4..c5fdfb206 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -59,7 +59,7 @@ spec: memory: 64Mi env: - name: ODH_NAMESPACE - value: "{{ .Values.openshift_namespace }}" + value: "{{ .Values.odh_namespace }}" - name: ODH_VERSION value: "{{ .Values.odh_operator_version }}" command: diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index b720a0cd5..31dd290cd 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -2,7 +2,7 @@ openshift_namespace: "openshift-operators" odh_pipeline_channel: "latest" odh_pipeline_installplan: "Automatic" - +odh_namespace: "opendatahub" service_mesh_namespace: "openshift-operators" service_mesh_channel: "stable" service_mesh_catalog_source: "redhat-operators" @@ -11,7 +11,7 @@ serverless_channel: "stable" authorino_catalog_source: "community-operators" odh_channel: "fast" odh_catalog_source: "community-operators" -odh_operator_version: "opendatahub-operator.v2.11.1" +odh_operator_version: "opendatahub-operator.v2.19.0" namespace: "openshift-operators" channel: "latest" From 04c6e7d73691ec59e7f595707807d471a5bf5019 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 12:24:04 +0530 Subject: [PATCH 179/491] namespace update opendatahub --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index c5fdfb206..b84569bca 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: installplan-approver - namespace: {{ .Values.openshift_namespace }} + namespace: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "123" --- @@ -11,7 +11,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: installplan-approver - namespace: {{ .Values.openshift_namespace }} + namespace: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "124" rules: @@ -23,7 +23,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: installplan-approver - namespace: {{ .Values.openshift_namespace }} + namespace: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "125" roleRef: @@ -33,13 +33,13 @@ roleRef: subjects: - kind: ServiceAccount name: installplan-approver - namespace: {{ .Values.openshift_namespace }} + namespace: {{ .Values.odh_namespace }} --- apiVersion: batch/v1 kind: Job metadata: name: installplanpatch-{{ .Values.odh_operator_version }} - namespace: {{ .Values.openshift_namespace }} + namespace: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "126" spec: From 8776978b7113416e4c50a13066263833f8b8f8e3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 13:48:08 +0530 Subject: [PATCH 180/491] added operator group --- .../templates/05-odh-operator-subcription.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 7d67b0c8b..9c42510b2 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -1,3 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: opendatahub-operator-group + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "126" +spec: + targetNamespaces: + - opendatahub + --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription From 4646be56b2631b0fb578bf864b8e68103282da28 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 13:57:01 +0530 Subject: [PATCH 181/491] update odh --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- .../templates/05-odh-operator-subcription.yaml | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index b84569bca..ae687620e 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -41,7 +41,7 @@ metadata: name: installplanpatch-{{ .Values.odh_operator_version }} namespace: {{ .Values.odh_namespace }} annotations: - argocd.argoproj.io/sync-wave: "126" + argocd.argoproj.io/sync-wave: "127" spec: template: spec: diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 9c42510b2..7030a30d8 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -1,4 +1,11 @@ --- +apiVersion: v1 +kind: Namespace +metadata: + name: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "126" +--- apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: @@ -6,10 +13,6 @@ metadata: namespace: opendatahub annotations: argocd.argoproj.io/sync-wave: "126" -spec: - targetNamespaces: - - opendatahub - --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription @@ -17,7 +20,7 @@ metadata: name: opendatahub-operator namespace: opendatahub annotations: - argocd.argoproj.io/sync-wave: "126" + argocd.argoproj.io/sync-wave: "127" spec: channel: fast installPlanApproval: Manual From 6473ecf266326ffb1ee43e331bc87c10d97c367d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 13:59:17 +0530 Subject: [PATCH 182/491] odh update --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 7 +++++++ .../112-ibm-odh/templates/05-odh-operator-subcription.yaml | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index ae687620e..b6b85db6d 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,5 +1,12 @@ --- apiVersion: v1 +kind: Namespace +metadata: + name: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "122" +--- +apiVersion: v1 kind: ServiceAccount metadata: name: installplan-approver diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index 7030a30d8..b7ff50b7e 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -1,11 +1,4 @@ --- -apiVersion: v1 -kind: Namespace -metadata: - name: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "126" ---- apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: From f0a79f49a5e33c43e7ce170604fa584923771ae0 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 14:22:12 +0530 Subject: [PATCH 183/491] odh namespace update --- .../112-ibm-odh/templates/06-odh-namespace.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml index c317d9f42..5e49909bb 100644 --- a/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml +++ b/instance-applications/112-ibm-odh/templates/06-odh-namespace.yaml @@ -6,10 +6,3 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "128" ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.odh_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "128" \ No newline at end of file From 6207d0c8d1dab56d7323edb2fa8869e28f11be57 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Apr 2025 15:20:53 +0530 Subject: [PATCH 184/491] Update 04-aibroker-sls-tenant-details.yaml --- .../04-aibroker-sls-tenant-details.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml index ec46cd895..7c503bc4b 100644 --- a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml +++ b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml @@ -1,11 +1,11 @@ ---- -kind: Secret -apiVersion: v1 -metadata: - name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "143" -stringData: - SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" -type: Opaque \ No newline at end of file +# --- +# kind: Secret +# apiVersion: v1 +# metadata: +# name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "143" +# stringData: +# SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" +# type: Opaque \ No newline at end of file From df26df119b67bc030581bf6137b2c9f55f017499 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 18 Apr 2025 15:48:24 +0530 Subject: [PATCH 185/491] Update Chart.yaml --- instance-applications/113-ibm-aibroker/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/Chart.yaml b/instance-applications/113-ibm-aibroker/Chart.yaml index 21648d971..71dc3d654 100644 --- a/instance-applications/113-ibm-aibroker/Chart.yaml +++ b/instance-applications/113-ibm-aibroker/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: ibm-kmodels -description: IBM KMODELS +name: ibm-aibroker +description: IBM AIBROKER type: application version: 1.0.0 From c2823813db91eeb975ea2538d9ebfd68959e1b26 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 18 Apr 2025 15:53:39 +0530 Subject: [PATCH 186/491] Delete 04-aibroker-sls-tenant-details.yaml --- .../templates/04-aibroker-sls-tenant-details.yaml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml deleted file mode 100644 index 7c503bc4b..000000000 --- a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# --- -# kind: Secret -# apiVersion: v1 -# metadata: -# name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "143" -# stringData: -# SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" -# type: Opaque \ No newline at end of file From 99981e9d34e743b272ac9043a6e87ceb21ca0b10 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 18 Apr 2025 16:19:29 +0530 Subject: [PATCH 187/491] Update 03-aibroker-watsonx-apikey-secret.yaml --- .../templates/03-aibroker-watsonx-apikey-secret.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml index 2d68da4f4..23c6b68ec 100644 --- a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml @@ -1,4 +1,5 @@ -api_version: v1 +--- +apiVersion: v1 kind: Secret metadata: name: "{{ .Values.mas_aibroker_watsonx_secret }}" From f15ccf6063518f96719c1969309eff470e357392 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 18 Apr 2025 16:23:51 +0530 Subject: [PATCH 188/491] Revert "Delete 04-aibroker-sls-tenant-details.yaml" This reverts commit c2823813db91eeb975ea2538d9ebfd68959e1b26. --- .../templates/04-aibroker-sls-tenant-details.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml new file mode 100644 index 000000000..7c503bc4b --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml @@ -0,0 +1,11 @@ +# --- +# kind: Secret +# apiVersion: v1 +# metadata: +# name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "143" +# stringData: +# SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" +# type: Opaque \ No newline at end of file From d7402ea2bf2be9bd1d65c529b473597ba90026e1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 10:16:59 +0530 Subject: [PATCH 189/491] adding 04 sls config --- .../04-aibroker-sls-tenant-details.yaml | 22 +++++++++---------- .../113-ibm-aibroker/values.yaml | 3 +-- .../templates/040-ibm-aibroker-app.yaml | 2 ++ .../ibm-aibroker-instance-root/values.yaml | 3 +-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml index 7c503bc4b..2b677196f 100644 --- a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml +++ b/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml @@ -1,11 +1,11 @@ -# --- -# kind: Secret -# apiVersion: v1 -# metadata: -# name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "143" -# stringData: -# SLS_REGISTRATION_KEY: "{{ .Values.slscfg.registration_key }}" -# type: Opaque \ No newline at end of file +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "143" +stringData: + SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" +type: Opaque \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index e64853baa..0755d31df 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -38,8 +38,7 @@ mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" -slscfg: - registration_key: "registration_key" +slscfg_registration_key: "slscfg_registration_key" # DRO mas_aibroker_dro_token_secret: "dro-token" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index a9a9a1b99..9ca5da97b 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -55,6 +55,8 @@ spec: mas_aibroker_storage_port: "{{ .Values.ibm_aibroker.mas_aibroker_storage_port }}" mas_aibroker_sls_registration_key_secret: "{{ .Values.ibm_aibroker.mas_aibroker_sls_registration_key_secret }}" + slscfg_registration_key: "{{ .Values.ibm_aibroker.slscfg_registration_key }}" + mas_aibroker_db_host: "{{ .Values.ibm_aibroker.mas_aibroker_db_host }}" mas_aibroker_db_port: "{{ .Values.ibm_aibroker.mas_aibroker_db_port }}" mas_aibroker_db_secret_name: "{{ .Values.ibm_aibroker.mas_aibroker_db_secret_name }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index fae7f7bc1..920c352c8 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -163,8 +163,7 @@ ibm_aibroker: mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" - slscfg: - registration_key: "registration_key" + slscfg_registration_key: "slscfg_registration_key" # DRO mas_aibroker_dro_token_secret: "dro-token" From 911a54521ed44f956e68798ab693c6ab8b690c2d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 11:11:12 +0530 Subject: [PATCH 190/491] added values for the dro ca and regi. key --- .../templates/06-aibroker-dro.yaml | 23 +++++++++++++++++++ .../113-ibm-aibroker/values.yaml | 5 ++-- .../templates/040-ibm-aibroker-app.yaml | 6 ++--- .../ibm-aibroker-instance-root/values.yaml | 6 +++-- 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml new file mode 100644 index 000000000..85cb53750 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -0,0 +1,23 @@ +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_dro_cacert_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "144" +stringData: + ca.crt: "{{ .Values.drocfg_ca }}" +type: Opaque + +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_dro_token_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "145" +stringData: + DRO_TOKEN: "{{ .Values.drocfg_registration_key }}" +type: Opaque \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 0755d31df..f22ecebab 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -43,10 +43,11 @@ slscfg_registration_key: "slscfg_registration_key" # DRO mas_aibroker_dro_token_secret: "dro-token" mas_aibroker_dro_cacert_secret: "dro-certificates" + +drocfg_ca: "ca.crt" +drocfg_registration_key: "DRO_TOKEN" drocfg: url: "{{ drocfg[1].spec.config.url }}" - ca: "ca.crt" - registration_key: "DRO_TOKEN" # JDBC mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 9ca5da97b..3b02742ee 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -64,13 +64,13 @@ spec: mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_pipelines_bucket }}" mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_tenants_bucket }}" mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_aibroker.mas_aibroker_storage_templates_bucket }}" - - slscfg: "{{ .Values.ibm_aibroker.slscfg }}" mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker.mas_aibroker_dro_token_secret }}" mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker.mas_aibroker_dro_cacert_secret }}" - drocfg: "{{ .Values.ibm_aibroker.drocfg }}" + drocfg_ca: "{{ .Values.ibm_aibroker.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" + mas_aibroker_db2_jdbc_secret: "{{ .Values.ibm_aibroker.mas_aibroker_db2_jdbc_secret }}" jdbccfg: "{{ .Values.ibm_aibroker.jdbccfg }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 920c352c8..dc96c7e77 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -168,10 +168,12 @@ ibm_aibroker: # DRO mas_aibroker_dro_token_secret: "dro-token" mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" drocfg: url: "{{ drocfg[1].spec.config.url }}" - ca: "ca.crt" - registration_key: "DRO_TOKEN" + # JDBC mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" From 5f977df08ffcfb9a504fb25a1b5047d4c6969eff Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 16:41:04 +0530 Subject: [PATCH 191/491] jdbc related code added. --- .../templates/07-aibroker-jdbc.yaml Copy path | 15 +++++++++++++++ .../113-ibm-aibroker/values.yaml | 11 +++++------ .../templates/040-ibm-aibroker-app.yaml | 7 ++++++- .../ibm-aibroker-instance-root/values.yaml | 11 +++++------ 4 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path new file mode 100644 index 000000000..e34a07ecd --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path @@ -0,0 +1,15 @@ +--- +kind: Secret +apiVersion: v1 +metadata: + name: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "145" +stringData: + username: "{{ .Values.jdbccfg_username }}" + password: "{{ .Values.jdbccfg_password }}" + url: "{{ .Values.jdbccfg_url }}" + sslenabled: "{{ .Values.jdbccfg_sslenabled }}" + certificate: "{{ .Values.jdbccfg_ca }}" +type: Opaque \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index f22ecebab..a2eaca635 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -52,12 +52,11 @@ drocfg: # JDBC mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" -jdbccfg: - username: "username" - password: "password" - url: "url" - sslenabled: "sslenabled" - ca: "ca" +jdbccfg_username: "username" +jdbccfg_password: "password" +jdbccfg_url: "url" +jdbccfg_sslenabled: "sslenabled" +jdbccfg_ca: "ca" # MAS Entitlement diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 3b02742ee..1046e39ad 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -72,7 +72,12 @@ spec: drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" mas_aibroker_db2_jdbc_secret: "{{ .Values.ibm_aibroker.mas_aibroker_db2_jdbc_secret }}" - jdbccfg: "{{ .Values.ibm_aibroker.jdbccfg }}" + + jdbccfg_username: "{{ .Values.ibm_aibroker.jdbccfg_username }}" + jdbccfg_password: "{{ .Values.ibm_aibroker.jdbccfg_password }}" + jdbccfg_url: "{{ .Values.ibm_aibroker.jdbccfg_url }}" + jdbccfg_sslenabled: "{{ .Values.ibm_aibroker.jdbccfg_sslenabled }}" + jdbccfg_ca: "{{ .Values.ibm_aibroker.jdbccfg_ca }}" mas_entitlement_username: "{{ .Values.ibm_aibroker.mas_entitlement_username }}" mas_entitlement_key: "{{ .Values.ibm_aibroker.mas_entitlement_key }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index dc96c7e77..cc17c5cdc 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -178,12 +178,11 @@ ibm_aibroker: # JDBC mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" - jdbccfg: - username: "username" - password: "password" - url: "url" - sslenabled: "sslenabled" - ca: "ca" + jdbccfg_username: "jdbccfg_username" + jdbccfg_password: "jdbccfg_password" + jdbccfg_url: "jdbccfg_url" + jdbccfg_sslenabled: "jdbccfg_sslenabled" + jdbccfg_ca: "jdbccfg_ca" # MAS Entitlement mas_entitlement_username: "MAS_ENTITLEMENT_USERNAME" From 1f00db8101165d7b01781b50cb5e492fa46e2e00 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 16:44:28 +0530 Subject: [PATCH 192/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index a2eaca635..02691b6be 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -50,7 +50,7 @@ drocfg: url: "{{ drocfg[1].spec.config.url }}" # JDBC -mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" +mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" jdbccfg_username: "username" jdbccfg_password: "password" From de078720a919039edd24baf826785616448eedd1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 16:48:19 +0530 Subject: [PATCH 193/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index cc17c5cdc..d318c9fab 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -176,7 +176,7 @@ ibm_aibroker: # JDBC - mas_aibroker_db2_jdbc_secret: "{{ mas_app_id }}-jdbccfg-binding" + mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" jdbccfg_username: "jdbccfg_username" jdbccfg_password: "jdbccfg_password" From e5f30bc087bbacd976f73e87e56bdbc2ba0a09aa Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 16:58:49 +0530 Subject: [PATCH 194/491] Create 08-aibroker-operatorGroup.yaml --- .../templates/08-aibroker-operatorGroup.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml new file mode 100644 index 000000000..f7688b8e8 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: "{{ .Values.aibroker_namespace }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "146" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + targetNamespaces: + - "{{ .Values.aibroker_namespace }}" \ No newline at end of file From c2e9eafa1121ec38b38ae202f4f552f15a0ec3e9 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 17:24:15 +0530 Subject: [PATCH 195/491] added ibm-entitlement code --- .../templates/08-aibroker-secret.yaml | 13 +++++++++++++ instance-applications/113-ibm-aibroker/values.yaml | 2 +- .../ibm-aibroker-instance-root/values.yaml | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml new file mode 100644 index 000000000..1b0a6c052 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Secret +metadata: + name: ibm-entitlement + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "147" +type: Opaque +stringData: + icr_username: "{{ .Values.mas_entitlement_username }}" + icr_password: "{{ .Values.mas_entitlement_key}}" + artifactory_username: "{{ .Values.artifactory_username}}" + artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 02691b6be..eb86d9a3b 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -60,7 +60,7 @@ jdbccfg_ca: "ca" # MAS Entitlement -mas_entitlement_username: "MAS_ENTITLEMENT_USERNAME" +mas_entitlement_username: "cp" mas_entitlement_key: "MAS_ENTITLEMENT_KEY" # Development Registry Entitlement diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d318c9fab..ddb980e47 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -185,12 +185,12 @@ ibm_aibroker: jdbccfg_ca: "jdbccfg_ca" # MAS Entitlement - mas_entitlement_username: "MAS_ENTITLEMENT_USERNAME" - mas_entitlement_key: "MAS_ENTITLEMENT_KEY" + mas_entitlement_username: "cp" + mas_entitlement_key: "mas_entitlement_key" # Development Registry Entitlement - artifactory_username: "ARTIFACTORY_USERNAME" - artifactory_token: "ARTIFACTORY_TOKEN" + artifactory_username: "artifactory_username" + artifactory_token: "artifactory_token" # Environment Variable: mas_app_channel: "mas_app_channel" From 0dfbcc43b3cd05c75b3b39d0a920fd9c6f22d2f9 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 17:45:51 +0530 Subject: [PATCH 196/491] subscription added --- .../templates/08-aibroker-subscription.yaml | 15 +++++++++++++++ .../ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml new file mode 100644 index 000000000..36d8dd66f --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: ibm-mas-aibroker + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "148" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + channel: "{{ .Values.mas_app_channel }}" + installPlanApproval: Automatic + name: ibm-mas-aibroker + source: "{{ .Values.mas_catalog_source }}" + sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index ddb980e47..213ba78b6 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -196,5 +196,5 @@ ibm_aibroker: mas_app_channel: "mas_app_channel" # aibroker vars - mas_catalog_source: "MAS_CATALOG_SOURCE" + mas_catalog_source: "mas_catalog_source" \ No newline at end of file From c08ba898194ad2e96e70504e9c82f65711ac8ee4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 21 Apr 2025 18:05:33 +0530 Subject: [PATCH 197/491] Update 08-aibroker-operatorGroup.yaml --- .../113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml index f7688b8e8..21a39eb5f 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.aibroker_namespace }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "146" + argocd.argoproj.io/sync-wave: "147" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: targetNamespaces: From 232f0dabb4af3bb64082e8fd64f95a3252285e7b Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 11:13:58 +0530 Subject: [PATCH 198/491] sync wave changed and updated values --- .../113-ibm-aibroker/templates/08-aibroker-secret.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml index 1b0a6c052..935b88700 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml @@ -4,7 +4,7 @@ metadata: name: ibm-entitlement namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "147" + argocd.argoproj.io/sync-wave: "146" type: Opaque stringData: icr_username: "{{ .Values.mas_entitlement_username }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 213ba78b6..d5e2db1b3 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -185,7 +185,8 @@ ibm_aibroker: jdbccfg_ca: "jdbccfg_ca" # MAS Entitlement - mas_entitlement_username: "cp" + #mas_entitlement_username: "cp" + mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" mas_entitlement_key: "mas_entitlement_key" # Development Registry Entitlement From e7da093eb30c7f698a07f4fe2790df9e2a35890b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 22 Apr 2025 13:08:52 +0530 Subject: [PATCH 199/491] Update 08-aibroker-secret.yaml --- .../113-ibm-aibroker/templates/08-aibroker-secret.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml index 935b88700..8cb39a6a8 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml @@ -7,7 +7,8 @@ metadata: argocd.argoproj.io/sync-wave: "146" type: Opaque stringData: - icr_username: "{{ .Values.mas_entitlement_username }}" - icr_password: "{{ .Values.mas_entitlement_key}}" - artifactory_username: "{{ .Values.artifactory_username}}" - artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file + .dockerconfigjson: "{{ .Values.artifactory_token}}" + # icr_username: "{{ .Values.mas_entitlement_username }}" + # icr_password: "{{ .Values.mas_entitlement_key}}" + # artifactory_username: "{{ .Values.artifactory_username}}" + # artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file From eb79f9441666d0d1d095d01c134117304c1ad1e7 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Tue, 22 Apr 2025 13:50:06 +0530 Subject: [PATCH 200/491] order change --- ...c.yaml Copy path => 07-aibroker-jdbc.yaml} | 0 .../08-aibroker-operator-subscription.yaml | 43 +++++++++++++++++++ .../templates/08-aibroker-operatorGroup.yaml | 12 ------ .../templates/08-aibroker-secret.yaml | 28 ++++++------ .../templates/08-aibroker-subscription.yaml | 30 ++++++------- 5 files changed, 72 insertions(+), 41 deletions(-) rename instance-applications/113-ibm-aibroker/templates/{07-aibroker-jdbc.yaml Copy path => 07-aibroker-jdbc.yaml} (100%) create mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml delete mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml similarity index 100% rename from instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml Copy path rename to instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml new file mode 100644 index 000000000..2856822f4 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -0,0 +1,43 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: ibm-entitlement + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "146" +type: Opaque +stringData: + .dockerconfigjson: "{{ .Values.artifactory_token}}" + # icr_username: "{{ .Values.mas_entitlement_username }}" + # icr_password: "{{ .Values.mas_entitlement_key}}" + # artifactory_username: "{{ .Values.artifactory_username}}" + # artifactory_password: "{{ .Values.artifactory_token}}" +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: "{{ .Values.aibroker_namespace }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "147" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + targetNamespaces: + - "{{ .Values.aibroker_namespace }}" + +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: ibm-mas-aibroker + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "148" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + channel: "{{ .Values.mas_app_channel }}" + installPlanApproval: Automatic + name: ibm-mas-aibroker + source: "{{ .Values.mas_catalog_source }}" + sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml deleted file mode 100644 index 21a39eb5f..000000000 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operatorGroup.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: "{{ .Values.aibroker_namespace }}" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "147" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - targetNamespaces: - - "{{ .Values.aibroker_namespace }}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml index 8cb39a6a8..346db28a7 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml @@ -1,14 +1,14 @@ -apiVersion: v1 -kind: Secret -metadata: - name: ibm-entitlement - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "146" -type: Opaque -stringData: - .dockerconfigjson: "{{ .Values.artifactory_token}}" - # icr_username: "{{ .Values.mas_entitlement_username }}" - # icr_password: "{{ .Values.mas_entitlement_key}}" - # artifactory_username: "{{ .Values.artifactory_username}}" - # artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file +# apiVersion: v1 +# kind: Secret +# metadata: +# name: ibm-entitlement +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "146" +# type: Opaque +# stringData: +# .dockerconfigjson: "{{ .Values.artifactory_token}}" +# # icr_username: "{{ .Values.mas_entitlement_username }}" +# # icr_password: "{{ .Values.mas_entitlement_key}}" +# # artifactory_username: "{{ .Values.artifactory_username}}" +# # artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml index 36d8dd66f..968c47f2d 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml @@ -1,15 +1,15 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: ibm-mas-aibroker - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "148" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: Automatic - name: ibm-mas-aibroker - source: "{{ .Values.mas_catalog_source }}" - sourceNamespace: openshift-marketplace \ No newline at end of file +# --- +# apiVersion: operators.coreos.com/v1alpha1 +# kind: Subscription +# metadata: +# name: ibm-mas-aibroker +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "148" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# channel: "{{ .Values.mas_app_channel }}" +# installPlanApproval: Automatic +# name: ibm-mas-aibroker +# source: "{{ .Values.mas_catalog_source }}" +# sourceNamespace: openshift-marketplace \ No newline at end of file From e540300d931030fdadc07b37321f6f15f785e616 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 16:44:14 +0530 Subject: [PATCH 201/491] adding 09 aibroker app --- ...aml.yaml => 01-aibroker-minio-secret.yaml} | 0 .../113-ibm-aibroker/values.yaml | 5 ++-- .../templates/040-ibm-aibroker-app.yaml | 5 ++++ .../ibm-aibroker-instance-root/values.yaml | 26 ++++++++++++------- 4 files changed, 23 insertions(+), 13 deletions(-) rename instance-applications/113-ibm-aibroker/templates/{01-aibroker-minio-secret.yaml.yaml => 01-aibroker-minio-secret.yaml} (100%) diff --git a/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml similarity index 100% rename from instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml.yaml rename to instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index eb86d9a3b..c2d2df93b 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -46,8 +46,7 @@ mas_aibroker_dro_cacert_secret: "dro-certificates" drocfg_ca: "ca.crt" drocfg_registration_key: "DRO_TOKEN" -drocfg: - url: "{{ drocfg[1].spec.config.url }}" +drocfg_url: "{{ drocfg[1].spec.config.url }}" # JDBC mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" @@ -79,7 +78,7 @@ mas_icr_cp: "cp.icr.io/cp" mas_icr_cpopen: "icr.io/cpopen" cluster_domain: "_cluster_dns.resources[0].spec.baseDomain" -in_saas_env: "INSAASENV" +in_saas_env: "false" #TENANT mas_aibroker_tenant_name: "aibroker-{{ mas_aibroker_tenant_name }}" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 1046e39ad..357a16d2b 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -87,6 +87,11 @@ spec: mas_catalog_source: "{{ .Values.ibm_aibroker.mas_catalog_source }}" + mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker.mas_icr_cpopen }}" + in_saas_env: "{{ .Values.ibm_aibroker.in_saas_env }}" + cluster_domain: "{{ .Values.ibm_aibroker.cluster_domain }}" + junitreporter: reporter_name: "ibm-aibroker-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d5e2db1b3..f90c11adb 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -115,8 +115,8 @@ ibm_kmodel: mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" primary_storage_class: "PRIMARY_STORAGE_CLASS" # Bucket names - mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" - mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" + mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" #container images image_store: "MAS_ICR_CP/aibroker/store:1.0.2" @@ -128,7 +128,7 @@ ibm_kmodel: ibm_aibroker: mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - mas_aibroker_minio_secret: "minio_secret" + mas_aibroker_minio_secret: "mas_aibroker_minio_secret" # Minio mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" @@ -154,13 +154,13 @@ ibm_aibroker: # SLS mas_aibroker_sls_registration_key_secret: "sls-registration-key" - mas_aibroker_db_host: "MAS_AIBROKER_DB_HOST" - mas_aibroker_db_port: "MAS_AIBROKER_DB_PORT" - mas_aibroker_db_secret_name: "MAS_AIBROKER_DB_SECRET_NAME" + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" # Bucket names mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" - mas_aibroker_storage_tenants_bucket: "MAS_AIBROKER_STORAGE_TENANTS_BUCKET" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" slscfg_registration_key: "slscfg_registration_key" @@ -171,8 +171,7 @@ ibm_aibroker: drocfg_ca: "drocfg_ca" drocfg_registration_key: "drocfg_registration_key" - drocfg: - url: "{{ drocfg[1].spec.config.url }}" + drocfg_url: "drocfg_url" # JDBC @@ -198,4 +197,11 @@ ibm_aibroker: # aibroker vars mas_catalog_source: "mas_catalog_source" - \ No newline at end of file + + # Source container registry + # ----------------------------------------------------------------------------- + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + cluster_domain: cluster_domain + in_saas_env: "in_saas_env" \ No newline at end of file From fb08ed61914f8f634b0622b307be8fefe1418157 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 16:44:21 +0530 Subject: [PATCH 202/491] Create 09-aibroker-app.yaml --- .../templates/09-aibroker-app.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml new file mode 100644 index 000000000..a0078a670 --- /dev/null +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: apps.mas.ibm.com/v1 +kind: AiBrokerApp +metadata: + name: "{{ .Values.mas_instance_id }}" + namespace: "{{ .Values.aibroker_namespace }}" + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + annotations: + argocd.argoproj.io/sync-wave: "133" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + settings: + icr: + cp: "{{ .Values.mas_icr_cp }}" + cpopen: "{{ .Values.mas_icr_cpopen }}" + dro: + url: "{{ .Values.drocfg_url }}" + dro_token_secret: "{{ .Values.drocfg_registration_key }}" + ca: "{{ .Values.drocfg_ca}}" + jdbc: + url: "{{ .Values.jdbccfg_url | b64enc }}" + credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + ca: "{{ .Values.jdbccfg_ca | b64enc }}" + cluster_domain: "{{ .Values.cluster_domain }}" + in_saas_env: "{{ .Values.in_saas_env }}" + minio: + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" + pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + mariadb: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" + database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file From 97254a3baf298476be4191ba297118d5c4c42b27 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 16:54:32 +0530 Subject: [PATCH 203/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index f90c11adb..c2d271950 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -126,7 +126,7 @@ ibm_kmodel: mas_aibroker_connector_tag: 1.0.0 ibm_aibroker: - mas_instance_id: "sremat" + mas_instance_id: "mas_instance_id" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' mas_aibroker_minio_secret: "mas_aibroker_minio_secret" # Minio From c26d903fe9534b7fca70dca32d2507a6597db986 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 17:39:14 +0530 Subject: [PATCH 204/491] SYNC WAVE UPDATED --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index a0078a670..aaa1b3c1b 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -8,7 +8,7 @@ metadata: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" annotations: - argocd.argoproj.io/sync-wave: "133" + argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: settings: From 572269a7acd62a43e44da55696712dc23bb42994 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 22 Apr 2025 17:44:48 +0530 Subject: [PATCH 205/491] commented --- .../templates/09-aibroker-app.yaml | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index aaa1b3c1b..cceedf37a 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -1,39 +1,39 @@ ---- -apiVersion: apps.mas.ibm.com/v1 -kind: AiBrokerApp -metadata: - name: "{{ .Values.mas_instance_id }}" - namespace: "{{ .Values.aibroker_namespace }}" - labels: - mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" - annotations: - argocd.argoproj.io/sync-wave: "149" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - settings: - icr: - cp: "{{ .Values.mas_icr_cp }}" - cpopen: "{{ .Values.mas_icr_cpopen }}" - dro: - url: "{{ .Values.drocfg_url }}" - dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" - jdbc: - url: "{{ .Values.jdbccfg_url | b64enc }}" - credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" - ca: "{{ .Values.jdbccfg_ca | b64enc }}" - cluster_domain: "{{ .Values.cluster_domain }}" - in_saas_env: "{{ .Values.in_saas_env }}" - minio: - host: "{{ .Values.mas_aibroker_storage_host }}" - port: "{{ .Values.mas_aibroker_storage_port }}" - credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" - pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" - mariadb: - host: "{{ .Values.mas_aibroker_db_host }}" - port: "{{ .Values.mas_aibroker_db_port }}" - credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" - database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file +# --- +# apiVersion: apps.mas.ibm.com/v1 +# kind: AiBrokerApp +# metadata: +# name: "{{ .Values.mas_instance_id }}" +# namespace: "{{ .Values.aibroker_namespace }}" +# labels: +# mas.ibm.com/applicationId: aibroker +# mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" +# annotations: +# argocd.argoproj.io/sync-wave: "149" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# settings: +# icr: +# cp: "{{ .Values.mas_icr_cp }}" +# cpopen: "{{ .Values.mas_icr_cpopen }}" +# dro: +# url: "{{ .Values.drocfg_url }}" +# dro_token_secret: "{{ .Values.drocfg_registration_key }}" +# ca: "{{ .Values.drocfg_ca}}" +# jdbc: +# url: "{{ .Values.jdbccfg_url | b64enc }}" +# credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" +# ca: "{{ .Values.jdbccfg_ca | b64enc }}" +# cluster_domain: "{{ .Values.cluster_domain }}" +# in_saas_env: "{{ .Values.in_saas_env }}" +# minio: +# host: "{{ .Values.mas_aibroker_storage_host }}" +# port: "{{ .Values.mas_aibroker_storage_port }}" +# credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" +# pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" +# tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" +# templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" +# mariadb: +# host: "{{ .Values.mas_aibroker_db_host }}" +# port: "{{ .Values.mas_aibroker_db_port }}" +# credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" +# database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file From 7a51efdf9ea107973687c6f7440e7524d42002a9 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 23 Apr 2025 14:21:19 +0530 Subject: [PATCH 206/491] Update 08-aibroker-operator-subscription.yaml --- .../templates/08-aibroker-operator-subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index 2856822f4..83f827a30 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "146" -type: Opaque +type: kubernetes.io/dockerconfigjson stringData: .dockerconfigjson: "{{ .Values.artifactory_token}}" # icr_username: "{{ .Values.mas_entitlement_username }}" From e3090ee7ec26463dceaba3e6592033e69aefbe34 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:10:10 +0530 Subject: [PATCH 207/491] sremat update instance id --- .../templates/09-aibroker-app.yaml | 78 +++++++++---------- .../113-ibm-aibroker/values.yaml | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index cceedf37a..aaa1b3c1b 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -1,39 +1,39 @@ -# --- -# apiVersion: apps.mas.ibm.com/v1 -# kind: AiBrokerApp -# metadata: -# name: "{{ .Values.mas_instance_id }}" -# namespace: "{{ .Values.aibroker_namespace }}" -# labels: -# mas.ibm.com/applicationId: aibroker -# mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" -# annotations: -# argocd.argoproj.io/sync-wave: "149" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# settings: -# icr: -# cp: "{{ .Values.mas_icr_cp }}" -# cpopen: "{{ .Values.mas_icr_cpopen }}" -# dro: -# url: "{{ .Values.drocfg_url }}" -# dro_token_secret: "{{ .Values.drocfg_registration_key }}" -# ca: "{{ .Values.drocfg_ca}}" -# jdbc: -# url: "{{ .Values.jdbccfg_url | b64enc }}" -# credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" -# ca: "{{ .Values.jdbccfg_ca | b64enc }}" -# cluster_domain: "{{ .Values.cluster_domain }}" -# in_saas_env: "{{ .Values.in_saas_env }}" -# minio: -# host: "{{ .Values.mas_aibroker_storage_host }}" -# port: "{{ .Values.mas_aibroker_storage_port }}" -# credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" -# pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" -# tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" -# templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" -# mariadb: -# host: "{{ .Values.mas_aibroker_db_host }}" -# port: "{{ .Values.mas_aibroker_db_port }}" -# credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" -# database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file +--- +apiVersion: apps.mas.ibm.com/v1 +kind: AiBrokerApp +metadata: + name: "{{ .Values.mas_instance_id }}" + namespace: "{{ .Values.aibroker_namespace }}" + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + annotations: + argocd.argoproj.io/sync-wave: "149" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + settings: + icr: + cp: "{{ .Values.mas_icr_cp }}" + cpopen: "{{ .Values.mas_icr_cpopen }}" + dro: + url: "{{ .Values.drocfg_url }}" + dro_token_secret: "{{ .Values.drocfg_registration_key }}" + ca: "{{ .Values.drocfg_ca}}" + jdbc: + url: "{{ .Values.jdbccfg_url | b64enc }}" + credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + ca: "{{ .Values.jdbccfg_ca | b64enc }}" + cluster_domain: "{{ .Values.cluster_domain }}" + in_saas_env: "{{ .Values.in_saas_env }}" + minio: + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" + pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + mariadb: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" + database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index c2d2df93b..825a92240 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,5 +1,5 @@ --- -mas_instance_id: "MAS_INSTANCE_ID" +mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' # Minio From b6c44f42e09b87527b0459eec9d9d6e543da1a6d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:16:23 +0530 Subject: [PATCH 208/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 825a92240..324658b89 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,5 +1,5 @@ --- -mas_instance_id: "sremat" +mas_instance_id: "sremat-test" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' # Minio From f5fb13dfe028ca7e733b07b3d55aacac42dd301e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:27:21 +0530 Subject: [PATCH 209/491] update App name --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index aaa1b3c1b..7571a541e 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,7 +2,7 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "{{ .Values.mas_instance_id }}" + name: "AiBrokerApp" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 324658b89..825a92240 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,5 +1,5 @@ --- -mas_instance_id: "sremat-test" +mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' # Minio From 555553c6c7fc67df4655838b2c887a09d69349d7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:40:52 +0530 Subject: [PATCH 210/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 7571a541e..5ba7ae9b4 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,7 +2,7 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "AiBrokerApp" + name: "aibrokerapp" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker From e9eab04d7fb07fa2995da4171e8648a950229a31 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:51:35 +0530 Subject: [PATCH 211/491] update spec binding --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 5ba7ae9b4..42a46f1e7 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -11,6 +11,10 @@ metadata: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: + bindings: + - name: secretbind + kind: Secret + ref: ibm-entitlement settings: icr: cp: "{{ .Values.mas_icr_cp }}" From ce0fbc3a0304474955f204acd71c49fd689ccc46 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 16:58:42 +0530 Subject: [PATCH 212/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 42a46f1e7..d50cff5f0 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -11,10 +11,10 @@ metadata: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: - bindings: - - name: secretbind - kind: Secret - ref: ibm-entitlement + # bindings: + # - name: secretbind + # kind: Secret + # ref: ibm-entitlement settings: icr: cp: "{{ .Values.mas_icr_cp }}" From 6113577565d2554f26479ba169bf80069e07db8d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 17:36:14 +0530 Subject: [PATCH 213/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index d50cff5f0..eabc9923a 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,7 +2,7 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "aibrokerapp" + name: "{{ .Values.mas_instance_id }}" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker From f47e4a780dc1b7b20b941738778d9997cd2b27a6 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 17:43:08 +0530 Subject: [PATCH 214/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 825a92240..97027c6b2 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -46,7 +46,7 @@ mas_aibroker_dro_cacert_secret: "dro-certificates" drocfg_ca: "ca.crt" drocfg_registration_key: "DRO_TOKEN" -drocfg_url: "{{ drocfg[1].spec.config.url }}" +drocfg_url: "drocfg_url" # JDBC mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" From f25e06f66af73da90d113a65b3461e423e7b0149 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 23 Apr 2025 17:48:51 +0530 Subject: [PATCH 215/491] Update 040-ibm-aibroker-app.yaml --- .../templates/040-ibm-aibroker-app.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 357a16d2b..00d6810aa 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -70,7 +70,7 @@ spec: drocfg_ca: "{{ .Values.ibm_aibroker.drocfg_ca }}" drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" - + drocfg_url: "{{ .Values.ibm_aibroker.drocfg_url }}" mas_aibroker_db2_jdbc_secret: "{{ .Values.ibm_aibroker.mas_aibroker_db2_jdbc_secret }}" jdbccfg_username: "{{ .Values.ibm_aibroker.jdbccfg_username }}" @@ -78,7 +78,7 @@ spec: jdbccfg_url: "{{ .Values.ibm_aibroker.jdbccfg_url }}" jdbccfg_sslenabled: "{{ .Values.ibm_aibroker.jdbccfg_sslenabled }}" jdbccfg_ca: "{{ .Values.ibm_aibroker.jdbccfg_ca }}" - + mas_entitlement_username: "{{ .Values.ibm_aibroker.mas_entitlement_username }}" mas_entitlement_key: "{{ .Values.ibm_aibroker.mas_entitlement_key }}" artifactory_username: "{{ .Values.ibm_aibroker.artifactory_username }}" From 109f4c4b7a385e6dd65bbd037db303a8c2cda5bc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 10:58:49 +0530 Subject: [PATCH 216/491] update binding --- .../templates/09-aibroker-app.yaml | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index eabc9923a..26f24939b 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -11,33 +11,35 @@ metadata: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: + bindings: + jdbc: system # bindings: # - name: secretbind # kind: Secret # ref: ibm-entitlement settings: - icr: - cp: "{{ .Values.mas_icr_cp }}" - cpopen: "{{ .Values.mas_icr_cpopen }}" - dro: - url: "{{ .Values.drocfg_url }}" - dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" - jdbc: - url: "{{ .Values.jdbccfg_url | b64enc }}" - credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" - ca: "{{ .Values.jdbccfg_ca | b64enc }}" - cluster_domain: "{{ .Values.cluster_domain }}" - in_saas_env: "{{ .Values.in_saas_env }}" - minio: - host: "{{ .Values.mas_aibroker_storage_host }}" - port: "{{ .Values.mas_aibroker_storage_port }}" - credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" - pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" - mariadb: - host: "{{ .Values.mas_aibroker_db_host }}" - port: "{{ .Values.mas_aibroker_db_port }}" - credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" - database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file + # icr: + # cp: "{{ .Values.mas_icr_cp }}" + # cpopen: "{{ .Values.mas_icr_cpopen }}" + # dro: + # url: "{{ .Values.drocfg_url }}" + # dro_token_secret: "{{ .Values.drocfg_registration_key }}" + # ca: "{{ .Values.drocfg_ca}}" + # jdbc: + # url: "{{ .Values.jdbccfg_url | b64enc }}" + # credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + # ca: "{{ .Values.jdbccfg_ca | b64enc }}" + # cluster_domain: "{{ .Values.cluster_domain }}" + # in_saas_env: "{{ .Values.in_saas_env }}" + # minio: + # host: "{{ .Values.mas_aibroker_storage_host }}" + # port: "{{ .Values.mas_aibroker_storage_port }}" + # credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" + # pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + # tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + # templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + # mariadb: + # host: "{{ .Values.mas_aibroker_db_host }}" + # port: "{{ .Values.mas_aibroker_db_port }}" + # credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" + # database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file From 73a8bc782db5fcfd14b119da205cf2d926d53b73 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 11:00:41 +0530 Subject: [PATCH 217/491] Revert "update binding" This reverts commit 109f4c4b7a385e6dd65bbd037db303a8c2cda5bc. --- .../templates/09-aibroker-app.yaml | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 26f24939b..eabc9923a 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -11,35 +11,33 @@ metadata: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: - bindings: - jdbc: system # bindings: # - name: secretbind # kind: Secret # ref: ibm-entitlement settings: - # icr: - # cp: "{{ .Values.mas_icr_cp }}" - # cpopen: "{{ .Values.mas_icr_cpopen }}" - # dro: - # url: "{{ .Values.drocfg_url }}" - # dro_token_secret: "{{ .Values.drocfg_registration_key }}" - # ca: "{{ .Values.drocfg_ca}}" - # jdbc: - # url: "{{ .Values.jdbccfg_url | b64enc }}" - # credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" - # ca: "{{ .Values.jdbccfg_ca | b64enc }}" - # cluster_domain: "{{ .Values.cluster_domain }}" - # in_saas_env: "{{ .Values.in_saas_env }}" - # minio: - # host: "{{ .Values.mas_aibroker_storage_host }}" - # port: "{{ .Values.mas_aibroker_storage_port }}" - # credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" - # pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - # tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - # templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" - # mariadb: - # host: "{{ .Values.mas_aibroker_db_host }}" - # port: "{{ .Values.mas_aibroker_db_port }}" - # credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" - # database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file + icr: + cp: "{{ .Values.mas_icr_cp }}" + cpopen: "{{ .Values.mas_icr_cpopen }}" + dro: + url: "{{ .Values.drocfg_url }}" + dro_token_secret: "{{ .Values.drocfg_registration_key }}" + ca: "{{ .Values.drocfg_ca}}" + jdbc: + url: "{{ .Values.jdbccfg_url | b64enc }}" + credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + ca: "{{ .Values.jdbccfg_ca | b64enc }}" + cluster_domain: "{{ .Values.cluster_domain }}" + in_saas_env: "{{ .Values.in_saas_env }}" + minio: + host: "{{ .Values.mas_aibroker_storage_host }}" + port: "{{ .Values.mas_aibroker_storage_port }}" + credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" + pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + mariadb: + host: "{{ .Values.mas_aibroker_db_host }}" + port: "{{ .Values.mas_aibroker_db_port }}" + credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" + database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file From ede0f961b61b94e191d12e0032dc3a3d8e2b84b4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 12:07:31 +0530 Subject: [PATCH 218/491] update role --- .../templates/09-aibroker-app.yaml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index eabc9923a..3897ca08c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -1,3 +1,35 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: allow-aibrokerapp-access + namespace: mas-sremat-test-aibroker + annotations: + argocd.argoproj.io/sync-wave: "149" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: aibrokerapp-reader +subjects: +- kind: ServiceAccount + name: ibm-mas-aibroker-operator + namespace: mas-sremat-aibroker + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: aibrokerapp-reader + namespace: mas-sremat-test-aibroker + annotations: + argocd.argoproj.io/sync-wave: "150" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +rules: +- apiGroups: ["apps.mas.ibm.com"] + resources: ["aibrokerapps"] + verbs: ["get", "list", "watch"] + --- apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp @@ -8,7 +40,7 @@ metadata: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" annotations: - argocd.argoproj.io/sync-wave: "149" + argocd.argoproj.io/sync-wave: "151" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: # bindings: From 00d5fa5b4469bd53cc3d6c3812ce21d94db5ed5b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 12:11:55 +0530 Subject: [PATCH 219/491] Revert "update role" This reverts commit ede0f961b61b94e191d12e0032dc3a3d8e2b84b4. --- .../templates/09-aibroker-app.yaml | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 3897ca08c..eabc9923a 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -1,35 +1,3 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: allow-aibrokerapp-access - namespace: mas-sremat-test-aibroker - annotations: - argocd.argoproj.io/sync-wave: "149" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: aibrokerapp-reader -subjects: -- kind: ServiceAccount - name: ibm-mas-aibroker-operator - namespace: mas-sremat-aibroker - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: aibrokerapp-reader - namespace: mas-sremat-test-aibroker - annotations: - argocd.argoproj.io/sync-wave: "150" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -rules: -- apiGroups: ["apps.mas.ibm.com"] - resources: ["aibrokerapps"] - verbs: ["get", "list", "watch"] - --- apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp @@ -40,7 +8,7 @@ metadata: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" annotations: - argocd.argoproj.io/sync-wave: "151" + argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: # bindings: From 307fdbe9a4dacede87fca2458f0f51eecbaa6b45 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 14:05:09 +0530 Subject: [PATCH 220/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index eabc9923a..0c4d1596e 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -24,9 +24,9 @@ spec: dro_token_secret: "{{ .Values.drocfg_registration_key }}" ca: "{{ .Values.drocfg_ca}}" jdbc: - url: "{{ .Values.jdbccfg_url | b64enc }}" + url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" - ca: "{{ .Values.jdbccfg_ca | b64enc }}" + ca: "{{ .Values.jdbccfg_ca }}" cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" minio: From d79d6b868c4193721f4591e13c8801e29b25e6f2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 16:08:56 +0530 Subject: [PATCH 221/491] secret name update --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 97027c6b2..b792da70e 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -49,7 +49,7 @@ drocfg_registration_key: "DRO_TOKEN" drocfg_url: "drocfg_url" # JDBC -mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" +mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg" jdbccfg_username: "username" jdbccfg_password: "password" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index c2d271950..8049c62ad 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -175,7 +175,7 @@ ibm_aibroker: # JDBC - mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg-binding" + mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg" jdbccfg_username: "jdbccfg_username" jdbccfg_password: "jdbccfg_password" From 3661f3f4a52a40fd5991ab8a5d1633d72c3edfb4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 24 Apr 2025 16:13:36 +0530 Subject: [PATCH 222/491] Update 07-aibroker-jdbc.yaml --- .../113-ibm-aibroker/templates/07-aibroker-jdbc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index e34a07ecd..5e02fbb01 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -2,7 +2,7 @@ kind: Secret apiVersion: v1 metadata: - name: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" + name: "sremat-jdbccfg" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "145" From 31cc63a0c46d2c111c835edff44bdfbee0a34f41 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 24 Apr 2025 16:54:47 +0530 Subject: [PATCH 223/491] Update 02-aibroker-mariadb-secret.yaml hard coded name --- .../113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml index e44455a2b..1da0537d1 100644 --- a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml @@ -2,7 +2,7 @@ kind: Secret apiVersion: v1 metadata: - name: "{{ .Values.mas_aibroker_mariadb_secret }}" + name: "sremat-mariadbcfg" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "141" From 73afcf65a15894f8cf34db3ec96dde55a531fd21 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 24 Apr 2025 16:58:35 +0530 Subject: [PATCH 224/491] Revert "Update 02-aibroker-mariadb-secret.yaml" This reverts commit 31cc63a0c46d2c111c835edff44bdfbee0a34f41. --- .../113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml index 1da0537d1..e44455a2b 100644 --- a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml @@ -2,7 +2,7 @@ kind: Secret apiVersion: v1 metadata: - name: "sremat-mariadbcfg" + name: "{{ .Values.mas_aibroker_mariadb_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "141" From e313f3060b1ddc876b094274612520a114eaca38 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 25 Apr 2025 15:08:43 +0530 Subject: [PATCH 225/491] Update 07-aibroker-jdbc.yaml renamed to aibroker --- .../113-ibm-aibroker/templates/07-aibroker-jdbc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index 5e02fbb01..5a1a41a73 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -2,7 +2,7 @@ kind: Secret apiVersion: v1 metadata: - name: "sremat-jdbccfg" + name: "aibroker-jdbccfg" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "145" From be79728bef5f9d2337b117e0f889c1c67c4d97e8 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 25 Apr 2025 15:12:03 +0530 Subject: [PATCH 226/491] renamed to aibroker --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index b792da70e..38989d25f 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -49,7 +49,7 @@ drocfg_registration_key: "DRO_TOKEN" drocfg_url: "drocfg_url" # JDBC -mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg" +mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" jdbccfg_username: "username" jdbccfg_password: "password" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 8049c62ad..4a8d8f5a1 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -175,7 +175,7 @@ ibm_aibroker: # JDBC - mas_aibroker_db2_jdbc_secret: "sremat-jdbccfg" + mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" jdbccfg_username: "jdbccfg_username" jdbccfg_password: "jdbccfg_password" From 2510168e5966043157e38b40fd77a8be38336032 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 25 Apr 2025 15:24:51 +0530 Subject: [PATCH 227/491] Update values.yaml updated artifactory value --- root-applications/ibm-aibroker-instance-root/values.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4a8d8f5a1..9694239ae 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -200,8 +200,10 @@ ibm_aibroker: # Source container registry # ----------------------------------------------------------------------------- - mas_icr_cp: "cp.icr.io/cp" - mas_icr_cpopen: "icr.io/cpopen" + # mas_icr_cp: "cp.icr.io/cp" + # mas_icr_cpopen: "icr.io/cpopen" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" cluster_domain: cluster_domain in_saas_env: "in_saas_env" \ No newline at end of file From 4d358ff33f6a94b51efd01bd34211619509aad65 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 10:42:45 +0530 Subject: [PATCH 228/491] kmodel update --- .../templates/01-kmodel-namespace.yaml | 14 +- .../templates/02-kmodel-secret.yaml | 62 +++--- .../templates/03-kmodel-istio.yaml | 92 ++++----- .../templates/04-kmodel-networkpolicies.yaml | 84 ++++----- .../templates/050-ibm-kmodels-app.yaml | 176 +++++++++--------- .../099-aibroker-instance-appset.yaml | 7 +- 6 files changed, 220 insertions(+), 215 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml index e726d8c6f..9ad177532 100644 --- a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -1,7 +1,7 @@ -# --- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "137" \ No newline at end of file +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "160" \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index 11369347f..af7c05b17 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -1,31 +1,31 @@ -# --- -# apiVersion: v1 -# kind: Secret -# type: Opaque -# metadata: -# name: km-s3-secret -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "138" -# {{- if eq .Values.mas_aibroker_storage_provider "aws" }} -# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" -# {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} -# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" -# {{- end }} -# {{- if eq .Values.mas_aibroker_storage_ssl "false" }} -# serving.kserve.io/s3-usehttps: "0" -# {{- else }} -# serving.kserve.io/s3-usehttps: "1" -# {{- end }} -# {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} -# serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" -# {{- end }} -# stringData: -# AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" -# AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" -# S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" -# S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" -# S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" -# S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" -# S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" -# S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "161" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" diff --git a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml index 4b30cd169..03f782fde 100644 --- a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -1,47 +1,47 @@ -# --- -# apiVersion: security.istio.io/v1beta1 -# kind: PeerAuthentication -# metadata: -# name: default -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "139" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +--- +apiVersion: security.istio.io/v1beta1 +kind: PeerAuthentication +metadata: + name: default + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# mtls: -# mode: PERMISSIVE -# --- -# apiVersion: networking.istio.io/v1beta1 -# kind: DestinationRule -# metadata: -# name: ds-pipeline-instance -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "140" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# host: ds-pipeline-instance.opendatahub.svc.cluster.local -# trafficPolicy: -# portLevelSettings: -# - port: -# number: 8888 -# tls: -# mode: DISABLE -# --- -# apiVersion: networking.istio.io/v1beta1 -# kind: DestinationRule -# metadata: -# name: minio-instance -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "141" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# host: minio-instance.opendatahub.svc.cluster.local -# trafficPolicy: -# portLevelSettings: -# - port: -# number: 9000 -# tls: -# mode: DISABLE +spec: + mtls: + mode: PERMISSIVE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: ds-pipeline-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "162" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: ds-pipeline-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 8888 + tls: + mode: DISABLE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: minio-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "163" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: minio-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 9000 + tls: + mode: DISABLE diff --git a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml index c52777c56..d2edfaacb 100644 --- a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -1,43 +1,43 @@ -# --- -# apiVersion: networking.k8s.io/v1 -# kind: NetworkPolicy -# metadata: -# name: km-instance -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "142" -# spec: -# podSelector: -# matchLabels: -# kmodels: instance -# part-of: kmodels -# policyTypes: -# - Ingress -# ingress: -# - ports: -# - port: 3000 -# - port: 8443 +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "164" +spec: + podSelector: + matchLabels: + kmodels: instance + part-of: kmodels + policyTypes: + - Ingress + ingress: + - ports: + - port: 3000 + - port: 8443 -# --- -# apiVersion: networking.k8s.io/v1 -# kind: NetworkPolicy -# metadata: -# name: ds-pipelines-km-instance -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "143" -# spec: -# podSelector: -# matchLabels: -# app: ds-pipeline-instance -# component: data-science-pipelines -# ingress: -# - ports: -# - protocol: TCP -# port: 8888 -# from: -# - podSelector: -# matchLabels: -# app: km-controller -# policyTypes: -# - Ingress +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: ds-pipelines-km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "165" +spec: + podSelector: + matchLabels: + app: ds-pipeline-instance + component: data-science-pipelines + ingress: + - ports: + - protocol: TCP + port: 8888 + from: + - podSelector: + matchLabels: + app: km-controller + policyTypes: + - Ingress diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index 7d68d0ce9..cd21c9aea 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -1,89 +1,89 @@ -# {{- if not (empty .Values.ibm_kmodel) }} -# --- -# # IBM Maximo Kmodels -# apiVersion: argoproj.io/v1alpha1 -# kind: Application -# metadata: -# name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} -# namespace: {{ .Values.argo.namespace }} -# labels: -# environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ .Values.instance.id }}' -# annotations: -# argocd.argoproj.io/sync-wave: "050" -# healthCheckTimeout: "1800" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} -# {{- end }} -# finalizers: -# - resources-finalizer.argocd.argoproj.io -# spec: -# project: "{{ .Values.argo.projects.apps }}" -# destination: -# server: {{ .Values.cluster.url }} -# namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" -# source: -# repoURL: "{{ .Values.source.repo_url }}" -# path: instance-applications/113-ibm-kmodels -# targetRevision: "{{ .Values.source.revision }}" -# plugin: -# name: {{ .Values.avp.name }} -# env: -# - name: {{ .Values.avp.values_varname }} -# value: | -# openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" -# run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" -# aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" -# mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" -# mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" -# mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" -# mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" -# mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" -# mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" -# mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" -# ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" -# pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" -# docker_server: "{{ .Values.ibm_kmodel.docker_server }}" -# tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" -# mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" -# primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" -# mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" -# mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" -# mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" -# image_store: "{{ .Values.ibm_kmodel.image_store }}" -# image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" -# image_controller: "{{ .Values.ibm_kmodel.image_controller }}" -# mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" -# mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" +{{- if not (empty .Values.ibm_kmodel) }} +--- +# IBM Maximo Kmodels +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kmodel.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "050" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/113-ibm-kmodels + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + openshift_namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" + run_sync_hooks: "{{ .Values.ibm_kmodel.run_sync_hooks }}" + aibroker_namespace: "{{ .Values.ibm_kmodel.aibroker_namespace }}" + mas_aibroker_storage_provider: "{{ .Values.ibm_kmodel.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_kmodel.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_kmodel.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_kmodel.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_kmodel.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_kmodel.mas_aibroker_storage_region }}" + ssh_secret_name: "{{ .Values.ibm_kmodel.ssh_secret_name }}" + pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" + docker_server: "{{ .Values.ibm_kmodel.docker_server }}" + tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" + primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" + mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" + mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_pipelines_bucket }}" + image_store: "{{ .Values.ibm_kmodel.image_store }}" + image_watcher: "{{ .Values.ibm_kmodel.image_watcher }}" + image_controller: "{{ .Values.ibm_kmodel.image_controller }}" + mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" + mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" -# junitreporter: -# reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" -# cluster_id: "{{ .Values.cluster.id }}" -# devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" -# devops_build_number: "{{ .Values.devops.build_number }}" -# gitops_version: "{{ .Values.source.revision }}" -# - name: ARGOCD_APP_NAME -# value: kmodelapp -# {{- if not (empty .Values.avp.secret) }} -# - name: AVP_SECRET -# value: {{ .Values.avp.secret }} -# {{- end }} -# syncPolicy: -# automated: -# {{- if .Values.auto_delete }} -# prune: true -# {{- end }} -# selfHeal: true -# retry: -# limit: 20 -# syncOptions: -# - CreateNamespace=true -# managedNamespaceMetadata: -# labels: -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 8 }} -# {{- end }} -# {{- end }} + junitreporter: + reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: kmodelapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index d73fba920..4639d5498 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -43,7 +43,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 92bc932cd7f63f7f4c398b861151cd56005aeb10 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 10:49:26 +0530 Subject: [PATCH 229/491] Update 050-ibm-kmodels-app.yaml --- .../templates/050-ibm-kmodels-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index cd21c9aea..e4d7f7969 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -27,7 +27,7 @@ spec: namespace: "{{ .Values.ibm_kmodel.openshift_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/113-ibm-kmodels + path: instance-applications/114-ibm-kmodels targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} From 0ba27230de1d17825c07f32f5bd6d7a4a764f994 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 11:05:40 +0530 Subject: [PATCH 230/491] kmodel --- .../templates/03-kmodel-istio.yaml | 92 +++++++++---------- .../templates/04-kmodel-networkpolicies.yaml | 84 ++++++++--------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml index 03f782fde..3d784b6fd 100644 --- a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -1,47 +1,47 @@ ---- -apiVersion: security.istio.io/v1beta1 -kind: PeerAuthentication -metadata: - name: default - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "139" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# --- +# apiVersion: security.istio.io/v1beta1 +# kind: PeerAuthentication +# metadata: +# name: default +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "139" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - mtls: - mode: PERMISSIVE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: ds-pipeline-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "162" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - host: ds-pipeline-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 8888 - tls: - mode: DISABLE ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: minio-instance - namespace: opendatahub - annotations: - argocd.argoproj.io/sync-wave: "163" - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -spec: - host: minio-instance.opendatahub.svc.cluster.local - trafficPolicy: - portLevelSettings: - - port: - number: 9000 - tls: - mode: DISABLE +# spec: +# mtls: +# mode: PERMISSIVE +# --- +# apiVersion: networking.istio.io/v1beta1 +# kind: DestinationRule +# metadata: +# name: ds-pipeline-instance +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "162" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# host: ds-pipeline-instance.opendatahub.svc.cluster.local +# trafficPolicy: +# portLevelSettings: +# - port: +# number: 8888 +# tls: +# mode: DISABLE +# --- +# apiVersion: networking.istio.io/v1beta1 +# kind: DestinationRule +# metadata: +# name: minio-instance +# namespace: opendatahub +# annotations: +# argocd.argoproj.io/sync-wave: "163" +# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +# spec: +# host: minio-instance.opendatahub.svc.cluster.local +# trafficPolicy: +# portLevelSettings: +# - port: +# number: 9000 +# tls: +# mode: DISABLE diff --git a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml index d2edfaacb..6e4a15028 100644 --- a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -1,43 +1,43 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "164" -spec: - podSelector: - matchLabels: - kmodels: instance - part-of: kmodels - policyTypes: - - Ingress - ingress: - - ports: - - port: 3000 - - port: 8443 +# --- +# apiVersion: networking.k8s.io/v1 +# kind: NetworkPolicy +# metadata: +# name: km-instance +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "164" +# spec: +# podSelector: +# matchLabels: +# kmodels: instance +# part-of: kmodels +# policyTypes: +# - Ingress +# ingress: +# - ports: +# - port: 3000 +# - port: 8443 ---- -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: ds-pipelines-km-instance - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "165" -spec: - podSelector: - matchLabels: - app: ds-pipeline-instance - component: data-science-pipelines - ingress: - - ports: - - protocol: TCP - port: 8888 - from: - - podSelector: - matchLabels: - app: km-controller - policyTypes: - - Ingress +# --- +# apiVersion: networking.k8s.io/v1 +# kind: NetworkPolicy +# metadata: +# name: ds-pipelines-km-instance +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "165" +# spec: +# podSelector: +# matchLabels: +# app: ds-pipeline-instance +# component: data-science-pipelines +# ingress: +# - ports: +# - protocol: TCP +# port: 8888 +# from: +# - podSelector: +# matchLabels: +# app: km-controller +# policyTypes: +# - Ingress From 9a31afa9bcbc1ed33d5ad0b3ad4b22b50aae0184 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 11:23:14 +0530 Subject: [PATCH 231/491] Update 02-kmodel-secret.yaml --- .../templates/02-kmodel-secret.yaml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index af7c05b17..3d9caad3d 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -1,31 +1,31 @@ ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: km-s3-secret - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "161" - {{- if eq .Values.mas_aibroker_storage_provider "aws" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" - {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - {{- end }} - {{- if eq .Values.mas_aibroker_storage_ssl "false" }} - serving.kserve.io/s3-usehttps: "0" - {{- else }} - serving.kserve.io/s3-usehttps: "1" - {{- end }} - {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} - serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" - {{- end }} -stringData: - AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" - AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" - S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" - S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" - S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" +# --- +# apiVersion: v1 +# kind: Secret +# type: Opaque +# metadata: +# name: km-s3-secret +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "161" +# {{- if eq .Values.mas_aibroker_storage_provider "aws" }} +# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" +# {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} +# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" +# {{- end }} +# {{- if eq .Values.mas_aibroker_storage_ssl "false" }} +# serving.kserve.io/s3-usehttps: "0" +# {{- else }} +# serving.kserve.io/s3-usehttps: "1" +# {{- end }} +# {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} +# serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" +# {{- end }} +# stringData: +# AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" +# AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" +# S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" +# S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" +# S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" +# S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" +# S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" +# S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" From 31852c398530696662584f1d1397f25811f985ec Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 11:26:09 +0530 Subject: [PATCH 232/491] Update 02-kmodel-secret.yaml --- .../templates/02-kmodel-secret.yaml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index 3d9caad3d..af7c05b17 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -1,31 +1,31 @@ -# --- -# apiVersion: v1 -# kind: Secret -# type: Opaque -# metadata: -# name: km-s3-secret -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "161" -# {{- if eq .Values.mas_aibroker_storage_provider "aws" }} -# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" -# {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} -# serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" -# {{- end }} -# {{- if eq .Values.mas_aibroker_storage_ssl "false" }} -# serving.kserve.io/s3-usehttps: "0" -# {{- else }} -# serving.kserve.io/s3-usehttps: "1" -# {{- end }} -# {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} -# serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" -# {{- end }} -# stringData: -# AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" -# AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" -# S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" -# S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" -# S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" -# S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" -# S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" -# S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "161" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" From 8099e79bc8fe5cf5811d630d54494d6c0531f791 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 28 Apr 2025 12:56:12 +0530 Subject: [PATCH 233/491] Update values.yaml the kmodel . --- .../ibm-aibroker-instance-root/values.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 9694239ae..50b01ecdc 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -96,11 +96,15 @@ ibm_odh: ibm_kmodel: - openshift_namespace: "openshift-operators" - run_sync_hooks: true aibroker_namespace: "mas-sremat-aibroker" - mas_aibroker_storage_provider: "aws" + + mas_aibroker_storage_provider: "minio" mas_aibroker_storage_ssl: "true" + + openshift_namespace: "openshift-operators" + run_sync_hooks: true + + # following are the variable need to injected via environment variable mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" From 2a665007e1723f82a9811d4436c5c719ed66723f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 13:05:40 +0530 Subject: [PATCH 234/491] kmodel --- .../templates/03-kmodel-istio.yaml | 92 +++++++++---------- .../templates/04-kmodel-networkpolicies.yaml | 84 ++++++++--------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml index 3d784b6fd..03f782fde 100644 --- a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -1,47 +1,47 @@ -# --- -# apiVersion: security.istio.io/v1beta1 -# kind: PeerAuthentication -# metadata: -# name: default -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "139" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +--- +apiVersion: security.istio.io/v1beta1 +kind: PeerAuthentication +metadata: + name: default + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "139" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# mtls: -# mode: PERMISSIVE -# --- -# apiVersion: networking.istio.io/v1beta1 -# kind: DestinationRule -# metadata: -# name: ds-pipeline-instance -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "162" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# host: ds-pipeline-instance.opendatahub.svc.cluster.local -# trafficPolicy: -# portLevelSettings: -# - port: -# number: 8888 -# tls: -# mode: DISABLE -# --- -# apiVersion: networking.istio.io/v1beta1 -# kind: DestinationRule -# metadata: -# name: minio-instance -# namespace: opendatahub -# annotations: -# argocd.argoproj.io/sync-wave: "163" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# host: minio-instance.opendatahub.svc.cluster.local -# trafficPolicy: -# portLevelSettings: -# - port: -# number: 9000 -# tls: -# mode: DISABLE +spec: + mtls: + mode: PERMISSIVE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: ds-pipeline-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "162" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: ds-pipeline-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 8888 + tls: + mode: DISABLE +--- +apiVersion: networking.istio.io/v1beta1 +kind: DestinationRule +metadata: + name: minio-instance + namespace: opendatahub + annotations: + argocd.argoproj.io/sync-wave: "163" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + host: minio-instance.opendatahub.svc.cluster.local + trafficPolicy: + portLevelSettings: + - port: + number: 9000 + tls: + mode: DISABLE diff --git a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml index 6e4a15028..d2edfaacb 100644 --- a/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml +++ b/instance-applications/114-ibm-kmodels/templates/04-kmodel-networkpolicies.yaml @@ -1,43 +1,43 @@ -# --- -# apiVersion: networking.k8s.io/v1 -# kind: NetworkPolicy -# metadata: -# name: km-instance -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "164" -# spec: -# podSelector: -# matchLabels: -# kmodels: instance -# part-of: kmodels -# policyTypes: -# - Ingress -# ingress: -# - ports: -# - port: 3000 -# - port: 8443 +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "164" +spec: + podSelector: + matchLabels: + kmodels: instance + part-of: kmodels + policyTypes: + - Ingress + ingress: + - ports: + - port: 3000 + - port: 8443 -# --- -# apiVersion: networking.k8s.io/v1 -# kind: NetworkPolicy -# metadata: -# name: ds-pipelines-km-instance -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "165" -# spec: -# podSelector: -# matchLabels: -# app: ds-pipeline-instance -# component: data-science-pipelines -# ingress: -# - ports: -# - protocol: TCP -# port: 8888 -# from: -# - podSelector: -# matchLabels: -# app: km-controller -# policyTypes: -# - Ingress +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: ds-pipelines-km-instance + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "165" +spec: + podSelector: + matchLabels: + app: ds-pipeline-instance + component: data-science-pipelines + ingress: + - ports: + - protocol: TCP + port: 8888 + from: + - podSelector: + matchLabels: + app: km-controller + policyTypes: + - Ingress From 3adffbd71c5d120039c0aa1053e3dc8e1e021f7a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 13:07:03 +0530 Subject: [PATCH 235/491] Update 05-kmodel-ca_Certificate.yaml --- .../templates/05-kmodel-ca_Certificate.yaml | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index a32fa1f35..65a33ebb7 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -1,56 +1,56 @@ -# --- -# apiVersion: cert-manager.io/v1 -# kind: Issuer -# metadata: -# name: "kmodel-ca-issuer" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "144" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# selfSigned: {} +--- +apiVersion: cert-manager.io/v1 +kind: Issuer +metadata: + name: "kmodel-ca-issuer" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "144" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + selfSigned: {} -# --- -# apiVersion: cert-manager.io/v1 -# kind: Certificate -# metadata: -# name: "{{ .Values.ssh_secret_name }}" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "144" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# secretName: "{{ .Values.ssh_secret_name }}" -# duration: "175200h0m0s" -# renewBefore: "2160h0m0s" -# # keystores: -# # pkcs12: -# # create: true -# # passwordSecretRef: -# # key: password -# # name: "{{ .Values.ssh_secret_name }}" -# issuerRef: -# name: "kmodel-ca-issuer" -# kind: Issuer -# isCA: true -# usages: -# - cert sign -# - digital signature -# - key encipherment -# - server auth -# commonName: "ca.kmodel" -# subject: -# countries: -# - GB -# streetAddresses: -# - London -# localities: -# - London -# organizationalUnits: -# - IBM Maximo Application Suite kmodel \ No newline at end of file +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "{{ .Values.ssh_secret_name }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "144" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + secretName: "{{ .Values.ssh_secret_name }}" + duration: "175200h0m0s" + renewBefore: "2160h0m0s" + # keystores: + # pkcs12: + # create: true + # passwordSecretRef: + # key: password + # name: "{{ .Values.ssh_secret_name }}" + issuerRef: + name: "kmodel-ca-issuer" + kind: Issuer + isCA: true + usages: + - cert sign + - digital signature + - key encipherment + - server auth + commonName: "ca.kmodel" + subject: + countries: + - GB + streetAddresses: + - London + localities: + - London + organizationalUnits: + - IBM Maximo Application Suite kmodel \ No newline at end of file From 3cab3b99e0beb1126ae6a72935ce2086f6f8f4d9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 13:23:13 +0530 Subject: [PATCH 236/491] Update 05-kmodel-ca_Certificate.yaml --- .../templates/05-kmodel-ca_Certificate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 65a33ebb7..aecdb411a 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -29,12 +29,12 @@ spec: secretName: "{{ .Values.ssh_secret_name }}" duration: "175200h0m0s" renewBefore: "2160h0m0s" - # keystores: - # pkcs12: - # create: true - # passwordSecretRef: - # key: password - # name: "{{ .Values.ssh_secret_name }}" + keystores: + pkcs12: + create: true + passwordSecretRef: + key: password + name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" kind: Issuer From c13fdda55986f8d53a8ea629b00f3fb2b5961ac1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 13:38:26 +0530 Subject: [PATCH 237/491] ca update --- .../templates/05-kmodel-ca_Certificate.yaml | 4 +- .../templates/05-kmodel-store.yaml | 246 +++++++++--------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index aecdb411a..5f40bfb6e 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -5,7 +5,7 @@ metadata: name: "kmodel-ca-issuer" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "144" + argocd.argoproj.io/sync-wave: "167" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} @@ -20,7 +20,7 @@ metadata: name: "{{ .Values.ssh_secret_name }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "144" + argocd.argoproj.io/sync-wave: "168" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 235592615..3562989a0 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -1,125 +1,125 @@ -# --- -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: km-store -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "144" -# labels: -# app: km-store -# data: -# STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" -# # Certificate files folder (default: /etc/ssl/certs) -# CERTS_PATH: "/etc/ssl/certs" -# # Private key (default: tls.key) -# CERT_PRIVATE_KEY: "tls.key" -# # Public certificate (default: tls.crt) -# CERT_PUBLIC_CERTIFICATE: "tls.crt" -# # Set to true to enable https server (default: true) -# SUPPORT_HTTPS: "true" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "169" + labels: + app: km-store +data: + STORE_BUCKET: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + # Certificate files folder (default: /etc/ssl/certs) + CERTS_PATH: "/etc/ssl/certs" + # Private key (default: tls.key) + CERT_PRIVATE_KEY: "tls.key" + # Public certificate (default: tls.crt) + CERT_PUBLIC_CERTIFICATE: "tls.crt" + # Set to true to enable https server (default: true) + SUPPORT_HTTPS: "true" -# --- -# apiVersion: v1 -# kind: Service -# metadata: -# name: km-store -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "145" -# spec: -# ports: -# - name: http -# port: 3000 -# targetPort: http -# - name: https -# port: 8443 -# targetPort: https -# selector: -# app: km-store -# type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "170" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-store + type: ClusterIP -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: km-store -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "146" -# labels: -# app: km-store -# component: store -# kmodels: instance -# part-of: kmodels -# spec: -# replicas: 1 -# selector: -# matchLabels: -# app: km-store -# kmodels: instance -# part-of: kmodels -# template: -# metadata: -# labels: -# app: km-store -# component: store -# kmodels: instance -# part-of: kmodels -# spec: -# restartPolicy: Always -# volumes: -# - name: ssh-key -# secret: -# secretName: "{{ .Values.ssh_secret_name }}" -# imagePullSecrets: -# - name: "{{ .Values.pullSecretName }}" -# containers: -# - name: store -# image: "{{ .Values.image_store }}" -# imagePullPolicy: Always -# securityContext: -# readOnlyRootFilesystem: false -# allowPrivilegeEscalation: false -# privileged: false -# runAsNonRoot: true -# capabilities: -# drop: -# - ALL -# ports: -# - name: http -# containerPort: 3000 -# - name: https -# containerPort: 8443 -# envFrom: -# - configMapRef: -# name: km-store -# - secretRef: -# name: km-s3-secret -# resources: -# requests: -# memory: "64Mi" -# cpu: "50m" -# ephemeral-storage: "1Gi" -# limits: -# memory: "256Mi" -# cpu: "100m" -# ephemeral-storage: "2Gi" -# livenessProbe: -# httpGet: -# path: /version -# port: 8443 -# scheme: HTTPS -# initialDelaySeconds: 15 -# periodSeconds: 500 -# readinessProbe: -# httpGet: -# path: /version -# port: 8443 -# scheme: HTTPS -# initialDelaySeconds: 5 -# periodSeconds: 500 -# volumeMounts: -# - mountPath: "/etc/ssl/certs" -# name: ssh-key -# readOnly: true +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-store + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "171" + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels +spec: + replicas: 1 + selector: + matchLabels: + app: km-store + kmodels: instance + part-of: kmodels + template: + metadata: + labels: + app: km-store + component: store + kmodels: instance + part-of: kmodels + spec: + restartPolicy: Always + volumes: + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: store + image: "{{ .Values.image_store }}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + envFrom: + - configMapRef: + name: km-store + - secretRef: + name: km-s3-secret + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + volumeMounts: + - mountPath: "/etc/ssl/certs" + name: ssh-key + readOnly: true From a957981608bad628b08ef26070c0e94630a3b4ba Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 13:56:16 +0530 Subject: [PATCH 238/491] update value pullSecretName --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 50b01ecdc..6a4354c4e 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -113,7 +113,7 @@ ibm_kmodel: mas_aibroker_storage_region: "mas_aibroker_storage_region" ssh_secret_name: "sremat-internal-aibroker-tls" # vars file for kmodels - pullSecretName: "ibm-entitlement" + pullSecretName: "pullSecretName" docker_server: "MAS_ICR_CP/aibroker" tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" From 0a271d1f68cd31623e4ba25f1d2dd0a5e5c7b526 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:01:42 +0530 Subject: [PATCH 239/491] update ca polily --- .../templates/05-kmodel-ca_Certificate.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 5f40bfb6e..411d00cd4 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -27,14 +27,11 @@ metadata: {{- end }} spec: secretName: "{{ .Values.ssh_secret_name }}" - duration: "175200h0m0s" - renewBefore: "2160h0m0s" - keystores: - pkcs12: - create: true - passwordSecretRef: - key: password - name: "{{ .Values.ssh_secret_name }}" + privateKey: + algorithm: RSA + size: 2048 + rotationPolicy: Always + name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" kind: Issuer From dcaa3a2062087206183e61a3a0eb0b863db00551 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:09:22 +0530 Subject: [PATCH 240/491] Update 05-kmodel-ca_Certificate.yaml --- .../114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 411d00cd4..e420e140b 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -31,7 +31,6 @@ spec: algorithm: RSA size: 2048 rotationPolicy: Always - name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" kind: Issuer From 51b73ee6815064473a9c52ca2ff95d793c9c8ed8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:17:05 +0530 Subject: [PATCH 241/491] Update 06-kmodel-watcher.yaml --- .../templates/06-kmodel-watcher.yaml | 278 +++++++++--------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index c62507f1f..dec6716e2 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -1,142 +1,142 @@ -# --- -# apiVersion: v1 -# kind: ServiceAccount -# metadata: -# name: km-watcher -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "147" -# --- -# kind: Role -# apiVersion: rbac.authorization.k8s.io/v1 -# metadata: -# name: km-watcher-role -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "148" -# rules: -# - verbs: -# - list -# - watch -# apiGroups: -# - '' -# resources: -# - events -# - pods -# --- -# kind: RoleBinding -# apiVersion: rbac.authorization.k8s.io/v1 -# metadata: -# name: km-watcher-binding -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "149" -# subjects: -# - kind: ServiceAccount -# name: km-watcher -# namespace: "{{ .Values.aibroker_namespace }}" -# roleRef: -# apiGroup: rbac.authorization.k8s.io -# kind: Role -# name: km-watcher-role +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "147" +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-role + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "148" +rules: + - verbs: + - list + - watch + apiGroups: + - '' + resources: + - events + - pods +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-binding + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "149" +subjects: + - kind: ServiceAccount + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: km-watcher-role -# --- -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: km-watcher -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "150" -# labels: -# app: km-watcher -# data: -# PIPELINES: "{{ .Values.aibroker_namespace }}" -# TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" -# EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "150" + labels: + app: km-watcher +data: + PIPELINES: "{{ .Values.aibroker_namespace }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" -# --- -# apiVersion: v1 -# kind: Service -# metadata: -# name: km-watcher -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "151" -# spec: -# ports: -# - name: http -# port: 3000 -# targetPort: http -# selector: -# app: km-watcher -# type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "151" +spec: + ports: + - name: http + port: 3000 + targetPort: http + selector: + app: km-watcher + type: ClusterIP -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: km-watcher -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "152" -# labels: -# app: km-watcher -# component: watcher -# spec: -# replicas: 1 -# selector: -# matchLabels: -# app: km-watcher -# template: -# metadata: -# labels: -# app: km-watcher -# component: watcher -# spec: -# serviceAccountName: km-watcher -# imagePullSecrets: -# - name: "{{ .Values.pullSecretName }}" -# containers: -# - name: watcher -# image: "{{ .Values.image_watcher}}" -# imagePullPolicy: Always -# securityContext: -# readOnlyRootFilesystem: false -# allowPrivilegeEscalation: false -# privileged: false -# runAsNonRoot: true -# capabilities: -# drop: -# - ALL -# ports: -# - name: http -# containerPort: 3000 -# resources: -# requests: -# memory: "64Mi" -# cpu: "50m" -# ephemeral-storage: "1Gi" -# limits: -# memory: "256Mi" -# cpu: "100m" -# ephemeral-storage: "2Gi" -# livenessProbe: -# httpGet: -# path: /version -# port: 3000 -# scheme: HTTP -# initialDelaySeconds: 15 -# periodSeconds: 500 -# readinessProbe: -# httpGet: -# path: /version -# port: 3000 -# scheme: HTTP -# initialDelaySeconds: 5 -# periodSeconds: 500 -# envFrom: -# - configMapRef: -# name: km-watcher -# - secretRef: -# name: km-s3-secret +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "152" + labels: + app: km-watcher + component: watcher +spec: + replicas: 1 + selector: + matchLabels: + app: km-watcher + template: + metadata: + labels: + app: km-watcher + component: watcher + spec: + serviceAccountName: km-watcher + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: watcher + image: "{{ .Values.image_watcher}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + resources: + requests: + memory: "64Mi" + cpu: "50m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "100m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /version + port: 3000 + scheme: HTTP + initialDelaySeconds: 5 + periodSeconds: 500 + envFrom: + - configMapRef: + name: km-watcher + - secretRef: + name: km-s3-secret From 1a01ab8c35a673eb2d89a9ac3c22e18e26458e1a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:21:30 +0530 Subject: [PATCH 242/491] controller --- .../templates/01-kmodel-namespace.yaml | 14 +- .../templates/07-kmodel-controller.yaml | 322 +++++++++--------- 2 files changed, 168 insertions(+), 168 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml index 9ad177532..26076834b 100644 --- a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -1,7 +1,7 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "160" \ No newline at end of file +# --- +# apiVersion: v1 +# kind: Namespace +# metadata: +# name: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "160" \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 1c0b98cf9..7839ab53a 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -1,169 +1,169 @@ -# --- -# apiVersion: v1 -# kind: ConfigMap -# metadata: -# name: km-controller -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "153" -# labels: -# app: km-controller -# data: -# DOCKER_SERVER: "{{ .Values.docker_server }}" -# PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" -# TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" -# DOCKER_SECRETS_NAME: "ibm-entitlement" -# CONNECTOR_IMAGE_PREFIX: '' -# PIPELINE_STEP_IMAGE_PREFIX: '' -# PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" -# CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" -# {{- if .Values.mas_aibroker_saas }} -# DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" -# {{- else }} -# DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" -# {{- end }} -# PLATFORM: openshift +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "153" + labels: + app: km-controller +data: + DOCKER_SERVER: "{{ .Values.docker_server }}" + PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + DOCKER_SECRETS_NAME: "ibm-entitlement" + CONNECTOR_IMAGE_PREFIX: '' + PIPELINE_STEP_IMAGE_PREFIX: '' + PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" + CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" + {{- if .Values.mas_aibroker_saas }} + DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" + {{- else }} + DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" + {{- end }} + PLATFORM: openshift -# --- -# apiVersion: v1 -# kind: Service -# metadata: -# name: km-controller -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "154" -# spec: -# ports: -# - name: http -# port: 3000 -# targetPort: http -# - name: https -# port: 8443 -# targetPort: https -# selector: -# app: km-controller -# type: ClusterIP +--- +apiVersion: v1 +kind: Service +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "154" +spec: + ports: + - name: http + port: 3000 + targetPort: http + - name: https + port: 8443 + targetPort: https + selector: + app: km-controller + type: ClusterIP -# --- -# apiVersion: v1 -# kind: PersistentVolumeClaim -# metadata: -# name: km-controller-pvc -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "155" -# spec: -# accessModes: -# - ReadWriteOnce -# volumeMode: Filesystem -# resources: -# requests: -# storage: 1Gi -# storageClassName: "{{ .Values.primary_storage_class }}" +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: km-controller-pvc + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "155" +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + resources: + requests: + storage: 1Gi + storageClassName: "{{ .Values.primary_storage_class }}" -# --- -# apiVersion: v1 -# kind: ServiceAccount -# metadata: -# name: km-controller -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "156" +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "156" -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: km-controller -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "157" -# labels: -# app: km-controller -# component: controller -# spec: -# replicas: 1 -# revisionHistoryLimit: 1 -# selector: -# matchLabels: -# app: km-controller -# template: -# metadata: -# labels: -# app: km-controller -# component: controller -# spec: -# serviceAccountName: km-controller -# volumes: -# - name: storage -# persistentVolumeClaim: -# claimName: km-controller-pvc -# - name: ssh-key -# secret: -# secretName: "{{ .Values.ssh_secret_name }}" -# imagePullSecrets: -# - name: "{{ .Values.pullSecretName }}" -# containers: -# - name: controller -# image: "{{ .Values.image_controller}}" -# imagePullPolicy: Always -# securityContext: -# readOnlyRootFilesystem: false -# allowPrivilegeEscalation: false -# privileged: false -# runAsNonRoot: true -# capabilities: -# drop: -# - ALL -# ports: -# - name: http -# containerPort: 3000 -# - name: https -# containerPort: 8443 -# resources: -# requests: -# memory: "128Mi" -# cpu: "100m" -# ephemeral-storage: "1Gi" -# limits: -# memory: "256Mi" -# cpu: "200m" -# ephemeral-storage: "2Gi" -# livenessProbe: -# httpGet: -# path: /api/v1/version -# port: 8443 -# scheme: HTTPS -# initialDelaySeconds: 15 -# periodSeconds: 500 -# readinessProbe: -# httpGet: -# path: /api/v1/version -# port: 8443 -# scheme: HTTPS -# initialDelaySeconds: 5 -# periodSeconds: 500 -# env: -# - name: KMODELS_NAMESPACE -# valueFrom: -# fieldRef: -# fieldPath: metadata.namespace -# - name: KMODELS_ID -# valueFrom: -# fieldRef: -# fieldPath: metadata.namespace -# envFrom: -# - configMapRef: -# name: km-controller -# - secretRef: -# name: km-s3-secret -# volumeMounts: -# - name: storage -# mountPath: "/storage" -# - name: ssh-key -# mountPath: "/etc/ssl/certs" -# readOnly: true +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "157" + labels: + app: km-controller + component: controller +spec: + replicas: 1 + revisionHistoryLimit: 1 + selector: + matchLabels: + app: km-controller + template: + metadata: + labels: + app: km-controller + component: controller + spec: + serviceAccountName: km-controller + volumes: + - name: storage + persistentVolumeClaim: + claimName: km-controller-pvc + - name: ssh-key + secret: + secretName: "{{ .Values.ssh_secret_name }}" + imagePullSecrets: + - name: "{{ .Values.pullSecretName }}" + containers: + - name: controller + image: "{{ .Values.image_controller}}" + imagePullPolicy: Always + securityContext: + readOnlyRootFilesystem: false + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + capabilities: + drop: + - ALL + ports: + - name: http + containerPort: 3000 + - name: https + containerPort: 8443 + resources: + requests: + memory: "128Mi" + cpu: "100m" + ephemeral-storage: "1Gi" + limits: + memory: "256Mi" + cpu: "200m" + ephemeral-storage: "2Gi" + livenessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 15 + periodSeconds: 500 + readinessProbe: + httpGet: + path: /api/v1/version + port: 8443 + scheme: HTTPS + initialDelaySeconds: 5 + periodSeconds: 500 + env: + - name: KMODELS_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: KMODELS_ID + valueFrom: + fieldRef: + fieldPath: metadata.namespace + envFrom: + - configMapRef: + name: km-controller + - secretRef: + name: km-s3-secret + volumeMounts: + - name: storage + mountPath: "/storage" + - name: ssh-key + mountPath: "/etc/ssl/certs" + readOnly: true From a08d5cdba64c985a8b4704354972c41cf6ec1972 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:24:35 +0530 Subject: [PATCH 243/491] Update 01-kmodel-namespace.yaml --- .../templates/01-kmodel-namespace.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml index 26076834b..9ad177532 100644 --- a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml @@ -1,7 +1,7 @@ -# --- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "160" \ No newline at end of file +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "160" \ No newline at end of file From 3ed343f33dd5c7d58de99ec615fefa7513bcc78f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 14:30:28 +0530 Subject: [PATCH 244/491] kmodel --- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 12 ++++++------ .../templates/07-kmodel-controller.yaml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index dec6716e2..33437dcc2 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -5,7 +5,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "147" + argocd.argoproj.io/sync-wave: "172" --- kind: Role apiVersion: rbac.authorization.k8s.io/v1 @@ -13,7 +13,7 @@ metadata: name: km-watcher-role namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "148" + argocd.argoproj.io/sync-wave: "173" rules: - verbs: - list @@ -30,7 +30,7 @@ metadata: name: km-watcher-binding namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "149" + argocd.argoproj.io/sync-wave: "174" subjects: - kind: ServiceAccount name: km-watcher @@ -47,7 +47,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "150" + argocd.argoproj.io/sync-wave: "175" labels: app: km-watcher data: @@ -62,7 +62,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "151" + argocd.argoproj.io/sync-wave: "176" spec: ports: - name: http @@ -79,7 +79,7 @@ metadata: name: km-watcher namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "152" + argocd.argoproj.io/sync-wave: "177" labels: app: km-watcher component: watcher diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 7839ab53a..ce550c03a 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -5,7 +5,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "153" + argocd.argoproj.io/sync-wave: "178" labels: app: km-controller data: @@ -32,7 +32,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "154" + argocd.argoproj.io/sync-wave: "179" spec: ports: - name: http @@ -53,7 +53,7 @@ metadata: name: km-controller-pvc namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "155" + argocd.argoproj.io/sync-wave: "180" spec: accessModes: - ReadWriteOnce @@ -71,7 +71,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "156" + argocd.argoproj.io/sync-wave: "181" --- @@ -81,7 +81,7 @@ metadata: name: km-controller namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "157" + argocd.argoproj.io/sync-wave: "182" labels: app: km-controller component: controller From 4f724954d5ef7ffd1ad16693ca14756090cd9246 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 15:19:57 +0530 Subject: [PATCH 245/491] Update 05-kmodel-ca_Certificate.yaml --- .../templates/05-kmodel-ca_Certificate.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index e420e140b..b7c6f3283 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -27,10 +27,15 @@ metadata: {{- end }} spec: secretName: "{{ .Values.ssh_secret_name }}" - privateKey: - algorithm: RSA - size: 2048 - rotationPolicy: Always + duration: "175200h0m0s" + renewBefore: "2160h0m0s" + keystores: + pkcs12: + create: true + passwordSecretRef: + key: password + name: "{{ .Values.ssh_secret_name }}" + issuerRef: name: "kmodel-ca-issuer" kind: Issuer From 0731c2bcbc90e6dcb6f27cb263e902d657357789 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 15:34:47 +0530 Subject: [PATCH 246/491] kmodel --- instance-applications/114-ibm-kmodels/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 7efdc325f..0ef6bf918 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -13,7 +13,7 @@ mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" -ssh_secret_name: "sremat-internal-aibroker-tls" +ssh_secret_name: "sremat-kmodel-aibroker-tls" # vars file for kmodels pullSecretName: "ibm-entitlement" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 6a4354c4e..d9ba67351 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -111,7 +111,7 @@ ibm_kmodel: mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "sremat-internal-aibroker-tls" + ssh_secret_name: "sremat-kmodel-aibroker-tls" # vars file for kmodels pullSecretName: "pullSecretName" docker_server: "MAS_ICR_CP/aibroker" From 6795f045d2fc25724f81ebe6333287ab701cb9dd Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 17:02:58 +0530 Subject: [PATCH 247/491] Update 05-kmodel-ca_Certificate.yaml --- .../templates/05-kmodel-ca_Certificate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index b7c6f3283..7952485de 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -29,12 +29,12 @@ spec: secretName: "{{ .Values.ssh_secret_name }}" duration: "175200h0m0s" renewBefore: "2160h0m0s" - keystores: - pkcs12: - create: true - passwordSecretRef: - key: password - name: "{{ .Values.ssh_secret_name }}" + # keystores: + # pkcs12: + # create: true + # passwordSecretRef: + # key: password + # name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" From c7283c8b4ae86074fef29717ec6b3eeab0778f37 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 28 Apr 2025 17:13:45 +0530 Subject: [PATCH 248/491] name updated --- instance-applications/114-ibm-kmodels/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 0ef6bf918..7efdc325f 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -13,7 +13,7 @@ mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" -ssh_secret_name: "sremat-kmodel-aibroker-tls" +ssh_secret_name: "sremat-internal-aibroker-tls" # vars file for kmodels pullSecretName: "ibm-entitlement" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d9ba67351..6a4354c4e 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -111,7 +111,7 @@ ibm_kmodel: mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "sremat-kmodel-aibroker-tls" + ssh_secret_name: "sremat-internal-aibroker-tls" # vars file for kmodels pullSecretName: "pullSecretName" docker_server: "MAS_ICR_CP/aibroker" From 3b9f6a6018759018a03a19bf4604550e9cb81f0c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 28 Apr 2025 17:16:56 +0530 Subject: [PATCH 249/491] Update 05-kmodel-ca_Certificate.yaml --- .../114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 7952485de..943ae930b 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -13,11 +13,11 @@ metadata: spec: selfSigned: {} ---- +--- apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "{{ .Values.ssh_secret_name }}" + name: "kmodel-certificate" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "168" From 74bb9b4734103e2b1549b3d20b58c34e2910009c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 28 Apr 2025 17:20:02 +0530 Subject: [PATCH 250/491] Revert "name updated" This reverts commit c7283c8b4ae86074fef29717ec6b3eeab0778f37. --- instance-applications/114-ibm-kmodels/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 7efdc325f..0ef6bf918 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -13,7 +13,7 @@ mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" -ssh_secret_name: "sremat-internal-aibroker-tls" +ssh_secret_name: "sremat-kmodel-aibroker-tls" # vars file for kmodels pullSecretName: "ibm-entitlement" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 6a4354c4e..d9ba67351 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -111,7 +111,7 @@ ibm_kmodel: mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "sremat-internal-aibroker-tls" + ssh_secret_name: "sremat-kmodel-aibroker-tls" # vars file for kmodels pullSecretName: "pullSecretName" docker_server: "MAS_ICR_CP/aibroker" From 81a64737bd0caf97489307525ef6e95c601d552a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 17:28:58 +0530 Subject: [PATCH 251/491] Update 05-kmodel-ca_Certificate.yaml --- .../templates/05-kmodel-ca_Certificate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 943ae930b..e85c551fc 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -29,12 +29,12 @@ spec: secretName: "{{ .Values.ssh_secret_name }}" duration: "175200h0m0s" renewBefore: "2160h0m0s" - # keystores: - # pkcs12: - # create: true - # passwordSecretRef: - # key: password - # name: "{{ .Values.ssh_secret_name }}" + keystores: + pkcs12: + create: true + passwordSecretRef: + key: password + name: "{{ .Values.ssh_secret_name }}" issuerRef: name: "kmodel-ca-issuer" From 01d71f364e7ca2e7a681b2007998bc3a40acd7b7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 17:49:39 +0530 Subject: [PATCH 252/491] update secret --- .../templates/05-kmodel-ca_Certificate.yaml | 12 ++++++++++++ instance-applications/114-ibm-kmodels/values.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index e85c551fc..0d1aaae11 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -1,3 +1,15 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.ssh_secret_name }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "166" +type: Opaque +data: + password: {{ .Values.ssh_secret_password | b64enc | quote }} + --- apiVersion: cert-manager.io/v1 kind: Issuer diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 0ef6bf918..905cb3b41 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -14,7 +14,7 @@ mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" ssh_secret_name: "sremat-kmodel-aibroker-tls" - +ssh_secret_password: "sremat" # vars file for kmodels pullSecretName: "ibm-entitlement" From 5bb63f9d99666ae05685df121f211f1649e23f58 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 28 Apr 2025 17:55:53 +0530 Subject: [PATCH 253/491] Update 05-kmodel-ca_Certificate.yaml --- .../114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 0d1aaae11..21216f435 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.ssh_secret_name }}" + name: "kmodel-pkcs12-password" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "166" @@ -46,7 +46,7 @@ spec: create: true passwordSecretRef: key: password - name: "{{ .Values.ssh_secret_name }}" + name: "kmodel-pkcs12-password" issuerRef: name: "kmodel-ca-issuer" From 9f44d39d3c2996cc0bb6978c271105e1fe9f2058 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 29 Apr 2025 11:40:19 +0530 Subject: [PATCH 254/491] Update 099-aibroker-instance-appset.yaml --- .../templates/099-aibroker-instance-appset.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 4639d5498..112c399f2 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -48,7 +48,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibtenant-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 6cec642a7e5f275819073215839eb05932a1b3bd Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 29 Apr 2025 11:41:46 +0530 Subject: [PATCH 255/491] Update 099-aibroker-instance-appset.yaml --- .../templates/099-aibroker-instance-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 112c399f2..ec0cf018a 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -53,7 +53,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibtenant-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-tenant-install.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 1e61909489d5739f112716d9eaeb1cf471edb69c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 12:31:45 +0530 Subject: [PATCH 256/491] aibroker tenant code changes added --- .../115-ibm-aibroker-tenant/Chart.yaml | 11 ++ .../115-ibm-aibroker-tenant/README.md | 3 + .../01-aibroker-saas-apikey-secret.yaml | 10 ++ .../115-ibm-aibroker-tenant/values.yaml | 55 ++++++++ .../060-ibm-aibroker-tenant-app.yaml | 120 ++++++++++++++++++ .../ibm-aibroker-instance-root/values.yaml | 61 ++++++++- 6 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 instance-applications/115-ibm-aibroker-tenant/Chart.yaml create mode 100644 instance-applications/115-ibm-aibroker-tenant/README.md create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml create mode 100644 instance-applications/115-ibm-aibroker-tenant/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/Chart.yaml b/instance-applications/115-ibm-aibroker-tenant/Chart.yaml new file mode 100644 index 000000000..276ee7e13 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-aibroker-tenant +description: IBM AIBROKER TENANT +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/README.md b/instance-applications/115-ibm-aibroker-tenant/README.md new file mode 100644 index 000000000..6ebd88b32 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/README.md @@ -0,0 +1,3 @@ +IBM Aibroker Tenant +=============================================================================== +Deploy and configure aibroker tenant with configurable version \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml new file mode 100644 index 000000000..d7aac4a8e --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml @@ -0,0 +1,10 @@ +api_version: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_provision_tenant }}----apikey-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "300" +type: Opaque +data: + AIBROKER_APIKEY: {{ randAlphaNum 32 | b64enc | quote }} \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/values.yaml b/instance-applications/115-ibm-aibroker-tenant/values.yaml new file mode 100644 index 000000000..0740fb80a --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/values.yaml @@ -0,0 +1,55 @@ +--- +mas_instance_id: "MAS_INSTANCE_ID" +aibroker_namespace: "mas-{{ mas_instance_id }}-aibroker" +ibm_entitlement_key: "" + +# SAAS +aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" +in_saas_env: "true" +mas_aibroker_saas: "false" +mas_aibroker_provision_tenant: "provision-tenant" + +# Tenant +mas_aibroker_tenant_name: "user" +tenant_action: "true" +tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + +cluster_domain: "" +mas_icr_cp: "cp.icr.io/cp" +mas_icr_cpopen: "icr.io/cpopen" + +# DRO +mas_aibroker_dro_token_secret: "dro-token" +mas_aibroker_dro_cacert_secret: "dro-certificates" +drocfg_url: "{{ drocfg[1].spec.config.url }}" +drocfg_ca: "ca.crt" +drocfg_registration_key: "DRO_TOKEN" + +#sls +slscfg_registration_key: "registration_key" +slscfg_url: "{{ config.url }}" +slscfg_clientId: "aibroker-$instanceIdentifier" +slscfg_ca: "aibroker-${instanceIdentifier}-ca.crt" +slscfg_tls: "aibroker-${instanceIdentifier}-tls.crt" +slscfg_key: "aibroker-${instanceIdentifier}-tls.key" + +# WatsonX +mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY +mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL +mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + +# SLS +#mas_aibroker_sls_registration_key_secret: "sls-registration-key" +mas_aibroker_sls_subscription_id: "001" + +# S3 +mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_ssl: "true" +# following are the variable need to injected via environment variable +mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" +mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" +mas_aibroker_storage_host: "mas_aibroker_storage_host" +mas_aibroker_storage_port: "mas_aibroker_storage_port" +mas_aibroker_storage_region: "mas_aibroker_storage_region" + +mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml new file mode 100644 index 000000000..4cdd80d38 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -0,0 +1,120 @@ +{{- if not (empty .Values.ibm_aibroker_tenant) }} +--- +# IBM Maximo aibroker-tenant +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "050" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/114-ibm-aibroker-tenant + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + + # SAAS + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + + # Tenant + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + + cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + + # DRO + mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + drocfg: + url: "{{ .Values.ibm_aibroker_tenant.drocfg.url }}" + ca: "{{ .Values.ibm_aibroker_tenant.drocfg.ca }}" + registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg.registration_key }}" + + slscfg: + registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg.registration_key }}" + url: "{{ .Values.ibm_aibroker_tenant.slscfg.url }}" + slsClientId: "{{ .Values.ibm_aibroker_tenant.slscfg.slsClientId }}" + ca: "{{ .Values.ibm_aibroker_tenant.slscfg.ca }}" + tls: "{{ .Values.ibm_aibroker_tenant.slscfg.tls }}" + key: "{{ .Values.ibm_aibroker_tenant.slscfg.key }}" + + + # WatsonX + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + + # SLS + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + # S3 + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + + + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: aibrokertenantapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d9ba67351..feb03b5e8 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -210,4 +210,63 @@ ibm_aibroker: mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" cluster_domain: cluster_domain - in_saas_env: "in_saas_env" \ No newline at end of file + in_saas_env: "in_saas_env" + + + +ibm_aibroker_tenant: + mas_instance_id: "MAS_INSTANCE_ID" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + ibm_entitlement_key: "" + + # SAAS + aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" + in_saas_env: "true" + mas_aibroker_saas: "false" + mas_aibroker_provision_tenant: "provision-tenant" + + # Tenant + mas_aibroker_tenant_name: "user" + tenant_action: "true" + tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + + cluster_domain: "" + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + # DRO + mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + drocfg: + url: "{{ drocfg[1].spec.config.url }}" + ca: "ca.crt" + registration_key: "DRO_TOKEN" + + slscfg: + registration_key: "registration_key" + url: "{{ config.url }}" + slsClientId: "aibroker-$instanceIdentifier" + ca: "aibroker-${instanceIdentifier}-ca.crt" + tls: "aibroker-${instanceIdentifier}-tls.crt" + key: "aibroker-${instanceIdentifier}-tls.key" + + # WatsonX + mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY + mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL + mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + + # SLS + #mas_aibroker_sls_registration_key_secret: "sls-registration-key" + mas_aibroker_sls_subscription_id: "001" + + # S3 + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" From 307a136974af32c9a1e00b223dc6f8b1f18ef49e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 29 Apr 2025 12:34:19 +0530 Subject: [PATCH 257/491] Update 060-ibm-aibroker-tenant-app.yaml --- .../templates/060-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 4cdd80d38..128f3278b 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -27,7 +27,7 @@ spec: namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" source: repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/114-ibm-aibroker-tenant + path: instance-applications/115-ibm-aibroker-tenant targetRevision: "{{ .Values.source.revision }}" plugin: name: {{ .Values.avp.name }} From 2d0486dfb12e30cb5fadc544cb8071a89403f50b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 29 Apr 2025 12:37:01 +0530 Subject: [PATCH 258/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index feb03b5e8..59bb43952 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -223,7 +223,7 @@ ibm_aibroker_tenant: aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" in_saas_env: "true" mas_aibroker_saas: "false" - mas_aibroker_provision_tenant: "provision-tenant" + mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" # Tenant mas_aibroker_tenant_name: "user" From c7087514765bed61d918d80f8bddd1f62fc9e1f2 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 12:38:31 +0530 Subject: [PATCH 259/491] Create 02-aibroker-workspace.yaml --- .../templates/02-aibroker-workspace.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml new file mode 100644 index 000000000..f06c5e228 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: apps.mas.ibm.com/v1 +kind: AiBrokerWorkspace +metadata: + name: "{{ .Values.tenantNamespace }}" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "301" + labels: + mas.ibm.com/applicationId: "aibroker" + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + {{- if .Values.custom_labels }} + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} +spec: + settings: + cluster_domain: "{{ .Values.cluster_domain }}" + in_saas_env: "{{ .Values.in_saas_env }}" + icr: + cp: "{{ .Values.mas_icr_cp }}" + cpopen: "{{ .Values.mas_icr_cpopen }}" + dro: + url: "{{ .Values.drocfg_url }}" + dro_token_secret: "{{ .Values.mas_aibroker_dro_token_secret }}" + ca: "{{ .Values.drocfg_ca }}" + sls: + url: "{{ .Values.slscfg_url }}" + sls_registration_key_secret: "{{ .Values.slscfg_registration_key }}" + ca: "{{ .Values.slscfg_ca }}" + watsonxai: + url: "{{ .Values.mas_aibroker_watsonxai_url }}" + api_key: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + tenant: + tenant_id: "{{ .Values.tenantNamespace }}" + subscription_id: "{{ .Values.mas_aibroker_sls_subscription_id }}" + instance_id: "{{ .Values.mas_instance_id }}" From 5fb7a3d445918b0b4205ded9bf0466298fe3ea8c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 12:41:42 +0530 Subject: [PATCH 260/491] Update 01-aibroker-saas-apikey-secret.yaml --- .../templates/01-aibroker-saas-apikey-secret.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml index d7aac4a8e..890bc7cac 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml @@ -1,4 +1,5 @@ -api_version: v1 +--- +apiVersion: v1 kind: Secret metadata: name: "{{ .Values.mas_aibroker_provision_tenant }}----apikey-secret" From 63d7aaef70e4df16a990dbe9bdeac732ed3d143f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 12:43:19 +0530 Subject: [PATCH 261/491] Create 03-aibroker-copy-secret.yaml --- .../templates/03-aibroker-copy-secret.yaml | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml new file mode 100644 index 000000000..7a68637c3 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml @@ -0,0 +1,70 @@ +# need to copy both the secret and create them here. +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "302" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + +--- + +kind: Secret +apiVersion: v1 +metadata: + name: ibm-entitlement + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "303" +type: kubernetes.io/dockerconfigjson +data: + .dockerconfigjson: >- + {{ .Values.ibm_entitlement_key }} + +# apiVersion: batch/v1 +# kind: Job +# metadata: +# name: copy-secrets +# namespace: {{ .Values.tenantNamespace }} +# annotations: +# "helm.sh/hook": pre-install +# spec: +# template: +# spec: +# containers: +# - name: copy +# image: bitnami/kubectl:latest +# command: +# - /bin/sh +# - -c +# - | +# for secret in km-s3-secret {{ .Values.aibroker_pull_secret_name }}; do +# kubectl get secret $secret -n mas-{{ .Values.mas_instance_id }}-aibroker -o yaml \ +# | sed "s/namespace: .*/namespace: {{ .Values.tenantNamespace }}/" \ +# | kubectl apply --force -f - +# done +# restartPolicy: Never From d0b81700af024be9ff58f88a4bea212e530a7515 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 14:15:49 +0530 Subject: [PATCH 262/491] Create 00-aibroker-tenent-namespace.yaml --- .../templates/00-aibroker-tenent-namespace.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml new file mode 100644 index 000000000..fb4217836 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "300" + From cddde25051bf43f188b57ce9095e17fe4a9d2da8 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 14:25:05 +0530 Subject: [PATCH 263/491] artifactory token added --- .../templates/03-aibroker-copy-secret.yaml | 5 ++--- instance-applications/115-ibm-aibroker-tenant/values.yaml | 2 ++ .../templates/060-ibm-aibroker-tenant-app.yaml | 1 + root-applications/ibm-aibroker-instance-root/values.yaml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml index 7a68637c3..f2e16aec8 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml @@ -41,9 +41,8 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "303" type: kubernetes.io/dockerconfigjson -data: - .dockerconfigjson: >- - {{ .Values.ibm_entitlement_key }} +stringData: + .dockerconfigjson: "{{ .Values.artifactory_token}}" # apiVersion: batch/v1 # kind: Job diff --git a/instance-applications/115-ibm-aibroker-tenant/values.yaml b/instance-applications/115-ibm-aibroker-tenant/values.yaml index 0740fb80a..a7144becf 100644 --- a/instance-applications/115-ibm-aibroker-tenant/values.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/values.yaml @@ -10,6 +10,8 @@ mas_aibroker_saas: "false" mas_aibroker_provision_tenant: "provision-tenant" # Tenant +artifactory_token: "ARTIFACTORY_TOKEN" + mas_aibroker_tenant_name: "user" tenant_action: "true" tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 128f3278b..3f7ed9100 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -46,6 +46,7 @@ spec: mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" # Tenant + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 59bb43952..de3ea181b 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -226,6 +226,7 @@ ibm_aibroker_tenant: mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" # Tenant + artifactory_token: "artifactory_token" mas_aibroker_tenant_name: "user" tenant_action: "true" tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' From 6ea7c5ae59c5e8d92e504087200b6d4636b5d394 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:07:07 +0530 Subject: [PATCH 264/491] Create 04-aibroker-configmap.yaml --- .../templates/04-aibroker-configmap.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml new file mode 100644 index 000000000..fe1f558b7 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: connector-config + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "304" +data: {} \ No newline at end of file From 6e0f45b6b5e3eee25ae9c60d90f11433e004139f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:07:25 +0530 Subject: [PATCH 265/491] Create 05-aibroker-service-account.yaml --- .../templates/05-aibroker-service-account.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml new file mode 100644 index 000000000..b02b4a312 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: km-s3-sa + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "305" +secrets: + - name: km-s3-secret \ No newline at end of file From 0ecde2d0f3ef7dfdb7739f0a7d33a010c64d5848 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:08:07 +0530 Subject: [PATCH 266/491] Create 06-aibroker-kserve-huggingfaceserver.yaml --- .../06-aibroker-kserve-huggingfaceserver.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml new file mode 100644 index 000000000..8839587ce --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: serving.kserve.io/v1alpha1 +kind: ServingRuntime +metadata: + name: kserve-huggingfaceserver + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "306" +spec: + annotations: + prometheus.kserve.io/port: "8080" + prometheus.kserve.io/path: "/metrics" + supportedModelFormats: + - name: huggingface + version: "1" + autoSelect: true + priority: 1 + protocolVersions: + - v2 + - v1 + containers: + - name: kserve-container + image: kserve/huggingfaceserver:latest + args: + - '--model_name={{".Name"}}' + env: + - name: HUGGINGFACE_HUB_CACHE + value: /tmp/huggingface/hub + resources: + requests: + cpu: "1" + memory: 2Gi + limits: + cpu: "1" + memory: 2Gi From b6b7e8876c02135db285f33a092f4214eb1195bd Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:08:49 +0530 Subject: [PATCH 267/491] Create 07-aibroker-kserve-lgbserver.yaml --- .../07-aibroker-kserve-lgbserver.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml new file mode 100644 index 000000000..a66399a71 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: serving.kserve.io/v1alpha1 +kind: ServingRuntime +metadata: + name: kserve-lgbserver + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "307" +spec: + annotations: + prometheus.kserve.io/port: "8080" + prometheus.kserve.io/path: "/metrics" + supportedModelFormats: + - name: lightgbm + version: "3" + autoSelect: true + priority: 1 + protocolVersions: + - v1 + - v2 + containers: + - name: kserve-container + image: kserve/lgbserver:latest + args: + - '--model_name={{".Name"}}' + - --model_dir=/mnt/models + - --http_port=8080 + - --nthread=1 + resources: + requests: + cpu: "1" + memory: 2Gi + limits: + cpu: "1" + memory: 2Gi From 8eb42437a770de9f3e5d63d5665f02e55577af6f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:09:43 +0530 Subject: [PATCH 268/491] Create 08-aibroker-kserve-sklearnserver.yaml --- .../08-aibroker-kserve-sklearnserver.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml new file mode 100644 index 000000000..b99b21f1b --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml @@ -0,0 +1,34 @@ +--- +apiVersion: serving.kserve.io/v1alpha1 +kind: ServingRuntime +metadata: + name: kserve-sklearnserver + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "308" +spec: + annotations: + prometheus.kserve.io/port: "8080" + prometheus.kserve.io/path: "/metrics" + supportedModelFormats: + - name: sklearn + version: "1" + autoSelect: true + priority: 1 + protocolVersions: + - v1 + - v2 + containers: + - name: kserve-container + image: kserve/sklearnserver:latest + args: + - '--model_name={{".Name"}}' + - --model_dir=/mnt/models + - --http_port=8080 + resources: + requests: + cpu: "1" + memory: 2Gi + limits: + cpu: "1" + memory: 2Gi From 3afcb840580a48e0d9bb99cde150e1c6ad0059ae Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:10:52 +0530 Subject: [PATCH 269/491] Create 09-aibroker-kserve-xgbserver.yaml --- .../09-aibroker-kserve-xgbserver.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml new file mode 100644 index 000000000..94a4113e3 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: serving.kserve.io/v1alpha1 +kind: ServingRuntime +metadata: + name: kserve-xgbserver + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "309" +spec: + annotations: + prometheus.kserve.io/port: "8080" + prometheus.kserve.io/path: "/metrics" + supportedModelFormats: + - name: xgboost + version: "1" + autoSelect: true + priority: 1 + protocolVersions: + - v1 + - v2 + containers: + - name: kserve-container + image: kserve/xgbserver:latest + args: + - '--model_name={{".Name"}}' + - --model_dir=/mnt/models + - --http_port=8080 + - --nthread=1 + resources: + requests: + cpu: "1" + memory: 2Gi + limits: + cpu: "1" + memory: 2Gi From 8e6787060a16fc24336ceb62b9327d8802f79288 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:12:04 +0530 Subject: [PATCH 270/491] Create 10-aibroker-rbac.yaml --- .../templates/10-aibroker-rbac.yaml | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml new file mode 100644 index 000000000..f4dfd5944 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml @@ -0,0 +1,112 @@ +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-controller-role + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "310" +rules: + - verbs: + - list + apiGroups: + - '' + resources: + - pods + - configmaps + - secrets + - verbs: + - delete + apiGroups: + - '' + resources: + - pods + - verbs: + - list + apiGroups: + - metrics.k8s.io + resources: + - nodes + - pods + - verbs: + - list + apiGroups: + - apps + resources: + - deployments + - verbs: + - list + - create + - delete + apiGroups: + - batch + resources: + - jobs + - cronjobs + - verbs: + - create + - list + - delete + - get + - patch + apiGroups: + - serving.kserve.io + resources: + - inferenceservices +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-controller-binding + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "311" +subjects: + - kind: ServiceAccount + name: km-controller + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: km-controller-role +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-role + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "312" +rules: + - verbs: + - list + - watch + apiGroups: + - '' + resources: + - events + - pods + - verbs: + - list + - watch + apiGroups: + - batch + resources: + - cronjobs + - jobs +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: km-watcher-binding + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "313" +subjects: + - kind: ServiceAccount + name: km-watcher + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: km-watcher-role From dd73de7099991a3c826c43ffd9be265f1b3e7c76 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 16:14:17 +0530 Subject: [PATCH 271/491] Create 11-aibroker-sls-secret.yaml --- .../templates/11-aibroker-sls-secret.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml new file mode 100644 index 000000000..596d1c9af --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -0,0 +1,16 @@ +# as per dicussion we need to put actual values here, which will be fetched form the secret manager +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----sls-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "313" +type: Opaque +stringData: + SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" + SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" + sls_ca.crt: "{{ .Values.slscfg_ca }}" + sls_tls.crt: "{{ .Values.slscfg_tls }}" + sls_tls.key: "{{ .Values.slscfg_key }}" From 1c2f9fe99b3b8afb55612c9915c999ebf93221d7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 29 Apr 2025 17:19:47 +0530 Subject: [PATCH 272/491] update secret --- .../templates/05-kmodel-ca_Certificate.yaml | 132 +++++++++--------- .../templates/05-kmodel-store.yaml | 2 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml index 21216f435..11bd71e65 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml @@ -1,69 +1,69 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: "kmodel-pkcs12-password" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "166" -type: Opaque -data: - password: {{ .Values.ssh_secret_password | b64enc | quote }} +# --- +# apiVersion: v1 +# kind: Secret +# metadata: +# name: "kmodel-pkcs12-password" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "166" +# type: Opaque +# data: +# password: {{ .Values.ssh_secret_password | b64enc | quote }} ---- -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: "kmodel-ca-issuer" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "167" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -spec: - selfSigned: {} +# --- +# apiVersion: cert-manager.io/v1 +# kind: Issuer +# metadata: +# name: "kmodel-ca-issuer" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "167" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# selfSigned: {} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: "kmodel-certificate" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "168" -{{- if .Values.custom_labels }} - labels: -{{ .Values.custom_labels | toYaml | indent 4 }} -{{- end }} -spec: - secretName: "{{ .Values.ssh_secret_name }}" - duration: "175200h0m0s" - renewBefore: "2160h0m0s" - keystores: - pkcs12: - create: true - passwordSecretRef: - key: password - name: "kmodel-pkcs12-password" +# --- +# apiVersion: cert-manager.io/v1 +# kind: Certificate +# metadata: +# name: "kmodel-certificate" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "168" +# {{- if .Values.custom_labels }} +# labels: +# {{ .Values.custom_labels | toYaml | indent 4 }} +# {{- end }} +# spec: +# secretName: "{{ .Values.ssh_secret_name }}" +# duration: "175200h0m0s" +# renewBefore: "2160h0m0s" +# keystores: +# pkcs12: +# create: true +# passwordSecretRef: +# key: password +# name: "kmodel-pkcs12-password" - issuerRef: - name: "kmodel-ca-issuer" - kind: Issuer - isCA: true - usages: - - cert sign - - digital signature - - key encipherment - - server auth - commonName: "ca.kmodel" - subject: - countries: - - GB - streetAddresses: - - London - localities: - - London - organizationalUnits: - - IBM Maximo Application Suite kmodel \ No newline at end of file +# issuerRef: +# name: "kmodel-ca-issuer" +# kind: Issuer +# isCA: true +# usages: +# - cert sign +# - digital signature +# - key encipherment +# - server auth +# commonName: "ca.kmodel" +# subject: +# countries: +# - GB +# streetAddresses: +# - London +# localities: +# - London +# organizationalUnits: +# - IBM Maximo Application Suite kmodel \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 3562989a0..50f0c00c6 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -71,7 +71,7 @@ spec: volumes: - name: ssh-key secret: - secretName: "{{ .Values.ssh_secret_name }}" + secretName: "sremat-internal-aibroker-tls" imagePullSecrets: - name: "{{ .Values.pullSecretName }}" containers: From c3a377086e1aa8e72039d36358950950566225fa Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 29 Apr 2025 19:22:15 +0530 Subject: [PATCH 273/491] Revert "Create 11-aibroker-sls-secret.yaml" This reverts commit dd73de7099991a3c826c43ffd9be265f1b3e7c76. --- .../templates/11-aibroker-sls-secret.yaml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml deleted file mode 100644 index 596d1c9af..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# as per dicussion we need to put actual values here, which will be fetched form the secret manager ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.tenantNamespace }}----sls-secret" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "313" -type: Opaque -stringData: - SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" - SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" - sls_ca.crt: "{{ .Values.slscfg_ca }}" - sls_tls.crt: "{{ .Values.slscfg_tls }}" - sls_tls.key: "{{ .Values.slscfg_key }}" From 98658675d118682ea9b5f0fa3082011bbb9eeeda Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 10:43:51 +0530 Subject: [PATCH 274/491] Reapply "Create 11-aibroker-sls-secret.yaml" This reverts commit c3a377086e1aa8e72039d36358950950566225fa. --- .../templates/11-aibroker-sls-secret.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml new file mode 100644 index 000000000..596d1c9af --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -0,0 +1,16 @@ +# as per dicussion we need to put actual values here, which will be fetched form the secret manager +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----sls-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "313" +type: Opaque +stringData: + SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" + SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" + sls_ca.crt: "{{ .Values.slscfg_ca }}" + sls_tls.crt: "{{ .Values.slscfg_tls }}" + sls_tls.key: "{{ .Values.slscfg_key }}" From 17725bb777ad0041aff2ce611b7318f567f86c73 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 11:22:19 +0530 Subject: [PATCH 275/491] Update 07-kmodel-controller.yaml --- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index ce550c03a..5959ae2b1 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -104,7 +104,7 @@ spec: claimName: km-controller-pvc - name: ssh-key secret: - secretName: "{{ .Values.ssh_secret_name }}" + secretName: "sremat-internal-aibroker-tls" imagePullSecrets: - name: "{{ .Values.pullSecretName }}" containers: From ecbcac551024f6cb90599b72072d2fee9c3a7c2c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 14:19:01 +0530 Subject: [PATCH 276/491] Update 11-aibroker-sls-secret.yaml code commented. --- .../templates/11-aibroker-sls-secret.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index 596d1c9af..6e4140698 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -1,16 +1,16 @@ -# as per dicussion we need to put actual values here, which will be fetched form the secret manager ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.tenantNamespace }}----sls-secret" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "313" -type: Opaque -stringData: - SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" - SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" - sls_ca.crt: "{{ .Values.slscfg_ca }}" - sls_tls.crt: "{{ .Values.slscfg_tls }}" - sls_tls.key: "{{ .Values.slscfg_key }}" +# # as per dicussion we need to put actual values here, which will be fetched form the secret manager +# --- +# apiVersion: v1 +# kind: Secret +# metadata: +# name: "{{ .Values.tenantNamespace }}----sls-secret" +# namespace: "{{ .Values.aibroker_namespace }}" +# annotations: +# argocd.argoproj.io/sync-wave: "313" +# type: Opaque +# stringData: +# SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" +# SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" +# sls_ca.crt: "{{ .Values.slscfg_ca }}" +# sls_tls.crt: "{{ .Values.slscfg_tls }}" +# sls_tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file From 234aebd0e0a66616b85a8fea8d03441bbcae5e5a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 15:17:22 +0530 Subject: [PATCH 277/491] toggle flag --- instance-applications/114-ibm-kmodels/values.yaml | 2 +- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 905cb3b41..f25597ff4 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -4,7 +4,7 @@ run_sync_hooks: true aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "aws" -mas_aibroker_storage_ssl: "true" +mas_aibroker_storage_ssl: "false" # following are the variable need to injected via environment variable mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index de3ea181b..b8134bfa1 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -99,7 +99,7 @@ ibm_kmodel: aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_ssl: "true" + mas_aibroker_storage_ssl: "false" openshift_namespace: "openshift-operators" run_sync_hooks: true From 6dcc6831a01093fb5dedcff4c6d5dea652870aba Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 16:10:33 +0530 Subject: [PATCH 278/491] added dro secret --- .../templates/11-aibroker-sls-secret.yaml | 16 ---------------- .../templates/12-aibroker-dro-secret.yaml | 11 +++++++++++ 2 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index 6e4140698..e69de29bb 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -1,16 +0,0 @@ -# # as per dicussion we need to put actual values here, which will be fetched form the secret manager -# --- -# apiVersion: v1 -# kind: Secret -# metadata: -# name: "{{ .Values.tenantNamespace }}----sls-secret" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "313" -# type: Opaque -# stringData: -# SLS_CLIENT_ID: "{{ .Values.slscfg_clientId | default (printf \"%s-%s%s\" \"aibroker\" \"88\" (randAlphaNum 12 | lower)) }}" -# SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" -# sls_ca.crt: "{{ .Values.slscfg_ca }}" -# sls_tls.crt: "{{ .Values.slscfg_tls }}" -# sls_tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml new file mode 100644 index 000000000..668679175 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----dro-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "314" +type: Opaque +stringData: + DRO_TOKEN: "{{ .Values.drocfg_registration_key }}" From 9f9abfa22a2b49a445494a714ee9873435cfeca6 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 16:15:08 +0530 Subject: [PATCH 279/491] Create 13-aibroker-apikey.yaml --- .../templates/13-aibroker-apikey.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml new file mode 100644 index 000000000..eab2b5325 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml @@ -0,0 +1,11 @@ +--- +api_version: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----apikey-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "315" +type: Opaque +stringData: + AIBROKER_APIKEY: {{ randAlphaNum 32 | quote }} \ No newline at end of file From 7a8774912f3d541804da832ec9b7deea8fd82a43 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 21:07:43 +0530 Subject: [PATCH 280/491] Update 13-aibroker-apikey.yaml --- .../115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml index eab2b5325..a26f034f2 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml @@ -8,4 +8,4 @@ metadata: argocd.argoproj.io/sync-wave: "315" type: Opaque stringData: - AIBROKER_APIKEY: {{ randAlphaNum 32 | quote }} \ No newline at end of file + AIBROKER_APIKEY: {{ randAlphaNum 32 | b64enc | quote }} \ No newline at end of file From 2fe2d27d11a5cf98bc99830d4f0c2fd39085ebb4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 21:09:16 +0530 Subject: [PATCH 281/491] Update 13-aibroker-apikey.yaml replaced string data --- .../115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml index a26f034f2..f7cd94efb 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml @@ -7,5 +7,5 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "315" type: Opaque -stringData: +data: AIBROKER_APIKEY: {{ randAlphaNum 32 | b64enc | quote }} \ No newline at end of file From c6f9fba9a3b5b3f505bc60c825d294ee5884b7ef Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 21:10:00 +0530 Subject: [PATCH 282/491] Update 13-aibroker-apikey.yaml version updated --- .../115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml index f7cd94efb..452136938 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml @@ -1,5 +1,5 @@ --- -api_version: v1 +apiVersion: v1 kind: Secret metadata: name: "{{ .Values.tenantNamespace }}----apikey-secret" From 4405c19a47b4ea5b91f0d7f8a1485930f9f67c61 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 21:13:03 +0530 Subject: [PATCH 283/491] Create 14-aibroker-s3-secret.yaml --- .../templates/14-aibroker-s3-secret.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml new file mode 100644 index 000000000..0936adb6e --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.mas_aibroker_provision_tenant }}----s3-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "316" +type: Opaque +stringData: + ACCESS-KEY: "{{ .Values.mas_aibroker_storage_accesskey }}" + SECRET-KEY: "{{ .Values.mas_aibroker_storage_secretkey }}" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + URL: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + URL: "http://{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + REGION: "{{ .Values.mas_aibroker_storage_region }}" + BUCKET-NAME: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" \ No newline at end of file From d27cb35690b48dc2244da2e1e91abbefc4a5a6e1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 30 Apr 2025 21:15:39 +0530 Subject: [PATCH 284/491] Create 15-aibroker-wx.yaml --- .../templates/15-aibroker-wx.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml new file mode 100644 index 000000000..e7fdc0a67 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----wx-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "317" +type: Opaque +stringData: + wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" + wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + + +# Copy secrets to tenant namespace +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----wx-secret" + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "318" +type: Opaque +stringData: + wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" + wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" From b0e4b484333d2f18b6590f1becc5bcbc5507accf Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 1 May 2025 16:04:05 +0530 Subject: [PATCH 285/491] code change for aibroker tenant added --- .../templates/11-aibroker-sls-secret.yaml | 16 ++++++++++++ .../060-ibm-aibroker-tenant-app.yaml | 21 +++++++-------- .../ibm-aibroker-instance-root/values.yaml | 26 ++++++++++--------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index e69de29bb..90393eca7 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -0,0 +1,16 @@ +# as per dicussion we need to put actual values here, which will be fetched form the secret manager +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Values.tenantNamespace }}----sls-secret" + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "313" +type: Opaque +stringData: + SLS_CLIENT_ID: {{ .Values.slscfg_clientId | default (printf "%s-88%s" "aibroker" (randAlphaNum 12 | lower)) | quote }} + SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" + aibroker-88s55n4n7obrkn-ca.crt: "{{ .Values.slscfg_ca }}" + aibroker-88s55n4n7obrkn-tls.crt: "{{ .Values.slscfg_tls }}" + aibroker-88s55n4n7obrkn-tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 3f7ed9100..06d27969d 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -58,19 +58,18 @@ spec: # DRO mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - drocfg: - url: "{{ .Values.ibm_aibroker_tenant.drocfg.url }}" - ca: "{{ .Values.ibm_aibroker_tenant.drocfg.ca }}" - registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg.registration_key }}" - slscfg: - registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg.registration_key }}" - url: "{{ .Values.ibm_aibroker_tenant.slscfg.url }}" - slsClientId: "{{ .Values.ibm_aibroker_tenant.slscfg.slsClientId }}" - ca: "{{ .Values.ibm_aibroker_tenant.slscfg.ca }}" - tls: "{{ .Values.ibm_aibroker_tenant.slscfg.tls }}" - key: "{{ .Values.ibm_aibroker_tenant.slscfg.key }}" + drocfg_ca: "{{ .Values.ibm_aibroker.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker.drocfg_url }}" + #sls + slscfg_registration_key: "{{ .Values.ibm_aibroker.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker.slscfg_url }}" + slscfg_clientId: "{{ .Values.ibm_aibroker.slscfg_clientId }}" + slscfg_ca: "{{ .Values.ibm_aibroker.slscfg_ca }}" + slscfg_tls: "{{ .Values.ibm_aibroker.slscfg_tls }}" + slscfg_key: "{{ .Values.ibm_aibroker.slscfg_key }}" # WatsonX mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index b8134bfa1..4fef2e511 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -238,18 +238,20 @@ ibm_aibroker_tenant: # DRO mas_aibroker_dro_token_secret: "dro-token" mas_aibroker_dro_cacert_secret: "dro-certificates" - drocfg: - url: "{{ drocfg[1].spec.config.url }}" - ca: "ca.crt" - registration_key: "DRO_TOKEN" - - slscfg: - registration_key: "registration_key" - url: "{{ config.url }}" - slsClientId: "aibroker-$instanceIdentifier" - ca: "aibroker-${instanceIdentifier}-ca.crt" - tls: "aibroker-${instanceIdentifier}-tls.crt" - key: "aibroker-${instanceIdentifier}-tls.key" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + #sls + slscfg_registration_key: "registration_key" + slscfg_url: "{{ config.url }}" + # instanceIdentifier: 88abcdefghijkl + slscfg_clientId: "aibroker-{{instanceIdentifier}}" + slscfg_ca: "aibroker-${instanceIdentifier}-ca.crt" + slscfg_tls: "aibroker-${instanceIdentifier}-tls.crt" + slscfg_key: "aibroker-${instanceIdentifier}-tls.key" + # WatsonX mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY From 97810e8c7abc127d7d3cfd00d02c6a03660f4bc7 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 1 May 2025 16:12:33 +0530 Subject: [PATCH 286/491] Update values.yaml --- .../ibm-aibroker-instance-root/values.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4fef2e511..a453c1be8 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -244,13 +244,12 @@ ibm_aibroker_tenant: drocfg_url: "drocfg_url" #sls - slscfg_registration_key: "registration_key" - slscfg_url: "{{ config.url }}" - # instanceIdentifier: 88abcdefghijkl - slscfg_clientId: "aibroker-{{instanceIdentifier}}" - slscfg_ca: "aibroker-${instanceIdentifier}-ca.crt" - slscfg_tls: "aibroker-${instanceIdentifier}-tls.crt" - slscfg_key: "aibroker-${instanceIdentifier}-tls.key" + slscfg_registration_key: "slscfg_registration_key" + slscfg_url: "slscfg_url" + slscfg_clientId: "slscfg_clientId" + slscfg_ca: "slscfg_ca" + slscfg_tls: "slscfg_tls" + slscfg_key: "slscfg_key" # WatsonX From 9e70b073d3e9f0276f0330b91d0059cbedf1759a Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 1 May 2025 16:19:36 +0530 Subject: [PATCH 287/491] Update 11-aibroker-sls-secret.yaml --- .../templates/11-aibroker-sls-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index 90393eca7..f885dd94f 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -9,7 +9,7 @@ metadata: argocd.argoproj.io/sync-wave: "313" type: Opaque stringData: - SLS_CLIENT_ID: {{ .Values.slscfg_clientId | default (printf "%s-88%s" "aibroker" (randAlphaNum 12 | lower)) | quote }} + SLS_CLIENT_ID: "aibroker-88s55n4n7obrkn" SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" aibroker-88s55n4n7obrkn-ca.crt: "{{ .Values.slscfg_ca }}" aibroker-88s55n4n7obrkn-tls.crt: "{{ .Values.slscfg_tls }}" From e95ff89908f2cdc4319bc837679cef40200ba1b8 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 1 May 2025 16:28:48 +0530 Subject: [PATCH 288/491] ibm_aibroker_tenant name updated --- .../114-ibm-kmodels/README.md | 4 ++-- .../115-ibm-aibroker-tenant/values.yaml | 9 +++++---- .../templates/060-ibm-aibroker-tenant-app.yaml | 18 +++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/README.md b/instance-applications/114-ibm-kmodels/README.md index 131097f1a..07e700255 100644 --- a/instance-applications/114-ibm-kmodels/README.md +++ b/instance-applications/114-ibm-kmodels/README.md @@ -1,3 +1,3 @@ -IBM AIBroker +IBM Kmodel =============================================================================== -Deploy and configure aibroker storage with configurable version \ No newline at end of file +Deploy and configure kmodel with configurable version \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/values.yaml b/instance-applications/115-ibm-aibroker-tenant/values.yaml index a7144becf..29abc341d 100644 --- a/instance-applications/115-ibm-aibroker-tenant/values.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/values.yaml @@ -30,10 +30,11 @@ drocfg_registration_key: "DRO_TOKEN" #sls slscfg_registration_key: "registration_key" slscfg_url: "{{ config.url }}" -slscfg_clientId: "aibroker-$instanceIdentifier" -slscfg_ca: "aibroker-${instanceIdentifier}-ca.crt" -slscfg_tls: "aibroker-${instanceIdentifier}-tls.crt" -slscfg_key: "aibroker-${instanceIdentifier}-tls.key" +# instanceIdentifier: 88abcdefghijkl +slscfg_clientId: "aibroker-88s55n4n7obrkn" +slscfg_ca: "aibroker-88s55n4n7obrkn-ca.crt" +slscfg_tls: "aibroker-88s55n4n7obrkn-tls.crt" +slscfg_key: "aibroker-88s55n4n7obrkn-tls.key" # WatsonX mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 06d27969d..8d546be3f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -59,17 +59,17 @@ spec: mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - drocfg_ca: "{{ .Values.ibm_aibroker.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker.drocfg_url }}" + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" #sls - slscfg_registration_key: "{{ .Values.ibm_aibroker.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker.slscfg_url }}" - slscfg_clientId: "{{ .Values.ibm_aibroker.slscfg_clientId }}" - slscfg_ca: "{{ .Values.ibm_aibroker.slscfg_ca }}" - slscfg_tls: "{{ .Values.ibm_aibroker.slscfg_tls }}" - slscfg_key: "{{ .Values.ibm_aibroker.slscfg_key }}" + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" + slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" + slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" # WatsonX mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" From 2bcc1da03dac04a4d0e4268d9e014b8d5075cefc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 2 May 2025 12:25:37 +0530 Subject: [PATCH 289/491] pipelines-operator --- .../01-odh-pipeline-operator-subcription.yaml | 10 +++++----- instance-applications/112-ibm-odh/values.yaml | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml index 7456d007f..d197c17cc 100644 --- a/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml @@ -3,14 +3,14 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: openshift-pipelines-operator - namespace: openshift-operators + name: {{ .Values.odh_pipeline_name }} + namespace: {{ .Values.odh_pipeline_namespace}} annotations: argocd.argoproj.io/sync-wave: "116" spec: channel: {{ .Values.odh_pipeline_channel }} installPlanApproval: {{ .Values.odh_pipeline_installplan }} - name: openshift-pipelines-operator-rh - source: redhat-operators - sourceNamespace: openshift-marketplace + name: {{ .Values.odh_pipeline_operatorName }} + source: {{ .Values.odh_pipeline_source }} + sourceNamespace: {{ .Values.odh_pipeline_sourceNamespace }} diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 31dd290cd..6f4e3f459 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -12,6 +12,13 @@ authorino_catalog_source: "community-operators" odh_channel: "fast" odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.19.0" +#Odh_Pipeline_operator +odh_pipeline_name: "openshift-pipelines-operator" +odh_pipeline_namespace: "openshift-operators" +odh_pipeline_operatorName: "openshift-pipelines-operator-rh" +odh_pipeline_source: "redhat_operators" +odh_pipeline_sourceNamespace: "openshift_marketplace" +#Serverless Operator namespace: "openshift-operators" channel: "latest" From b7510a2c3ffe08219b19c5bc1f397b13eb9f3fe8 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 2 May 2025 12:39:46 +0530 Subject: [PATCH 290/491] removed unused code --- .../08-aibroker-operator-subscription.yaml | 5 +---- .../templates/08-aibroker-secret.yaml | 14 -------------- .../templates/08-aibroker-subscription.yaml | 15 --------------- .../templates/09-aibroker-app.yaml | 4 ---- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml delete mode 100644 instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index 83f827a30..02b72e9da 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -9,10 +9,7 @@ metadata: type: kubernetes.io/dockerconfigjson stringData: .dockerconfigjson: "{{ .Values.artifactory_token}}" - # icr_username: "{{ .Values.mas_entitlement_username }}" - # icr_password: "{{ .Values.mas_entitlement_key}}" - # artifactory_username: "{{ .Values.artifactory_username}}" - # artifactory_password: "{{ .Values.artifactory_token}}" + --- apiVersion: operators.coreos.com/v1 kind: OperatorGroup diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml deleted file mode 100644 index 346db28a7..000000000 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# apiVersion: v1 -# kind: Secret -# metadata: -# name: ibm-entitlement -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "146" -# type: Opaque -# stringData: -# .dockerconfigjson: "{{ .Values.artifactory_token}}" -# # icr_username: "{{ .Values.mas_entitlement_username }}" -# # icr_password: "{{ .Values.mas_entitlement_key}}" -# # artifactory_username: "{{ .Values.artifactory_username}}" -# # artifactory_password: "{{ .Values.artifactory_token}}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml deleted file mode 100644 index 968c47f2d..000000000 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-subscription.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# --- -# apiVersion: operators.coreos.com/v1alpha1 -# kind: Subscription -# metadata: -# name: ibm-mas-aibroker -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "148" -# argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -# spec: -# channel: "{{ .Values.mas_app_channel }}" -# installPlanApproval: Automatic -# name: ibm-mas-aibroker -# source: "{{ .Values.mas_catalog_source }}" -# sourceNamespace: openshift-marketplace \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 0c4d1596e..f4793cdc5 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -11,10 +11,6 @@ metadata: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: - # bindings: - # - name: secretbind - # kind: Secret - # ref: ibm-entitlement settings: icr: cp: "{{ .Values.mas_icr_cp }}" From 37ebd63de0cd57f374a7bc4ad59a2881c3ad66c8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 2 May 2025 13:27:12 +0530 Subject: [PATCH 291/491] odh and serverless --- .../02-odh-serverless-subscription.yaml | 14 +++++++------- .../templates/05-odh-operator-subcription.yaml | 18 +++++++++--------- instance-applications/112-ibm-odh/values.yaml | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index e5eb4a00e..ba8276c21 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Namespace metadata: - name: openshift-serverless + name: {{ .Values.serverless_namespace}} annotations: argocd.argoproj.io/sync-wave: "117" @@ -13,23 +13,23 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: name: operatorgroup - namespace: openshift-serverless + namespace: {{ .Values.serverless_namespace}} annotations: argocd.argoproj.io/sync-wave: "117" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: serverless-operator - namespace: openshift-serverless + name: {{ .Values.serverless_operator_name}} + namespace: {{ .Values.serverless_namespace}} annotations: argocd.argoproj.io/sync-wave: "118" spec: channel: stable installPlanApproval: Automatic - name: serverless-operator - source: redhat-operators - sourceNamespace: openshift-marketplace + name: { .Values.serverless_operator_name}} + source: { .Values.serverless_operator_source}} + sourceNamespace: { .Values.serverless_operator_sourceNamespace}} diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml index b7ff50b7e..1494b2672 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-subcription.yaml @@ -2,22 +2,22 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: opendatahub-operator-group - namespace: opendatahub + name: {{ .Values.opendatahub_OperatorGroup_name}} + namespace: {{ .Values.opendatahub_namespace}} annotations: argocd.argoproj.io/sync-wave: "126" --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: opendatahub-operator - namespace: opendatahub + name: {{ .Values.opendatahub_name}} + namespace: {{ .Values.opendatahub_namespace}} annotations: argocd.argoproj.io/sync-wave: "127" spec: - channel: fast - installPlanApproval: Manual - name: opendatahub-operator - source: community-operators - sourceNamespace: openshift-marketplace + channel: {{ .Values.opendatahub_channel}} + installPlanApproval: {{ .Values.opendatahub_installPlanApproval}} + name: {{ .Values.opendatahub_name}} + source: {{ .Values.opendatahub_source}} + sourceNamespace: {{ .Values.opendatahub__sourceNamespace}} startingCSV: {{ .Values.odh_operator_version }} \ No newline at end of file diff --git a/instance-applications/112-ibm-odh/values.yaml b/instance-applications/112-ibm-odh/values.yaml index 6f4e3f459..0bf0aef87 100644 --- a/instance-applications/112-ibm-odh/values.yaml +++ b/instance-applications/112-ibm-odh/values.yaml @@ -18,7 +18,23 @@ odh_pipeline_namespace: "openshift-operators" odh_pipeline_operatorName: "openshift-pipelines-operator-rh" odh_pipeline_source: "redhat_operators" odh_pipeline_sourceNamespace: "openshift_marketplace" + #Serverless Operator +serverless_namespace: "openshift-serverless" +serverless_operator_name: "serverless-operator" +serverless_operator_source: "redhat-operators" +serverless_operator_sourceNamespace: "openshift-marketplace" + +#opendatahub Operator +opendatahub_OperatorGroup_name: "opendatahub-operator-group" +opendatahub_name: "opendatahub-operator" +opendatahub_namespace: "opendatahub" +opendatahub_installPlanApproval: "Manual" +opendatahub_channel: "fast" +opendatahub_source: "community-operators" +opendatahub__sourceNamespace: "openshift-marketplace" + + namespace: "openshift-operators" channel: "latest" From 3f3339543ec45e14768dac7e0aed4af713f9e976 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 2 May 2025 13:45:50 +0530 Subject: [PATCH 292/491] odh --- .../templates/07-odh-external-secret-db.yaml | 2 -- .../templates/030-ibm-odh-app.yaml | 17 +++++++++++++++ .../ibm-aibroker-instance-root/values.yaml | 21 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml index 3dbb91196..2ceb316ab 100644 --- a/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml +++ b/instance-applications/112-ibm-odh/templates/07-odh-external-secret-db.yaml @@ -9,5 +9,3 @@ metadata: type: Opaque stringData: password: "{{ .Values.mas_aibroker_db_secret_value }}" -# data: -# password: {{ .Values.mas_aibroker_db_secret_value | b64enc }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 26dc4bc69..6ad30d083 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -43,6 +43,23 @@ spec: - name: {{ .Values.avp.values_varname }} value: | openshift_namespace: "{{ .Values.ibm_odh.openshift_namespace }}" + odh_pipeline_name: "{{ .Values.ibm_odh.odh_pipeline_name }}" + odh_pipeline_namespace: "{{ .Values.ibm_odh.odh_pipeline_namespace }}" + odh_pipeline_operatorName: "{{ .Values.ibm_odh.odh_pipeline_operatorName }}" + odh_pipeline_source: "{{ .Values.ibm_odh.odh_pipeline_source }}" + odh_pipeline_sourceNamespace: "{{ .Values.ibm_odh.odh_pipeline_sourceNamespace }}" + serverless_namespace: "{{ .Values.ibm_odh.serverless_namespace }}" + serverless_operator_name: "{{ .Values.ibm_odh.serverless_operator_name }}" + serverless_operator_source: "{{ .Values.ibm_odh.serverless_operator_source }}" + serverless_operator_sourceNamespace: "{{ .Values.ibm_odh.serverless_operator_sourceNamespace }}" + opendatahub_OperatorGroup_name: "{{ .Values.ibm_odh.opendatahub_OperatorGroup_name }}" + opendatahub_name: "{{ .Values.ibm_odh.opendatahub_name }}" + opendatahub_channel: "{{ .Values.ibm_odh.opendatahub_channel }}" + opendatahub_namespace: "{{ .Values.ibm_odh.opendatahub_namespace }}" + opendatahub_installPlanApproval: "{{ .Values.ibm_odh.opendatahub_installPlanApproval }}" + opendatahub_source: "{{ .Values.ibm_odh.opendatahub_source }}" + opendatahub__sourceNamespace: "{{ .Values.ibm_odh.opendatahub__sourceNamespace }}" + odh_pipeline_channel: "{{ .Values.ibm_odh.odh_pipeline_channel }}" odh_pipeline_installplan: "{{ .Values.ibm_odh.odh_pipeline_installplan }}" odh_namespace: "{{ .Values.ibm_odh.odh_namespace }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index a453c1be8..98a301153 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -70,6 +70,27 @@ ibm_odh: odh_channel: "fast" odh_catalog_source: "community-operators" odh_operator_version: "opendatahub-operator.v2.11.1" + #Odh_Pipeline_operator + odh_pipeline_name: "openshift-pipelines-operator" + odh_pipeline_namespace: "openshift-operators" + odh_pipeline_operatorName: "openshift-pipelines-operator-rh" + odh_pipeline_source: "redhat_operators" + odh_pipeline_sourceNamespace: "openshift_marketplace" + + #Serverless Operator + serverless_namespace: "openshift-serverless" + serverless_operator_name: "serverless-operator" + serverless_operator_source: "redhat-operators" + serverless_operator_sourceNamespace: "openshift-marketplace" + + #opendatahub Operator + opendatahub_OperatorGroup_name: "opendatahub-operator-group" + opendatahub_name: "opendatahub-operator" + opendatahub_namespace: "opendatahub" + opendatahub_installPlanApproval: "Manual" + opendatahub_channel: "fast" + opendatahub_source: "community-operators" + opendatahub__sourceNamespace: "openshift-marketplace" aibroker_namespace: "mas_sremat_aibroker" pull_secret_name: "ibm_entitlement" From 386c9a679083701d903102a28552a63d8a5c9bee Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 2 May 2025 14:06:05 +0530 Subject: [PATCH 293/491] remove unused code --- .../templates/020-ibm-minio-app.yaml | 1 - .../templates/030-ibm-odh-app.yaml | 8 -------- 2 files changed, 9 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml index 10917c862..a41a21b41 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -8,7 +8,6 @@ metadata: namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: diff --git a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml index 6ad30d083..9dffa6865 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/030-ibm-odh-app.yaml @@ -21,14 +21,6 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - # ignoreDifferences: - # - group: '*' - # kind: ServiceAccount - # jsonPointers: - # - /imagePullSecrets - # - /metadata/labels - # - /metadata/annotations - # - /metadata/ownerReferences project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} From 61489632ac826a00560a0aec1ca4897ef8e21439 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 2 May 2025 14:47:53 +0530 Subject: [PATCH 294/491] code refactor for the kmodel and aibroker tenent --- .../templates/03-kmodel-istio.yaml | 5 +++- .../templates/05-kmodel-store.yaml | 2 +- .../templates/07-kmodel-controller.yaml | 6 ++++- .../114-ibm-kmodels/values.yaml | 7 +++++- .../templates/03-aibroker-copy-secret.yaml | 24 ------------------- .../templates/11-aibroker-sls-secret.yaml | 1 + .../templates/050-ibm-kmodels-app.yaml | 6 ++++- .../ibm-aibroker-instance-root/values.yaml | 6 +++++ 8 files changed, 28 insertions(+), 29 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml index 03f782fde..1ba455fc6 100644 --- a/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml +++ b/instance-applications/114-ibm-kmodels/templates/03-kmodel-istio.yaml @@ -7,11 +7,12 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "139" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - spec: mtls: mode: PERMISSIVE + --- + apiVersion: networking.istio.io/v1beta1 kind: DestinationRule metadata: @@ -28,7 +29,9 @@ spec: number: 8888 tls: mode: DISABLE + --- + apiVersion: networking.istio.io/v1beta1 kind: DestinationRule metadata: diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 50f0c00c6..7e407549e 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -71,7 +71,7 @@ spec: volumes: - name: ssh-key secret: - secretName: "sremat-internal-aibroker-tls" + secretName: "{{ .Values.aibroker_internal_tls }}" imagePullSecrets: - name: "{{ .Values.pullSecretName }}" containers: diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 5959ae2b1..6bd8d1d02 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -23,6 +23,10 @@ data: DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" {{- end }} PLATFORM: openshift + PVC_STORAGE_CLASS_NAME: "{{ .Values.primary_storage_class }}" + LOG_FORMAT: "json" + MODEL_ID_UNIQUE_LENGTH: "{{ .Values.model_id_unique_length }}" + MODEL_ID_PREFIX: "{{ .Values.model_id_prefix }}" --- @@ -104,7 +108,7 @@ spec: claimName: km-controller-pvc - name: ssh-key secret: - secretName: "sremat-internal-aibroker-tls" + secretName: "{{ .Values.aibroker_internal_tls }}" imagePullSecrets: - name: "{{ .Values.pullSecretName }}" containers: diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index f25597ff4..4f8b625b6 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -1,6 +1,7 @@ --- run_sync_hooks: true - +mas_instance_id: "sremat" +aibroker_internal_tls: "{{ mas_instance_id }}-internal-aibroker-tls" aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "aws" @@ -39,3 +40,7 @@ mas_aibroker_connector_tag: 1.0.0 #saas mas_aibroker_saas: "MAS_AIBROKER_SAAS" + +# model +model_id_unique_length: "8" +model_id_prefix: "m" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml index f2e16aec8..8c0fec8da 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml @@ -43,27 +43,3 @@ metadata: type: kubernetes.io/dockerconfigjson stringData: .dockerconfigjson: "{{ .Values.artifactory_token}}" - -# apiVersion: batch/v1 -# kind: Job -# metadata: -# name: copy-secrets -# namespace: {{ .Values.tenantNamespace }} -# annotations: -# "helm.sh/hook": pre-install -# spec: -# template: -# spec: -# containers: -# - name: copy -# image: bitnami/kubectl:latest -# command: -# - /bin/sh -# - -c -# - | -# for secret in km-s3-secret {{ .Values.aibroker_pull_secret_name }}; do -# kubectl get secret $secret -n mas-{{ .Values.mas_instance_id }}-aibroker -o yaml \ -# | sed "s/namespace: .*/namespace: {{ .Values.tenantNamespace }}/" \ -# | kubectl apply --force -f - -# done -# restartPolicy: Never diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index f885dd94f..a6cf86812 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -1,4 +1,5 @@ # as per dicussion we need to put actual values here, which will be fetched form the secret manager +# this will be removed once operator will create this secret --- apiVersion: v1 kind: Secret diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index e4d7f7969..0162cd6e3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -58,7 +58,11 @@ spec: image_controller: "{{ .Values.ibm_kmodel.image_controller }}" mas_aibroker_pipeline_steps_tag: "{{ .Values.ibm_kmodel.mas_aibroker_pipeline_steps_tag }}" mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" - + aibroker_internal_tls: "{{ .Values.ibm_kmodel.aibroker_internal_tls }}" + mas_instance_id: "{{ .Values.ibm_kmodel.mas_instance_id }}" + model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" + model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" + junitreporter: reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 98a301153..d8310a9b3 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -117,6 +117,8 @@ ibm_odh: ibm_kmodel: + mas_instance_id: "mas_instance_id" + aibroker_internal_tls: "aibroker_internal_tls" aibroker_namespace: "mas-sremat-aibroker" mas_aibroker_storage_provider: "minio" @@ -150,6 +152,10 @@ ibm_kmodel: mas_aibroker_pipeline_steps_tag: 1.0.0 mas_aibroker_connector_tag: 1.0.0 + # model + model_id_unique_length: "model_id_unique_length" + model_id_prefix: "model_id_prefix" + ibm_aibroker: mas_instance_id: "mas_instance_id" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' From f777c77c09067460b92c6ff2a373d24e198da505 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 15 May 2025 17:56:32 +0530 Subject: [PATCH 295/491] kmodel updated --- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 4 ++++ .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 4 +++- instance-applications/114-ibm-kmodels/values.yaml | 8 ++++++++ .../templates/050-ibm-kmodels-app.yaml | 2 ++ root-applications/ibm-aibroker-instance-root/values.yaml | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index 33437dcc2..e23355c34 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -52,8 +52,12 @@ metadata: app: km-watcher data: PIPELINES: "{{ .Values.aibroker_namespace }}" +{{- if hasPrefix "9.0" .Values.mas_app_channel }} + CONTROLLER_URL: "https://km-controller:8443" +{{- else if hasPrefix "9.1" .Values.mas_app_channel }} TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" +{{- end }} --- apiVersion: v1 diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 6bd8d1d02..4737e7c75 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -9,6 +9,7 @@ metadata: labels: app: km-controller data: + CONTAINER_REGISTRY: "{{ .Values.mas_icr_cp }}/aibroker" DOCKER_SERVER: "{{ .Values.docker_server }}" PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" @@ -27,7 +28,8 @@ data: LOG_FORMAT: "json" MODEL_ID_UNIQUE_LENGTH: "{{ .Values.model_id_unique_length }}" MODEL_ID_PREFIX: "{{ .Values.model_id_prefix }}" - + AFFINITY_ENABLED: "false" + CONNECTOR_TTL: "10" --- apiVersion: v1 diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index 4f8b625b6..a9fffd918 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -44,3 +44,11 @@ mas_aibroker_saas: "MAS_AIBROKER_SAAS" # model model_id_unique_length: "8" model_id_prefix: "m" + +# Environment Variable: +mas_app_channel: "9.0 mas_app_channel" + +# Source container registry +# ----------------------------------------------------------------------------- +# mas_icr_cp: "cp.icr.io/cp" +mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index 0162cd6e3..b5d3ac22c 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -62,6 +62,8 @@ spec: mas_instance_id: "{{ .Values.ibm_kmodel.mas_instance_id }}" model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" + mas_app_channel: "{{ .Values.ibm_aibroker.mas_app_channel }}" + mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" junitreporter: reporter_name: "ibm-kmodel-{{ .Values.instance.id }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index d8310a9b3..3244f0f66 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -155,6 +155,12 @@ ibm_kmodel: # model model_id_unique_length: "model_id_unique_length" model_id_prefix: "model_id_prefix" + # Environment Variable: + mas_app_channel: "9.0 mas_app_channel" + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" ibm_aibroker: mas_instance_id: "mas_instance_id" From 56ecd3ceef5d4730aad66eb0757b3eb44e048c86 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 16 May 2025 16:01:40 +0530 Subject: [PATCH 296/491] code changes related to aibroker tenant and the kmodels --- .../templates/06-kmodel-watcher.yaml | 11 +++---- .../templates/07-kmodel-controller.yaml | 14 ++------ .../114-ibm-kmodels/values.yaml | 11 ++----- .../templates/02-aibroker-workspace.yaml | 21 ++++++++---- .../templates/11-aibroker-sls-secret.yaml | 18 +++++++---- .../templates/12-aibroker-dro-secret.yaml | 8 +++++ .../templates/14-aibroker-s3-secret.yaml | 8 ++++- .../templates/15-aibroker-wx.yaml | 24 ++++++++++---- .../16-aibroker-ingress-allow-isvc.yaml | 16 ++++++++++ .../115-ibm-aibroker-tenant/values.yaml | 20 ++++++++---- .../templates/050-ibm-kmodels-app.yaml | 8 ++--- .../060-ibm-aibroker-tenant-app.yaml | 22 ++++++++----- .../ibm-aibroker-instance-root/values.yaml | 32 +++++++++++-------- 13 files changed, 135 insertions(+), 78 deletions(-) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index e23355c34..62f189569 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -51,14 +51,11 @@ metadata: labels: app: km-watcher data: - PIPELINES: "{{ .Values.aibroker_namespace }}" -{{- if hasPrefix "9.0" .Values.mas_app_channel }} + EXCLUDE_POD_NAMESPACES: "openshift-operators,openshift-pipelines" + WATCHER_SENDER_DELAY: "5" + EXCLUDE_JOB_NAMESPACES: "ibm-cpd" CONTROLLER_URL: "https://km-controller:8443" -{{- else if hasPrefix "9.1" .Values.mas_app_channel }} - TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - EXCLUDE_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" -{{- end }} - + PIPELINES: "{{ .Values.aibroker_namespace }}" --- apiVersion: v1 kind: Service diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 4737e7c75..5c5f8b76d 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -9,8 +9,7 @@ metadata: labels: app: km-controller data: - CONTAINER_REGISTRY: "{{ .Values.mas_icr_cp }}/aibroker" - DOCKER_SERVER: "{{ .Values.docker_server }}" + DOCKER_SERVER: "{{ .Values.mas_icr_cp }}/aibroker" PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" DOCKER_SECRETS_NAME: "ibm-entitlement" @@ -18,18 +17,9 @@ data: PIPELINE_STEP_IMAGE_PREFIX: '' PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" - {{- if .Values.mas_aibroker_saas }} - DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" - {{- else }} DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" - {{- end }} PLATFORM: openshift - PVC_STORAGE_CLASS_NAME: "{{ .Values.primary_storage_class }}" - LOG_FORMAT: "json" - MODEL_ID_UNIQUE_LENGTH: "{{ .Values.model_id_unique_length }}" - MODEL_ID_PREFIX: "{{ .Values.model_id_prefix }}" - AFFINITY_ENABLED: "false" - CONNECTOR_TTL: "10" + --- apiVersion: v1 diff --git a/instance-applications/114-ibm-kmodels/values.yaml b/instance-applications/114-ibm-kmodels/values.yaml index a9fffd918..caa8a79f0 100644 --- a/instance-applications/114-ibm-kmodels/values.yaml +++ b/instance-applications/114-ibm-kmodels/values.yaml @@ -22,7 +22,7 @@ pullSecretName: "ibm-entitlement" docker_server: "MAS_ICR_CP/aibroker" tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" -mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" +# mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" primary_storage_class: "PRIMARY_STORAGE_CLASS" # Bucket names @@ -38,15 +38,10 @@ image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" mas_aibroker_pipeline_steps_tag: 1.0.0 mas_aibroker_connector_tag: 1.0.0 -#saas -mas_aibroker_saas: "MAS_AIBROKER_SAAS" - # model -model_id_unique_length: "8" -model_id_prefix: "m" +# model_id_unique_length: "8" +# model_id_prefix: "m" -# Environment Variable: -mas_app_channel: "9.0 mas_app_channel" # Source container registry # ----------------------------------------------------------------------------- diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml index f06c5e228..1e8561faa 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.tenantNamespace }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "301" + argocd.argoproj.io/sync-wave: "320" labels: mas.ibm.com/applicationId: "aibroker" mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" @@ -16,24 +16,33 @@ metadata: {{- end }} spec: settings: - cluster_domain: "{{ .Values.cluster_domain }}" - in_saas_env: "{{ .Values.in_saas_env }}" + # cluster_domain: "{{ .Values.cluster_domain }}" + # in_saas_env: "{{ .Values.in_saas_env }}" icr: cp: "{{ .Values.mas_icr_cp }}" cpopen: "{{ .Values.mas_icr_cpopen }}" dro: url: "{{ .Values.drocfg_url }}" - dro_token_secret: "{{ .Values.mas_aibroker_dro_token_secret }}" + secretName: "{{ .Values.tenantNamespace }}----dro-secret" ca: "{{ .Values.drocfg_ca }}" sls: url: "{{ .Values.slscfg_url }}" - sls_registration_key_secret: "{{ .Values.slscfg_registration_key }}" + secretName: "{{ .Values.tenantNamespace }}----sls-secret" ca: "{{ .Values.slscfg_ca }}" watsonxai: url: "{{ .Values.mas_aibroker_watsonxai_url }}" - api_key: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + secretName: "{{ .Values.tenantNamespace }}----wx-secret" project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" tenant: tenant_id: "{{ .Values.tenantNamespace }}" subscription_id: "{{ .Values.mas_aibroker_sls_subscription_id }}" instance_id: "{{ .Values.mas_instance_id }}" + entitlement: + type: "{{ .Values.tenant_entitlement_type }}" + startDate: "{{ .Values.tenant_entitlement_start_date }}" + endDate: "{{ .Values.tenant_entitlement_end_date }}" + s3: + region: "{{ .Values.mas_aibroker_s3_region }}" + bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" + endpointUrl: "{{ .Values.mas_aibroker_s3_endpoint_url }}" + secretName: "{{ .Values.tenantNamespace }}----s3-secret" \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml index a6cf86812..013a59db0 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml @@ -1,5 +1,3 @@ -# as per dicussion we need to put actual values here, which will be fetched form the secret manager -# this will be removed once operator will create this secret --- apiVersion: v1 kind: Secret @@ -8,10 +6,18 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "313" + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + {{- if .Values.custom_labels }} + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} type: Opaque stringData: - SLS_CLIENT_ID: "aibroker-88s55n4n7obrkn" + # SLS_CLIENT_ID: "aibroker-88s55n4n7obrkn" SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" - aibroker-88s55n4n7obrkn-ca.crt: "{{ .Values.slscfg_ca }}" - aibroker-88s55n4n7obrkn-tls.crt: "{{ .Values.slscfg_tls }}" - aibroker-88s55n4n7obrkn-tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file + # aibroker-88s55n4n7obrkn-ca.crt: "{{ .Values.slscfg_ca }}" + # aibroker-88s55n4n7obrkn-tls.crt: "{{ .Values.slscfg_tls }}" + # aibroker-88s55n4n7obrkn-tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml index 668679175..2d97789d1 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml @@ -4,6 +4,14 @@ kind: Secret metadata: name: "{{ .Values.tenantNamespace }}----dro-secret" namespace: "{{ .Values.aibroker_namespace }}" + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + {{- if .Values.custom_labels }} + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} annotations: argocd.argoproj.io/sync-wave: "314" type: Opaque diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml index 0936adb6e..939f13cba 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml @@ -4,6 +4,12 @@ kind: Secret metadata: name: "{{ .Values.mas_aibroker_provision_tenant }}----s3-secret" namespace: "{{ .Values.aibroker_namespace }}" + {{- if .Values.custom_labels }} + labels: + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} annotations: argocd.argoproj.io/sync-wave: "316" type: Opaque @@ -16,4 +22,4 @@ stringData: URL: "http://{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" {{- end }} REGION: "{{ .Values.mas_aibroker_storage_region }}" - BUCKET-NAME: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" \ No newline at end of file + # BUCKET-NAME: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml index e7fdc0a67..797337837 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml @@ -4,13 +4,19 @@ kind: Secret metadata: name: "{{ .Values.tenantNamespace }}----wx-secret" namespace: "{{ .Values.aibroker_namespace }}" + {{- if .Values.custom_labels }} + labels: + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} annotations: argocd.argoproj.io/sync-wave: "317" type: Opaque stringData: - wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" - wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" - wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + WATSONXAI_APIKEY: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + WATSONXAI_URL: "{{ .Values.mas_aibroker_watsonxai_url }}" + WATSONXAI_PROJECT_ID: "{{ .Values.mas_aibroker_watsonxai_project_id }}" # Copy secrets to tenant namespace @@ -20,10 +26,16 @@ kind: Secret metadata: name: "{{ .Values.tenantNamespace }}----wx-secret" namespace: "{{ .Values.tenantNamespace }}" + {{- if .Values.custom_labels }} + labels: + {{- range $key, $val := .Values.custom_labels }} + {{ $key | quote }}: {{ $val | quote }} + {{- end }} + {{- end }} annotations: argocd.argoproj.io/sync-wave: "318" type: Opaque stringData: - wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" - wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" - wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + WATSONXAI_APIKEY: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + WATSONXAI_URL: "{{ .Values.mas_aibroker_watsonxai_url }}" + WATSONXAI_PROJECT_ID: "{{ .Values.mas_aibroker_watsonxai_project_id }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml new file mode 100644 index 000000000..16e078dfa --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml @@ -0,0 +1,16 @@ +--- +kind: NetworkPolicy +apiVersion: networking.k8s.io/v1 +metadata: + name: allow-to-isvc + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "321" +spec: + podSelector: + matchLabels: + component: predictor + ingress: + - {} + policyTypes: + - Ingress diff --git a/instance-applications/115-ibm-aibroker-tenant/values.yaml b/instance-applications/115-ibm-aibroker-tenant/values.yaml index 29abc341d..cfdc7e5c0 100644 --- a/instance-applications/115-ibm-aibroker-tenant/values.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/values.yaml @@ -16,12 +16,12 @@ mas_aibroker_tenant_name: "user" tenant_action: "true" tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' -cluster_domain: "" +# cluster_domain: "" mas_icr_cp: "cp.icr.io/cp" mas_icr_cpopen: "icr.io/cpopen" # DRO -mas_aibroker_dro_token_secret: "dro-token" +# mas_aibroker_dro_token_secret: "dro-token" mas_aibroker_dro_cacert_secret: "dro-certificates" drocfg_url: "{{ drocfg[1].spec.config.url }}" drocfg_ca: "ca.crt" @@ -31,10 +31,10 @@ drocfg_registration_key: "DRO_TOKEN" slscfg_registration_key: "registration_key" slscfg_url: "{{ config.url }}" # instanceIdentifier: 88abcdefghijkl -slscfg_clientId: "aibroker-88s55n4n7obrkn" -slscfg_ca: "aibroker-88s55n4n7obrkn-ca.crt" -slscfg_tls: "aibroker-88s55n4n7obrkn-tls.crt" -slscfg_key: "aibroker-88s55n4n7obrkn-tls.key" +# slscfg_clientId: "aibroker-88s55n4n7obrkn" +# slscfg_ca: "aibroker-88s55n4n7obrkn-ca.crt" +# slscfg_tls: "aibroker-88s55n4n7obrkn-tls.crt" +# slscfg_key: "aibroker-88s55n4n7obrkn-tls.key" # WatsonX mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY @@ -54,5 +54,11 @@ mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" mas_aibroker_storage_host: "mas_aibroker_storage_host" mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" +# mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" +mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" +mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" +mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" -mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" +tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" +tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" +tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index b5d3ac22c..bae742b5f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -48,7 +48,7 @@ spec: pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" docker_server: "{{ .Values.ibm_kmodel.docker_server }}" tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" + # mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" @@ -60,9 +60,9 @@ spec: mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" aibroker_internal_tls: "{{ .Values.ibm_kmodel.aibroker_internal_tls }}" mas_instance_id: "{{ .Values.ibm_kmodel.mas_instance_id }}" - model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" - model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" - mas_app_channel: "{{ .Values.ibm_aibroker.mas_app_channel }}" + # model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" + # model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" + mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" junitreporter: diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 8d546be3f..68ff746d9 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -41,7 +41,7 @@ spec: # SAAS aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" + # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" @@ -51,12 +51,12 @@ spec: tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" + # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" # DRO - mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" + # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" @@ -66,10 +66,10 @@ spec: #sls slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" - slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" - slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" - slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" + # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" + # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" + # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" # WatsonX mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" @@ -87,7 +87,13 @@ spec: mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" junitreporter: diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 3244f0f66..8d4f301e9 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -139,7 +139,7 @@ ibm_kmodel: pullSecretName: "pullSecretName" docker_server: "MAS_ICR_CP/aibroker" tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" - mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" + # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" primary_storage_class: "PRIMARY_STORAGE_CLASS" # Bucket names mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" @@ -153,10 +153,9 @@ ibm_kmodel: mas_aibroker_connector_tag: 1.0.0 # model - model_id_unique_length: "model_id_unique_length" - model_id_prefix: "model_id_prefix" - # Environment Variable: - mas_app_channel: "9.0 mas_app_channel" + # model_id_unique_length: "model_id_unique_length" + # model_id_prefix: "model_id_prefix" + # Source container registry # ----------------------------------------------------------------------------- # mas_icr_cp: "cp.icr.io/cp" @@ -254,7 +253,7 @@ ibm_aibroker_tenant: # SAAS aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" - in_saas_env: "true" + # in_saas_env: "true" mas_aibroker_saas: "false" mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" @@ -264,12 +263,12 @@ ibm_aibroker_tenant: tenant_action: "true" tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' - cluster_domain: "" + # cluster_domain: "" mas_icr_cp: "cp.icr.io/cp" mas_icr_cpopen: "icr.io/cpopen" # DRO - mas_aibroker_dro_token_secret: "dro-token" + # mas_aibroker_dro_token_secret: "dro-token" mas_aibroker_dro_cacert_secret: "dro-certificates" drocfg_ca: "drocfg_ca" @@ -279,10 +278,10 @@ ibm_aibroker_tenant: #sls slscfg_registration_key: "slscfg_registration_key" slscfg_url: "slscfg_url" - slscfg_clientId: "slscfg_clientId" - slscfg_ca: "slscfg_ca" - slscfg_tls: "slscfg_tls" - slscfg_key: "slscfg_key" + # slscfg_clientId: "slscfg_clientId" + # slscfg_ca: "slscfg_ca" + # slscfg_tls: "slscfg_tls" + # slscfg_key: "slscfg_key" # WatsonX @@ -304,4 +303,11 @@ ibm_aibroker_tenant: mas_aibroker_storage_port: "mas_aibroker_storage_port" mas_aibroker_storage_region: "mas_aibroker_storage_region" - mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" + mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" + mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + + tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" + tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" + tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From d412d1408ea1e503999d3a90716922f465f60f71 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 10 Jun 2025 16:34:01 +0530 Subject: [PATCH 297/491] New changes from ansible to gitops Job update in ODH patch knative-serving Optional S3 added in aibroker bucketPrefix: region: endpointUrl: environment_type: --- .../112-ibm-odh/templates/11-odh.yaml | 11 +++++++++- .../08-aibroker-operator-subscription.yaml | 4 ++++ .../templates/09-aibroker-app.yaml | 18 +++++++++++---- .../templates/05-kmodel-store.yaml | 4 ++++ .../templates/06-kmodel-watcher.yaml | 6 +++++ .../templates/07-kmodel-controller.yaml | 13 ++++++++--- ...cret.yaml => 02-aibroker-copy-secret.yaml} | 0 ...figmap.yaml => 03-aibroker-configmap.yaml} | 0 ....yaml => 04-aibroker-service-account.yaml} | 0 ...05-aibroker-kserve-huggingfaceserver.yaml} | 0 ...yaml => 06-aibroker-kserve-lgbserver.yaml} | 0 ... => 07-aibroker-kserve-sklearnserver.yaml} | 0 ...yaml => 08-aibroker-kserve-xgbserver.yaml} | 0 ...broker-rbac.yaml => 09-aibroker-rbac.yaml} | 9 ++++++++ ...ecret.yaml => 10-aibroker-sls-secret.yaml} | 0 ...ecret.yaml => 11-aibroker-dro-secret.yaml} | 0 ...er-apikey.yaml => 12-aibroker-apikey.yaml} | 0 ...secret.yaml => 13-aibroker-s3-secret.yaml} | 0 .../templates/14-aibroker-rsl-secret.yaml | 22 +++++++++++++++++++ ...kspace.yaml => 17-aibroker-workspace.yaml} | 5 +++++ .../templates/040-ibm-aibroker-app.yaml | 5 +++++ .../templates/050-ibm-kmodels-app.yaml | 4 ++-- .../060-ibm-aibroker-tenant-app.yaml | 7 +++++- .../ibm-aibroker-instance-root/values.yaml | 11 ++++++++-- 24 files changed, 106 insertions(+), 13 deletions(-) rename instance-applications/115-ibm-aibroker-tenant/templates/{03-aibroker-copy-secret.yaml => 02-aibroker-copy-secret.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{04-aibroker-configmap.yaml => 03-aibroker-configmap.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{05-aibroker-service-account.yaml => 04-aibroker-service-account.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{06-aibroker-kserve-huggingfaceserver.yaml => 05-aibroker-kserve-huggingfaceserver.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{07-aibroker-kserve-lgbserver.yaml => 06-aibroker-kserve-lgbserver.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{08-aibroker-kserve-sklearnserver.yaml => 07-aibroker-kserve-sklearnserver.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{09-aibroker-kserve-xgbserver.yaml => 08-aibroker-kserve-xgbserver.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{10-aibroker-rbac.yaml => 09-aibroker-rbac.yaml} (94%) rename instance-applications/115-ibm-aibroker-tenant/templates/{11-aibroker-sls-secret.yaml => 10-aibroker-sls-secret.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{12-aibroker-dro-secret.yaml => 11-aibroker-dro-secret.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{13-aibroker-apikey.yaml => 12-aibroker-apikey.yaml} (100%) rename instance-applications/115-ibm-aibroker-tenant/templates/{14-aibroker-s3-secret.yaml => 13-aibroker-s3-secret.yaml} (100%) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml rename instance-applications/115-ibm-aibroker-tenant/templates/{02-aibroker-workspace.yaml => 17-aibroker-workspace.yaml} (89%) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 64221c2c4..da0d38dbb 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -84,7 +84,16 @@ spec: echo "'pipeline-runner-instance' service account not found." fi - echo "Done patching 'pipeline-runner-instance' sa..." + echo + echo "================================================================================" + echo "Patching config-features in knative-serving" + echo "================================================================================" + echo + + kubectl patch --namespace knative-serving configmap/config-features --type merge --patch '{"data":{"kubernetes.podspec-persistent-volume-claim":"enabled", "kubernetes.podspec-persistent-volume-write":"enabled"}}' + + echo "Finished patching config-features in knative-serving" + restartPolicy: Never serviceAccountName: odh-sa backoffLimit: 3 diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index 02b72e9da..d37d3fa3e 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -14,6 +14,10 @@ stringData: apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: +# name should be change ##review +#old name: mas-{{ mas_instance_id }}-aibroker-operator-group +#new name: mas-{{ mas_instance_id }}-aibroker +#gitops-envs aibroker_namespace: "mas-sremat-aibroker" name: "{{ .Values.aibroker_namespace }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index f4793cdc5..1463b509c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -7,6 +7,8 @@ metadata: labels: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + # kubernates instance id added in ##review + app.kubernetes.io/instance: "{{ .Values.mas_instance_id }}" annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true @@ -29,11 +31,19 @@ spec: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" - pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" + + ## remove below as per ansible ##review + # pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" + # tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" + # templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" mariadb: host: "{{ .Values.mas_aibroker_db_host }}" port: "{{ .Values.mas_aibroker_db_port }}" credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" - database_name: "{{ .Values.mas_aibroker_db_secret_name }}" \ No newline at end of file + database_name: "{{ .Values.mas_aibroker_db_secret_name }}" + # Optional shared S3 config. Tenant-level config takes precedence over this ##review + s3: + bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" + region: "{{ .Values.mas_aibroker_s3_region }}" + endpointUrl: "{{ .Values.mas_aibroker_s3_endpoint_url }}" + environment_type: "{{ .Values.environment_type }}" \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 7e407549e..4783bc80b 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -72,6 +72,8 @@ spec: - name: ssh-key secret: secretName: "{{ .Values.aibroker_internal_tls }}" + - name: workspace-volume + emptyDir: {} imagePullSecrets: - name: "{{ .Values.pullSecretName }}" containers: @@ -123,3 +125,5 @@ spec: - mountPath: "/etc/ssl/certs" name: ssh-key readOnly: true + - name: workspace-volume + mountPath: /workspace diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index 62f189569..a954da726 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -54,7 +54,13 @@ data: EXCLUDE_POD_NAMESPACES: "openshift-operators,openshift-pipelines" WATCHER_SENDER_DELAY: "5" EXCLUDE_JOB_NAMESPACES: "ibm-cpd" + #{{- if hasPrefix "9.0" .Values.mas_app_channel }} CONTROLLER_URL: "https://km-controller:8443" + #{{- else if hasPrefix "9.1" .Values.mas_app_channel }} + TENANTS_BUCKET: {{ .Values.mas_aibroker_storage_tenants_bucket }} + EXCLUDE_TENANTS: {{ .Values.mas_aibroker_provision_tenant }} + #{{- end }} + PIPELINES: "{{ .Values.aibroker_namespace }}" --- apiVersion: v1 diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 5c5f8b76d..e0d5f9436 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -9,7 +9,8 @@ metadata: labels: app: km-controller data: - DOCKER_SERVER: "{{ .Values.mas_icr_cp }}/aibroker" + CONTAINER_REGISTRY: "{{ .Values.mas_icr_cp }}/aibroker" + #DOCKER_SERVER: "{{ .Values.mas_icr_cp }}/aibroker" PIPELINES_BUCKET: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" TENANTS_BUCKET: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" DOCKER_SECRETS_NAME: "ibm-entitlement" @@ -19,6 +20,12 @@ data: CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" PLATFORM: openshift + PVC_STORAGE_CLASS_NAME: "{{ .Values.primary_storage_class }}" + LOG_FORMAT: "json" + MODEL_ID_UNIQUE_LENGTH: "{{ .Values.model_id_unique_length }}" + MODEL_ID_PREFIX: "{{ .Values.model_id_prefix }}" + AFFINITY_ENABLED: "false" + CONNECTOR_TTL: "10" --- @@ -158,8 +165,8 @@ spec: - secretRef: name: km-s3-secret volumeMounts: - - name: storage - mountPath: "/storage" + - name: workspace-volume + mountPath: /workspace - name: ssh-key mountPath: "/etc/ssl/certs" readOnly: true diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-copy-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-configmap.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-service-account.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-huggingfaceserver.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-lgbserver.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-sklearnserver.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-kserve-xgbserver.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml similarity index 94% rename from instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml index f4dfd5944..a469795a8 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-rbac.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml @@ -53,6 +53,15 @@ rules: - serving.kserve.io resources: - inferenceservices + - verbs: + - create + - delete + apiGroups: + - '' + resources: + - persistentvolumeclaims + + --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-sls-secret.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-sls-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-sls-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-dro-secret.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-dro-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-dro-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-apikey.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml similarity index 100% rename from instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-s3-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml new file mode 100644 index 000000000..3dfce5dd0 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml @@ -0,0 +1,22 @@ +--- + +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: "{{ .Values.tenantNamespace }}----rsl-secret" + namespace: "{{ .Values.tenantNamespace }}" + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" +{{- if .Values.custom_labels }} +{{- range $key, $value := .Values.custom_labels }} + {{ $key | quote }}: {{ $value | quote }} +{{- end }} +{{- end }} +annotations: + argocd.argoproj.io/sync-wave: "318" +stringData: + rsl_org_id: "{{ .Values.rsl_org_id }}" + rsl_url: "{{ .Values.rsl_url }}" + rsl_token: "{{ .Values.rsl_token }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml similarity index 89% rename from instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml index 1e8561faa..00dbe90e2 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml @@ -29,6 +29,11 @@ spec: url: "{{ .Values.slscfg_url }}" secretName: "{{ .Values.tenantNamespace }}----sls-secret" ca: "{{ .Values.slscfg_ca }}" + # rsl added new in ansible ##review what is value of gitops-envs + rsl: + url: "{{ .Values.rsl_url }}" + orgId: "{{ .Values.rsl_org_id }}" + secretName: "{{ .Values.mas_aibroker_rsl_secret }}" watsonxai: url: "{{ .Values.mas_aibroker_watsonxai_url }}" secretName: "{{ .Values.tenantNamespace }}----wx-secret" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 00d6810aa..f9e9b87c3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -91,6 +91,11 @@ spec: mas_icr_cpopen: "{{ .Values.ibm_aibroker.mas_icr_cpopen }}" in_saas_env: "{{ .Values.ibm_aibroker.in_saas_env }}" cluster_domain: "{{ .Values.ibm_aibroker.cluster_domain }}" + environment_type: "{{ .Values.ibm_aibroker.environment_type }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker.mas_aibroker_s3_bucket_prefix }}" + junitreporter: reporter_name: "ibm-aibroker-{{ .Values.instance.id }}" diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index bae742b5f..a3be66164 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -60,8 +60,8 @@ spec: mas_aibroker_connector_tag: "{{ .Values.ibm_kmodel.mas_aibroker_connector_tag }}" aibroker_internal_tls: "{{ .Values.ibm_kmodel.aibroker_internal_tls }}" mas_instance_id: "{{ .Values.ibm_kmodel.mas_instance_id }}" - # model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" - # model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" + model_id_unique_length: "{{ .Values.ibm_kmodel.model_id_unique_length }}" + model_id_prefix: "{{ .Values.ibm_kmodel.model_id_prefix }}" mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 68ff746d9..2d2c138e4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -78,7 +78,12 @@ spec: # SLS mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - + + #rsl + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + # S3 mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 8d4f301e9..4b59b73b7 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -244,7 +244,10 @@ ibm_aibroker: cluster_domain: cluster_domain in_saas_env: "in_saas_env" - + mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" + mas_aibroker_s3_region: "mas_aibroker_s3_region" + mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" + environment_type: "environment_type" ibm_aibroker_tenant: mas_instance_id: "MAS_INSTANCE_ID" @@ -282,7 +285,11 @@ ibm_aibroker_tenant: # slscfg_ca: "slscfg_ca" # slscfg_tls: "slscfg_tls" # slscfg_key: "slscfg_key" - + #RSL ##review + rsl_url: "rsl_url" + rsl_org_id: "rsl_org_id" + mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" + # WatsonX mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY From bdcea044b061cf8a370b099622f117c045b449a8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 12 Jun 2025 14:28:11 +0530 Subject: [PATCH 298/491] Update 11-odh.yaml --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index da0d38dbb..4bcf3a7eb 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -90,7 +90,7 @@ spec: echo "================================================================================" echo - kubectl patch --namespace knative-serving configmap/config-features --type merge --patch '{"data":{"kubernetes.podspec-persistent-volume-claim":"enabled", "kubernetes.podspec-persistent-volume-write":"enabled"}}' + oc patch --namespace knative-serving configmap/config-features --type merge --patch '{"data":{"kubernetes.podspec-persistent-volume-claim":"enabled", "kubernetes.podspec-persistent-volume-write":"enabled"}}' echo "Finished patching config-features in knative-serving" From 4f68254a530f7e8dafc1045ad2633b6f404cdfc7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 13:57:28 +0530 Subject: [PATCH 299/491] Update 099-aibroker-instance-appset.yaml --- .../templates/099-aibroker-instance-appset.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index ec0cf018a..fb87e970a 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -33,7 +33,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-minio-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-minio.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" @@ -43,17 +43,17 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-kmodel-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-mas-aibroker-tenant-install.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 60ceb394f594b69b739ae8d00933e027ccbee5aa Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 14:19:53 +0530 Subject: [PATCH 300/491] Update 060-ibm-aibroker-tenant-app.yaml --- .../templates/060-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index 2d2c138e4..b4b000005 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -12,7 +12,7 @@ metadata: cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' annotations: - argocd.argoproj.io/sync-wave: "050" + argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} From 6945d43df299a5d503005f22935445f69b5b04da Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 15:25:16 +0530 Subject: [PATCH 301/491] Update 02-odh-serverless-subscription.yaml --- .../templates/02-odh-serverless-subscription.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml index ba8276c21..5bbb2f4c3 100644 --- a/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml +++ b/instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml @@ -27,9 +27,9 @@ metadata: spec: channel: stable installPlanApproval: Automatic - name: { .Values.serverless_operator_name}} - source: { .Values.serverless_operator_source}} - sourceNamespace: { .Values.serverless_operator_sourceNamespace}} + name: {{ .Values.serverless_operator_name}} + source: {{ .Values.serverless_operator_source}} + sourceNamespace: {{ .Values.serverless_operator_sourceNamespace}} From ceb444a175c88a410645f9d4d3ee8939bdab7262 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 15:27:52 +0530 Subject: [PATCH 302/491] Update 06-kmodel-watcher.yaml --- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index a954da726..faca0619b 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -54,13 +54,9 @@ data: EXCLUDE_POD_NAMESPACES: "openshift-operators,openshift-pipelines" WATCHER_SENDER_DELAY: "5" EXCLUDE_JOB_NAMESPACES: "ibm-cpd" - #{{- if hasPrefix "9.0" .Values.mas_app_channel }} CONTROLLER_URL: "https://km-controller:8443" - #{{- else if hasPrefix "9.1" .Values.mas_app_channel }} TENANTS_BUCKET: {{ .Values.mas_aibroker_storage_tenants_bucket }} EXCLUDE_TENANTS: {{ .Values.mas_aibroker_provision_tenant }} - #{{- end }} - PIPELINES: "{{ .Values.aibroker_namespace }}" --- apiVersion: v1 From 79e504c8ae7a0c8bb33831ba82f032f93da1c1b9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 15:30:06 +0530 Subject: [PATCH 303/491] Update 08-aibroker-operator-subscription.yaml --- .../templates/08-aibroker-operator-subscription.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index d37d3fa3e..02b72e9da 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -14,10 +14,6 @@ stringData: apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: -# name should be change ##review -#old name: mas-{{ mas_instance_id }}-aibroker-operator-group -#new name: mas-{{ mas_instance_id }}-aibroker -#gitops-envs aibroker_namespace: "mas-sremat-aibroker" name: "{{ .Values.aibroker_namespace }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: From ba48c3a04365505b1424040b8405c176971c625b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 16:42:35 +0530 Subject: [PATCH 304/491] Aibroker Tenant appset creation --- .../templates/070-aibroker-tenant-appset.yaml | 123 +++++++ .../ibm-aibroker-tenant-root/Chart.yaml | 5 + .../ibm-aibroker-tenant-root/README.md | 3 + .../060-ibm-aibroker-tenant-app.yaml | 3 +- .../ibm-aibroker-tenant-root/values.yaml | 320 ++++++++++++++++++ 5 files changed, 453 insertions(+), 1 deletion(-) create mode 100644 root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/Chart.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/README.md rename root-applications/{ibm-aibroker-instance-root => ibm-aibroker-tenant-root}/templates/060-ibm-aibroker-tenant-app.yaml (98%) create mode 100644 root-applications/ibm-aibroker-tenant-root/values.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml new file mode 100644 index 000000000..faa982bf6 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -0,0 +1,123 @@ + +--- +# IBM AiBroker Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id}} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' +# region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id}}' + annotations: + argocd.argoproj.io/sync-wave: "070" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yam + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.tenant.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + # region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' + tenant: '{{ `{{.tenant.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-tenant-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/Chart.yaml b/root-applications/ibm-aibroker-tenant-root/Chart.yaml new file mode 100644 index 000000000..1ed6c0ab2 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: ibm-aibroker-tenant-root +description: IBM AIBroker tenant root +type: application +version: 1.0.0 diff --git a/root-applications/ibm-aibroker-tenant-root/README.md b/root-applications/ibm-aibroker-tenant-root/README.md new file mode 100644 index 000000000..f63a00c8e --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/README.md @@ -0,0 +1,3 @@ +IBM AIBroker Tenant Root Application +=============================================================================== +Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml similarity index 98% rename from root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml rename to root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index b4b000005..e291f58ce 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,13 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' + tenant: '{{ .Values.tenant.id }}' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml new file mode 100644 index 000000000..4b59b73b7 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/values.yaml @@ -0,0 +1,320 @@ +--- + +avp: + name: "argocd-vault-plugin-helm" + secret: "" + values_varname: "HELM_VALUES" + +account: + id: dev + +cluster: + id: cluster1 + +region: + id: region1 + +instance: + id: inst1 + +source: + repo_url: "https://github.com/ibm-mas/gitops" + revision: "poc" + +# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# generator: +# repo_url: "" +# revision: "" + +# These defaults align with the ArgoCD worker setup by gitops-bootstrap +# (openshift-gitops with a single ArgoCD project "mas") +argo: + namespace: "openshift-gitops" + projects: + rootapps: "mas" + apps: "mas" + + +auto_delete: false + +sm: + aws_access_key_id: xxxx + +run_sanity_test: false + +devops: + mongo_uri: + build_number: + +ibm_minio: + minio_namespace: "minio_namespace" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "" + minio_storage_class: "default" + minio_storage_size: "40Gi" + minio_image: "quay.io/minio/minio:latest" + + +ibm_odh: + openshift_namespace: "openshift-operators" + odh_pipeline_channel: "latest" + odh_pipeline_installplan: "Automatic" + service_mesh_namespace: "openshift-serverless" + service_mesh_channel: "stable" + service_mesh_catalog_source: "redhat-operators" + serverless_channel: "stable" + authorino_catalog_source: "community-operators" + odh_channel: "fast" + odh_catalog_source: "community-operators" + odh_operator_version: "opendatahub-operator.v2.11.1" + #Odh_Pipeline_operator + odh_pipeline_name: "openshift-pipelines-operator" + odh_pipeline_namespace: "openshift-operators" + odh_pipeline_operatorName: "openshift-pipelines-operator-rh" + odh_pipeline_source: "redhat_operators" + odh_pipeline_sourceNamespace: "openshift_marketplace" + + #Serverless Operator + serverless_namespace: "openshift-serverless" + serverless_operator_name: "serverless-operator" + serverless_operator_source: "redhat-operators" + serverless_operator_sourceNamespace: "openshift-marketplace" + + #opendatahub Operator + opendatahub_OperatorGroup_name: "opendatahub-operator-group" + opendatahub_name: "opendatahub-operator" + opendatahub_namespace: "opendatahub" + opendatahub_installPlanApproval: "Manual" + opendatahub_channel: "fast" + opendatahub_source: "community-operators" + opendatahub__sourceNamespace: "openshift-marketplace" + + aibroker_namespace: "mas_sremat_aibroker" + pull_secret_name: "ibm_entitlement" + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_accesskey: "" + mas_aibroker_storage_secretkey: "" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # MariaDB + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_database: "mas_aibroker_db_database" + + mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + primary_storage_class: "nfs-client" + + +ibm_kmodel: + mas_instance_id: "mas_instance_id" + aibroker_internal_tls: "aibroker_internal_tls" + aibroker_namespace: "mas-sremat-aibroker" + + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_ssl: "false" + + openshift_namespace: "openshift-operators" + run_sync_hooks: true + + + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + ssh_secret_name: "sremat-kmodel-aibroker-tls" + # vars file for kmodels + pullSecretName: "pullSecretName" + docker_server: "MAS_ICR_CP/aibroker" + tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" + # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" + primary_storage_class: "PRIMARY_STORAGE_CLASS" + # Bucket names + mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + #container images + image_store: "MAS_ICR_CP/aibroker/store:1.0.2" + image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" + image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + mas_aibroker_pipeline_steps_tag: 1.0.0 + mas_aibroker_connector_tag: 1.0.0 + + # model + # model_id_unique_length: "model_id_unique_length" + # model_id_prefix: "model_id_prefix" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + +ibm_aibroker: + mas_instance_id: "mas_instance_id" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + mas_aibroker_minio_secret: "mas_aibroker_minio_secret" + # Minio + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + # MariaDB + mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + # WatsonX + mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" + mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" + mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" + mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" + + # S3 + s3_apikey: "S3_APIKEY" + mas_aibroker_storage_accesskey: "true" + mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" + + mas_aibroker_storage_host: "true" + mas_aibroker_storage_port: "true" + + # SLS + mas_aibroker_sls_registration_key_secret: "sls-registration-key" + + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + + # Bucket names + mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + + slscfg_registration_key: "slscfg_registration_key" + + # DRO + mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + + # JDBC + mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" + + jdbccfg_username: "jdbccfg_username" + jdbccfg_password: "jdbccfg_password" + jdbccfg_url: "jdbccfg_url" + jdbccfg_sslenabled: "jdbccfg_sslenabled" + jdbccfg_ca: "jdbccfg_ca" + + # MAS Entitlement + #mas_entitlement_username: "cp" + mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_entitlement_key: "mas_entitlement_key" + + # Development Registry Entitlement + artifactory_username: "artifactory_username" + artifactory_token: "artifactory_token" + + # Environment Variable: + mas_app_channel: "mas_app_channel" + + # aibroker vars + mas_catalog_source: "mas_catalog_source" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + # mas_icr_cpopen: "icr.io/cpopen" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" + + cluster_domain: cluster_domain + in_saas_env: "in_saas_env" + + mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" + mas_aibroker_s3_region: "mas_aibroker_s3_region" + mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" + environment_type: "environment_type" + +ibm_aibroker_tenant: + mas_instance_id: "MAS_INSTANCE_ID" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + ibm_entitlement_key: "" + + # SAAS + aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" + # in_saas_env: "true" + mas_aibroker_saas: "false" + mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" + + # Tenant + artifactory_token: "artifactory_token" + mas_aibroker_tenant_name: "user" + tenant_action: "true" + tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + + # cluster_domain: "" + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + # DRO + # mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + #sls + slscfg_registration_key: "slscfg_registration_key" + slscfg_url: "slscfg_url" + # slscfg_clientId: "slscfg_clientId" + # slscfg_ca: "slscfg_ca" + # slscfg_tls: "slscfg_tls" + # slscfg_key: "slscfg_key" + #RSL ##review + rsl_url: "rsl_url" + rsl_org_id: "rsl_org_id" + mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" + + + # WatsonX + mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY + mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL + mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + + # SLS + #mas_aibroker_sls_registration_key_secret: "sls-registration-key" + mas_aibroker_sls_subscription_id: "001" + + # S3 + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" + mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" + mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + + tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" + tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" + tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From e6088f6402208a24045f2b2310051686c25f1e54 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 13 Jun 2025 19:31:25 +0530 Subject: [PATCH 305/491] Revert "Aibroker Tenant appset creation" This reverts commit ba48c3a04365505b1424040b8405c176971c625b. --- .../060-ibm-aibroker-tenant-app.yaml | 3 +- .../templates/070-aibroker-tenant-appset.yaml | 123 ------- .../ibm-aibroker-tenant-root/Chart.yaml | 5 - .../ibm-aibroker-tenant-root/README.md | 3 - .../ibm-aibroker-tenant-root/values.yaml | 320 ------------------ 5 files changed, 1 insertion(+), 453 deletions(-) rename root-applications/{ibm-aibroker-tenant-root => ibm-aibroker-instance-root}/templates/060-ibm-aibroker-tenant-app.yaml (98%) delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml delete mode 100644 root-applications/ibm-aibroker-tenant-root/Chart.yaml delete mode 100644 root-applications/ibm-aibroker-tenant-root/README.md delete mode 100644 root-applications/ibm-aibroker-tenant-root/values.yaml diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml similarity index 98% rename from root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml rename to root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml index e291f58ce..b4b000005 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,14 +4,13 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml deleted file mode 100644 index faa982bf6..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ /dev/null @@ -1,123 +0,0 @@ - ---- -# IBM AiBroker Instance Application Set -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id}} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id}}' - annotations: - argocd.argoproj.io/sync-wave: "070" -spec: - goTemplate: true - generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yam - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" - template: - metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.tenant.id}}` }}" - labels: - environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' - tenant: '{{ `{{.tenant.id}}` }}' -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - annotations: - healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - spec: - project: "{{ .Values.argo.projects.rootapps }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-tenant-root - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/Chart.yaml b/root-applications/ibm-aibroker-tenant-root/Chart.yaml deleted file mode 100644 index 1ed6c0ab2..000000000 --- a/root-applications/ibm-aibroker-tenant-root/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v2 -name: ibm-aibroker-tenant-root -description: IBM AIBroker tenant root -type: application -version: 1.0.0 diff --git a/root-applications/ibm-aibroker-tenant-root/README.md b/root-applications/ibm-aibroker-tenant-root/README.md deleted file mode 100644 index f63a00c8e..000000000 --- a/root-applications/ibm-aibroker-tenant-root/README.md +++ /dev/null @@ -1,3 +0,0 @@ -IBM AIBroker Tenant Root Application -=============================================================================== -Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml deleted file mode 100644 index 4b59b73b7..000000000 --- a/root-applications/ibm-aibroker-tenant-root/values.yaml +++ /dev/null @@ -1,320 +0,0 @@ ---- - -avp: - name: "argocd-vault-plugin-helm" - secret: "" - values_varname: "HELM_VALUES" - -account: - id: dev - -cluster: - id: cluster1 - -region: - id: region1 - -instance: - id: inst1 - -source: - repo_url: "https://github.com/ibm-mas/gitops" - revision: "poc" - -# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), -# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified -# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) -# generator: -# repo_url: "" -# revision: "" - -# These defaults align with the ArgoCD worker setup by gitops-bootstrap -# (openshift-gitops with a single ArgoCD project "mas") -argo: - namespace: "openshift-gitops" - projects: - rootapps: "mas" - apps: "mas" - - -auto_delete: false - -sm: - aws_access_key_id: xxxx - -run_sanity_test: false - -devops: - mongo_uri: - build_number: - -ibm_minio: - minio_namespace: "minio_namespace" - minio_instance_name: "minio" - minio_root_user: "minio" - minio_root_password: "" - minio_storage_class: "default" - minio_storage_size: "40Gi" - minio_image: "quay.io/minio/minio:latest" - - -ibm_odh: - openshift_namespace: "openshift-operators" - odh_pipeline_channel: "latest" - odh_pipeline_installplan: "Automatic" - service_mesh_namespace: "openshift-serverless" - service_mesh_channel: "stable" - service_mesh_catalog_source: "redhat-operators" - serverless_channel: "stable" - authorino_catalog_source: "community-operators" - odh_channel: "fast" - odh_catalog_source: "community-operators" - odh_operator_version: "opendatahub-operator.v2.11.1" - #Odh_Pipeline_operator - odh_pipeline_name: "openshift-pipelines-operator" - odh_pipeline_namespace: "openshift-operators" - odh_pipeline_operatorName: "openshift-pipelines-operator-rh" - odh_pipeline_source: "redhat_operators" - odh_pipeline_sourceNamespace: "openshift_marketplace" - - #Serverless Operator - serverless_namespace: "openshift-serverless" - serverless_operator_name: "serverless-operator" - serverless_operator_source: "redhat-operators" - serverless_operator_sourceNamespace: "openshift-marketplace" - - #opendatahub Operator - opendatahub_OperatorGroup_name: "opendatahub-operator-group" - opendatahub_name: "opendatahub-operator" - opendatahub_namespace: "opendatahub" - opendatahub_installPlanApproval: "Manual" - opendatahub_channel: "fast" - opendatahub_source: "community-operators" - opendatahub__sourceNamespace: "openshift-marketplace" - - aibroker_namespace: "mas_sremat_aibroker" - pull_secret_name: "ibm_entitlement" - mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_accesskey: "" - mas_aibroker_storage_secretkey: "" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - - # MariaDB - mas_aibroker_db_host: "mas_aibroker_db_host" - mas_aibroker_db_port: "mas_aibroker_db_port" - mas_aibroker_db_user: "mas_aibroker_db_user" - mas_aibroker_db_database: "mas_aibroker_db_database" - - mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" - mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" - mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" - - mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - primary_storage_class: "nfs-client" - - -ibm_kmodel: - mas_instance_id: "mas_instance_id" - aibroker_internal_tls: "aibroker_internal_tls" - aibroker_namespace: "mas-sremat-aibroker" - - mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_ssl: "false" - - openshift_namespace: "openshift-operators" - run_sync_hooks: true - - - # following are the variable need to injected via environment variable - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "sremat-kmodel-aibroker-tls" - # vars file for kmodels - pullSecretName: "pullSecretName" - docker_server: "MAS_ICR_CP/aibroker" - tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" - # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" - primary_storage_class: "PRIMARY_STORAGE_CLASS" - # Bucket names - mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" - mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" - mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - #container images - image_store: "MAS_ICR_CP/aibroker/store:1.0.2" - image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" - image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" - mas_aibroker_pipeline_steps_tag: 1.0.0 - mas_aibroker_connector_tag: 1.0.0 - - # model - # model_id_unique_length: "model_id_unique_length" - # model_id_prefix: "model_id_prefix" - - # Source container registry - # ----------------------------------------------------------------------------- - # mas_icr_cp: "cp.icr.io/cp" - mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - -ibm_aibroker: - mas_instance_id: "mas_instance_id" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - mas_aibroker_minio_secret: "mas_aibroker_minio_secret" - # Minio - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - # MariaDB - mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" - mas_aibroker_db_user: "mas_aibroker_db_user" - mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" - - # WatsonX - mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" - mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" - mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" - mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" - - # S3 - s3_apikey: "S3_APIKEY" - mas_aibroker_storage_accesskey: "true" - mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" - - mas_aibroker_storage_host: "true" - mas_aibroker_storage_port: "true" - - # SLS - mas_aibroker_sls_registration_key_secret: "sls-registration-key" - - mas_aibroker_db_host: "mas_aibroker_db_host" - mas_aibroker_db_port: "mas_aibroker_db_port" - mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" - - # Bucket names - mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" - mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" - mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" - - slscfg_registration_key: "slscfg_registration_key" - - # DRO - mas_aibroker_dro_token_secret: "dro-token" - mas_aibroker_dro_cacert_secret: "dro-certificates" - - drocfg_ca: "drocfg_ca" - drocfg_registration_key: "drocfg_registration_key" - drocfg_url: "drocfg_url" - - - # JDBC - mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" - - jdbccfg_username: "jdbccfg_username" - jdbccfg_password: "jdbccfg_password" - jdbccfg_url: "jdbccfg_url" - jdbccfg_sslenabled: "jdbccfg_sslenabled" - jdbccfg_ca: "jdbccfg_ca" - - # MAS Entitlement - #mas_entitlement_username: "cp" - mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - mas_entitlement_key: "mas_entitlement_key" - - # Development Registry Entitlement - artifactory_username: "artifactory_username" - artifactory_token: "artifactory_token" - - # Environment Variable: - mas_app_channel: "mas_app_channel" - - # aibroker vars - mas_catalog_source: "mas_catalog_source" - - # Source container registry - # ----------------------------------------------------------------------------- - # mas_icr_cp: "cp.icr.io/cp" - # mas_icr_cpopen: "icr.io/cpopen" - mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" - - cluster_domain: cluster_domain - in_saas_env: "in_saas_env" - - mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" - mas_aibroker_s3_region: "mas_aibroker_s3_region" - mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" - environment_type: "environment_type" - -ibm_aibroker_tenant: - mas_instance_id: "MAS_INSTANCE_ID" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - ibm_entitlement_key: "" - - # SAAS - aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" - # in_saas_env: "true" - mas_aibroker_saas: "false" - mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" - - # Tenant - artifactory_token: "artifactory_token" - mas_aibroker_tenant_name: "user" - tenant_action: "true" - tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' - - # cluster_domain: "" - mas_icr_cp: "cp.icr.io/cp" - mas_icr_cpopen: "icr.io/cpopen" - - # DRO - # mas_aibroker_dro_token_secret: "dro-token" - mas_aibroker_dro_cacert_secret: "dro-certificates" - - drocfg_ca: "drocfg_ca" - drocfg_registration_key: "drocfg_registration_key" - drocfg_url: "drocfg_url" - - #sls - slscfg_registration_key: "slscfg_registration_key" - slscfg_url: "slscfg_url" - # slscfg_clientId: "slscfg_clientId" - # slscfg_ca: "slscfg_ca" - # slscfg_tls: "slscfg_tls" - # slscfg_key: "slscfg_key" - #RSL ##review - rsl_url: "rsl_url" - rsl_org_id: "rsl_org_id" - mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" - - - # WatsonX - mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY - mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL - mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID - - # SLS - #mas_aibroker_sls_registration_key_secret: "sls-registration-key" - mas_aibroker_sls_subscription_id: "001" - - # S3 - mas_aibroker_storage_provider: "aws" - mas_aibroker_storage_ssl: "true" - # following are the variable need to injected via environment variable - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - - # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" - mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" - mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" - mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" - - tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" - tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" - tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From b7b34442eb5c427081a5e6b1333083aa1077a19f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Sun, 15 Jun 2025 11:48:12 +0530 Subject: [PATCH 306/491] Reapply "Aibroker Tenant appset creation" This reverts commit e6088f6402208a24045f2b2310051686c25f1e54. --- .../templates/070-aibroker-tenant-appset.yaml | 123 +++++++ .../ibm-aibroker-tenant-root/Chart.yaml | 5 + .../ibm-aibroker-tenant-root/README.md | 3 + .../060-ibm-aibroker-tenant-app.yaml | 3 +- .../ibm-aibroker-tenant-root/values.yaml | 320 ++++++++++++++++++ 5 files changed, 453 insertions(+), 1 deletion(-) create mode 100644 root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/Chart.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/README.md rename root-applications/{ibm-aibroker-instance-root => ibm-aibroker-tenant-root}/templates/060-ibm-aibroker-tenant-app.yaml (98%) create mode 100644 root-applications/ibm-aibroker-tenant-root/values.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml new file mode 100644 index 000000000..faa982bf6 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -0,0 +1,123 @@ + +--- +# IBM AiBroker Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id}} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' +# region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id}}' + annotations: + argocd.argoproj.io/sync-wave: "070" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yam + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.tenant.id}}` }}" + labels: + environment: '{{ .Values.account.id }}' + # region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.instance.id}}` }}' + tenant: '{{ `{{.tenant.id}}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-tenant-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/Chart.yaml b/root-applications/ibm-aibroker-tenant-root/Chart.yaml new file mode 100644 index 000000000..1ed6c0ab2 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: ibm-aibroker-tenant-root +description: IBM AIBroker tenant root +type: application +version: 1.0.0 diff --git a/root-applications/ibm-aibroker-tenant-root/README.md b/root-applications/ibm-aibroker-tenant-root/README.md new file mode 100644 index 000000000..f63a00c8e --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/README.md @@ -0,0 +1,3 @@ +IBM AIBroker Tenant Root Application +=============================================================================== +Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml similarity index 98% rename from root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml rename to root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index b4b000005..e291f58ce 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,13 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' + tenant: '{{ .Values.tenant.id }}' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml new file mode 100644 index 000000000..4b59b73b7 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/values.yaml @@ -0,0 +1,320 @@ +--- + +avp: + name: "argocd-vault-plugin-helm" + secret: "" + values_varname: "HELM_VALUES" + +account: + id: dev + +cluster: + id: cluster1 + +region: + id: region1 + +instance: + id: inst1 + +source: + repo_url: "https://github.com/ibm-mas/gitops" + revision: "poc" + +# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# generator: +# repo_url: "" +# revision: "" + +# These defaults align with the ArgoCD worker setup by gitops-bootstrap +# (openshift-gitops with a single ArgoCD project "mas") +argo: + namespace: "openshift-gitops" + projects: + rootapps: "mas" + apps: "mas" + + +auto_delete: false + +sm: + aws_access_key_id: xxxx + +run_sanity_test: false + +devops: + mongo_uri: + build_number: + +ibm_minio: + minio_namespace: "minio_namespace" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "" + minio_storage_class: "default" + minio_storage_size: "40Gi" + minio_image: "quay.io/minio/minio:latest" + + +ibm_odh: + openshift_namespace: "openshift-operators" + odh_pipeline_channel: "latest" + odh_pipeline_installplan: "Automatic" + service_mesh_namespace: "openshift-serverless" + service_mesh_channel: "stable" + service_mesh_catalog_source: "redhat-operators" + serverless_channel: "stable" + authorino_catalog_source: "community-operators" + odh_channel: "fast" + odh_catalog_source: "community-operators" + odh_operator_version: "opendatahub-operator.v2.11.1" + #Odh_Pipeline_operator + odh_pipeline_name: "openshift-pipelines-operator" + odh_pipeline_namespace: "openshift-operators" + odh_pipeline_operatorName: "openshift-pipelines-operator-rh" + odh_pipeline_source: "redhat_operators" + odh_pipeline_sourceNamespace: "openshift_marketplace" + + #Serverless Operator + serverless_namespace: "openshift-serverless" + serverless_operator_name: "serverless-operator" + serverless_operator_source: "redhat-operators" + serverless_operator_sourceNamespace: "openshift-marketplace" + + #opendatahub Operator + opendatahub_OperatorGroup_name: "opendatahub-operator-group" + opendatahub_name: "opendatahub-operator" + opendatahub_namespace: "opendatahub" + opendatahub_installPlanApproval: "Manual" + opendatahub_channel: "fast" + opendatahub_source: "community-operators" + opendatahub__sourceNamespace: "openshift-marketplace" + + aibroker_namespace: "mas_sremat_aibroker" + pull_secret_name: "ibm_entitlement" + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_accesskey: "" + mas_aibroker_storage_secretkey: "" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # MariaDB + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_database: "mas_aibroker_db_database" + + mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + primary_storage_class: "nfs-client" + + +ibm_kmodel: + mas_instance_id: "mas_instance_id" + aibroker_internal_tls: "aibroker_internal_tls" + aibroker_namespace: "mas-sremat-aibroker" + + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_ssl: "false" + + openshift_namespace: "openshift-operators" + run_sync_hooks: true + + + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + ssh_secret_name: "sremat-kmodel-aibroker-tls" + # vars file for kmodels + pullSecretName: "pullSecretName" + docker_server: "MAS_ICR_CP/aibroker" + tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" + # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" + primary_storage_class: "PRIMARY_STORAGE_CLASS" + # Bucket names + mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + #container images + image_store: "MAS_ICR_CP/aibroker/store:1.0.2" + image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" + image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + mas_aibroker_pipeline_steps_tag: 1.0.0 + mas_aibroker_connector_tag: 1.0.0 + + # model + # model_id_unique_length: "model_id_unique_length" + # model_id_prefix: "model_id_prefix" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + +ibm_aibroker: + mas_instance_id: "mas_instance_id" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + mas_aibroker_minio_secret: "mas_aibroker_minio_secret" + # Minio + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + # MariaDB + mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + # WatsonX + mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" + mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" + mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" + mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" + + # S3 + s3_apikey: "S3_APIKEY" + mas_aibroker_storage_accesskey: "true" + mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" + + mas_aibroker_storage_host: "true" + mas_aibroker_storage_port: "true" + + # SLS + mas_aibroker_sls_registration_key_secret: "sls-registration-key" + + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + + # Bucket names + mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + + slscfg_registration_key: "slscfg_registration_key" + + # DRO + mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + + # JDBC + mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" + + jdbccfg_username: "jdbccfg_username" + jdbccfg_password: "jdbccfg_password" + jdbccfg_url: "jdbccfg_url" + jdbccfg_sslenabled: "jdbccfg_sslenabled" + jdbccfg_ca: "jdbccfg_ca" + + # MAS Entitlement + #mas_entitlement_username: "cp" + mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_entitlement_key: "mas_entitlement_key" + + # Development Registry Entitlement + artifactory_username: "artifactory_username" + artifactory_token: "artifactory_token" + + # Environment Variable: + mas_app_channel: "mas_app_channel" + + # aibroker vars + mas_catalog_source: "mas_catalog_source" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + # mas_icr_cpopen: "icr.io/cpopen" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" + + cluster_domain: cluster_domain + in_saas_env: "in_saas_env" + + mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" + mas_aibroker_s3_region: "mas_aibroker_s3_region" + mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" + environment_type: "environment_type" + +ibm_aibroker_tenant: + mas_instance_id: "MAS_INSTANCE_ID" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + ibm_entitlement_key: "" + + # SAAS + aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" + # in_saas_env: "true" + mas_aibroker_saas: "false" + mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" + + # Tenant + artifactory_token: "artifactory_token" + mas_aibroker_tenant_name: "user" + tenant_action: "true" + tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + + # cluster_domain: "" + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + # DRO + # mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + #sls + slscfg_registration_key: "slscfg_registration_key" + slscfg_url: "slscfg_url" + # slscfg_clientId: "slscfg_clientId" + # slscfg_ca: "slscfg_ca" + # slscfg_tls: "slscfg_tls" + # slscfg_key: "slscfg_key" + #RSL ##review + rsl_url: "rsl_url" + rsl_org_id: "rsl_org_id" + mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" + + + # WatsonX + mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY + mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL + mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + + # SLS + #mas_aibroker_sls_registration_key_secret: "sls-registration-key" + mas_aibroker_sls_subscription_id: "001" + + # S3 + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" + mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" + mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + + tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" + tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" + tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From 0431711dbb9ef09021980e2d5eb33535c3c33cc6 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Sun, 15 Jun 2025 11:55:56 +0530 Subject: [PATCH 307/491] Update main.py --- main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 022c092ed..62c4e1cc1 100644 --- a/main.py +++ b/main.py @@ -69,6 +69,9 @@ def instance_root_chart(): return gitops_repo_dir_link("root-applications/ibm-mas-instance-root", "Instance Root Chart") env.macro(instance_root_chart) + def tenant_root_chart(): + return gitops_repo_dir_link("root-applications/ibm-aibroker-tenant-root", "Tenant Root Chart") + env.macro(tenant_root_chart) def cluster_root_app_set(): @@ -82,5 +85,8 @@ def instance_root_app_set(): def aibroker_instance_root_app_set(): return gitops_repo_file_link("root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml", "AiBroker Instance Root Application Set") env.macro(aibroker_instance_root_app_set) - + + def aibroker_tenant_root_app_set(): + return gitops_repo_file_link("root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml", "AiBroker Tenant Root Application Set") + env.macro(aibroker_tenant_root_app_set) From 450809ea8931c1a2b31f7ead63ec22b7bd693cf3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 12:35:40 +0530 Subject: [PATCH 308/491] create new role and role binding for knative patch job --- .../112-ibm-odh/templates/11-odh.yaml | 32 +++++++++++++++++++ .../templates/070-aibroker-tenant-appset.yaml | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 4bcf3a7eb..3c0acb63f 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -38,6 +38,38 @@ roleRef: apiGroup: rbac.authorization.k8s.io +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: odh-sa-knative-patch-role + namespace: knative-serving + annotations: + argocd.argoproj.io/sync-wave: "136" +rules: + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "patch"] + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: odh-sa-knative-patch-binding + namespace: knative-serving + annotations: + argocd.argoproj.io/sync-wave: "137" +subjects: + - kind: ServiceAccount + name: odh-sa + namespace: "{{ .Values.aibroker_namespace }}" # Still referencing from your values +roleRef: + kind: Role + name: odh-sa-knative-patch-role + apiGroup: rbac.authorization.k8s.io + + + --- apiVersion: batch/v1 kind: Job diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index faa982bf6..2c0823eb0 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -29,7 +29,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yam + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 779a32c2e047aa4832e6b2f97dbc073d4fe72969 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 14:24:05 +0530 Subject: [PATCH 309/491] Update 08-aibroker-operator-subscription.yaml --- .../templates/08-aibroker-operator-subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index 02b72e9da..ce64a7307 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -5,7 +5,7 @@ metadata: name: ibm-entitlement namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "146" + argocd.argoproj.io/sync-wave: "145" type: kubernetes.io/dockerconfigjson stringData: .dockerconfigjson: "{{ .Values.artifactory_token}}" From 6018e775ef926593c70c90eac1a2e63a9eab2b38 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 14:25:29 +0530 Subject: [PATCH 310/491] Revert "Update 08-aibroker-operator-subscription.yaml" This reverts commit 779a32c2e047aa4832e6b2f97dbc073d4fe72969. --- .../templates/08-aibroker-operator-subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index ce64a7307..02b72e9da 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -5,7 +5,7 @@ metadata: name: ibm-entitlement namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "145" + argocd.argoproj.io/sync-wave: "146" type: kubernetes.io/dockerconfigjson stringData: .dockerconfigjson: "{{ .Values.artifactory_token}}" From 91de6670bd4db3fc2c9bee67191fb11e1285465c Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 17 Jun 2025 17:39:11 +0530 Subject: [PATCH 311/491] Update 099-aibroker-instance-appset.yaml ibm-aibroker-tenant.yaml removed --- .../templates/099-aibroker-instance-appset.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index fb87e970a..80b7e67be 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -48,12 +48,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From e2e75a5a87049c6d6e8b4a789ccaf0e02c4f4938 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 17:52:43 +0530 Subject: [PATCH 312/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 1463b509c..1d5aab9c4 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" + ca: "{{ .Values.drocfg_ca | b64enc }}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From b7f465add500247cf3dc7dbe4e8517e5721260a0 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 17:55:34 +0530 Subject: [PATCH 313/491] Revert "Merge branch 'gitops-argocd-review' of https://github.com/ibm-mas/gitops into gitops-argocd-review" This reverts commit 8e8eebd549c0776ce07fd5f2558b8a3a931f3d82, reversing changes made to e2e75a5a87049c6d6e8b4a789ccaf0e02c4f4938. --- .../templates/099-aibroker-instance-appset.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 80b7e67be..fb87e970a 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -48,7 +48,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 7059bcf88b1d6c75f1cb8bbb4dc9a2c91b9595e1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 17 Jun 2025 18:00:30 +0530 Subject: [PATCH 314/491] Reapply "Merge branch 'gitops-argocd-review' of https://github.com/ibm-mas/gitops into gitops-argocd-review" This reverts commit b7f465add500247cf3dc7dbe4e8517e5721260a0. --- .../templates/099-aibroker-instance-appset.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index fb87e970a..80b7e67be 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -48,12 +48,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-kmodel.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 554dcc2505efbb1d28ce917a97873ca68bd501f4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 17 Jun 2025 18:00:35 +0530 Subject: [PATCH 315/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 1d5aab9c4..1463b509c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca | b64enc }}" + ca: "{{ .Values.drocfg_ca}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From d70a8c445bdec2e955183b35fbc9ede7147b3c49 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 18:45:19 +0530 Subject: [PATCH 316/491] Update 07-kmodel-controller.yaml --- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index e0d5f9436..c429a827f 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -102,6 +102,8 @@ spec: spec: serviceAccountName: km-controller volumes: + - name: workspace-volume + emptyDir: {} - name: storage persistentVolumeClaim: claimName: km-controller-pvc From a5817838ece39f6ec67c701a6c57b65364a4fd93 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 21:31:12 +0530 Subject: [PATCH 317/491] remove namespace creation --- .../114-ibm-kmodels/templates/01-kmodel-namespace.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml diff --git a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml b/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml deleted file mode 100644 index 9ad177532..000000000 --- a/instance-applications/114-ibm-kmodels/templates/01-kmodel-namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "160" \ No newline at end of file From f756c0170a2edd5a23cb123250235c5e6a79e4fb Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 21:58:34 +0530 Subject: [PATCH 318/491] remove port: 3000 based on ansible --- .../114-ibm-kmodels/templates/05-kmodel-store.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 4783bc80b..6efdbe42d 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -29,9 +29,6 @@ metadata: argocd.argoproj.io/sync-wave: "170" spec: ports: - - name: http - port: 3000 - targetPort: http - name: https port: 8443 targetPort: https From 392659202a13f21280d6dffd8927bb4e9a5c0cb0 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 22:06:56 +0530 Subject: [PATCH 319/491] removed --- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index c429a827f..a281c8b15 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -104,9 +104,6 @@ spec: volumes: - name: workspace-volume emptyDir: {} - - name: storage - persistentVolumeClaim: - claimName: km-controller-pvc - name: ssh-key secret: secretName: "{{ .Values.aibroker_internal_tls }}" From 607262c9712160a1e0bb1df186e6645615eedf10 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 17 Jun 2025 22:18:34 +0530 Subject: [PATCH 320/491] Update 06-kmodel-watcher.yaml --- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index faca0619b..b15be372a 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -56,7 +56,6 @@ data: EXCLUDE_JOB_NAMESPACES: "ibm-cpd" CONTROLLER_URL: "https://km-controller:8443" TENANTS_BUCKET: {{ .Values.mas_aibroker_storage_tenants_bucket }} - EXCLUDE_TENANTS: {{ .Values.mas_aibroker_provision_tenant }} PIPELINES: "{{ .Values.aibroker_namespace }}" --- apiVersion: v1 From d56b95f6df1c6831fc0ea81b435150a010d3fee1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 17 Jun 2025 22:43:29 +0530 Subject: [PATCH 321/491] hardcoded image --- .../114-ibm-kmodels/templates/05-kmodel-store.yaml | 2 +- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 2 +- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 6efdbe42d..96f6e47d8 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -75,7 +75,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: store - image: "{{ .Values.image_store }}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index b15be372a..10e3d96d6 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -101,7 +101,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: watcher - image: "{{ .Values.image_watcher}}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/watcher:1.0.5" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index a281c8b15..7d16382a8 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -111,7 +111,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: controller - image: "{{ .Values.image_controller}}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/controller:1.0.11" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false From 8b5e04f8d44290713e28f4d3d6c06578e5f6ec21 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Tue, 17 Jun 2025 22:55:42 +0530 Subject: [PATCH 322/491] Revert "hardcoded image" This reverts commit d56b95f6df1c6831fc0ea81b435150a010d3fee1. --- .../114-ibm-kmodels/templates/05-kmodel-store.yaml | 2 +- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 2 +- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 96f6e47d8..6efdbe42d 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -75,7 +75,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: store - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" + image: "{{ .Values.image_store }}" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index 10e3d96d6..b15be372a 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -101,7 +101,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: watcher - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/watcher:1.0.5" + image: "{{ .Values.image_watcher}}" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 7d16382a8..a281c8b15 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -111,7 +111,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: controller - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/controller:1.0.11" + image: "{{ .Values.image_controller}}" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false From ab356b62d44fcb852c991fa1359b3cde7416cefe Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 10:29:22 +0530 Subject: [PATCH 323/491] Reapply "hardcoded image" This reverts commit 8b5e04f8d44290713e28f4d3d6c06578e5f6ec21. --- .../114-ibm-kmodels/templates/05-kmodel-store.yaml | 2 +- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 2 +- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 6efdbe42d..96f6e47d8 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -75,7 +75,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: store - image: "{{ .Values.image_store }}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index b15be372a..10e3d96d6 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -101,7 +101,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: watcher - image: "{{ .Values.image_watcher}}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/watcher:1.0.5" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index a281c8b15..7d16382a8 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -111,7 +111,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: controller - image: "{{ .Values.image_controller}}" + image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/controller:1.0.11" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false From 0f2125d4154edeba60222f3a4ab0a6f4e400c9d3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 11:44:38 +0530 Subject: [PATCH 324/491] ssl value hardcoded --- .../112-ibm-odh/templates/10-odh-dspa-minio.yaml | 3 ++- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml index af7c75cfd..1a91dbb42 100644 --- a/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml +++ b/instance-applications/112-ibm-odh/templates/10-odh-dspa-minio.yaml @@ -17,7 +17,8 @@ stringData: secretkey: "{{ .Values.mas_aibroker_storage_secretkey }}" host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" - ssl: "{{ .Values.mas_aibroker_storage_ssl }}" + ssl: "false" + #ssl: "{{ .Values.mas_aibroker_storage_ssl }}" --- apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1 kind: DataSciencePipelinesApplication diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index af7c05b17..1581c164b 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -28,4 +28,5 @@ stringData: S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + #S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + S3_SSL: "false" From cbe2628b679753b53dce9b1ef0e72da0530f4477 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 11:56:31 +0530 Subject: [PATCH 325/491] update {{ .Values.instance.id}} path --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 2c0823eb0..bf0fed260 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -34,7 +34,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id}}/*/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 6907a916308756a937a937610b0da9062d20563e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 11:59:32 +0530 Subject: [PATCH 326/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index bf0fed260..c2393e14e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -39,12 +39,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.Values.instance.id}}` }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' + instance: '{{ `{{.Values.instance.id}}` }}' tenant: '{{ `{{.tenant.id}}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} From f3ced50ba680fe81fd682666488af622f10aa002 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 12:07:20 +0530 Subject: [PATCH 327/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c2393e14e..9057569ec 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -39,7 +39,7 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.Values.instance.id}}` }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' # region: '{{ .Values.region.id }}' From 120345dc85668a5084c10ef07fbd4cdd7b556b90 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 12:15:12 +0530 Subject: [PATCH 328/491] Update 05-kmodel-store.yaml --- .../114-ibm-kmodels/templates/05-kmodel-store.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 96f6e47d8..72c416a41 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -75,7 +75,8 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: store - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" + image: "{{ .Values.image_store }}" + #image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false From 651b365b0f5cbd4d973a8a002a4b20fda2fda0e4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 12:25:50 +0530 Subject: [PATCH 329/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 9057569ec..706aec8ea 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -39,13 +39,13 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{.tenant.id}}` }}' + tenant: '{{ `{{ .Values.tenant.id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 5fce17a02ed80f02176fb11b694cc0f87e00b115 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 14:42:48 +0530 Subject: [PATCH 330/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 706aec8ea..1fedeb781 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -4,11 +4,10 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id}} + name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' -# region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id}}' annotations: @@ -34,7 +33,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id}}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -42,10 +41,9 @@ spec: name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' - # region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}' + tenant: '{{ `{{ .Values.tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 9e6930a6698ff8cdfcb1d7213f72f026263924dd Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 14:45:01 +0530 Subject: [PATCH 331/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 1fedeb781..4bc1d6bb2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,121 +1,121 @@ ---- -# IBM AiBroker Instance Application Set -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id}}' - annotations: - argocd.argoproj.io/sync-wave: "070" -spec: - goTemplate: true - generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" - template: - metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}` }}' -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} - annotations: - healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - spec: - project: "{{ .Values.argo.projects.rootapps }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-tenant-root - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true - retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1 \ No newline at end of file +# --- +# # IBM AiBroker Instance Application Set +# apiVersion: argoproj.io/v1alpha1 +# kind: ApplicationSet +# metadata: +# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} +# namespace: {{ .Values.argo.namespace }} +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ .Values.instance.id}}' +# annotations: +# argocd.argoproj.io/sync-wave: "070" +# spec: +# goTemplate: true +# generators: +# - merge: +# mergeKeys: +# # Would love to use ".path.path" here to merge the configs together +# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 +# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) +# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up +# - 'merge-key' +# generators: +# # This is the "base" generator, it *must* be first in the list +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" +# syncPolicy: +# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" +# template: +# metadata: +# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ `{{.Values.instance.id}}` }}' +# tenant: '{{ `{{ .Values.tenant.id }}` }}' +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 8 }} +# {{- end }} +# annotations: +# healthCheckTimeout: "1800" +# argocd.argoproj.io/sync-wave: "099" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} +# {{- end }} +# spec: +# project: "{{ .Values.argo.projects.rootapps }}" +# source: +# repoURL: "{{ .Values.source.repo_url }}" +# targetRevision: "{{ .Values.source.revision }}" +# path: root-applications/ibm-aibroker-tenant-root +# helm: +# releaseName: instanceappset +# values: "{{ `{{ toYaml . }}` }}" +# parameters: +# - name: "generator.repo_url" +# value: "{{ .Values.generator.repo_url }}" +# - name: "generator.revision" +# value: "{{ .Values.generator.revision }}" +# - name: "source.revision" +# value: "{{ .Values.source.revision }}" +# - name: "source.repo_url" +# value: "{{ .Values.source.repo_url }}" +# - name: argo.namespace +# value: "{{ .Values.argo.namespace }}" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# - name: "notifications.slack_channel_id" +# value: "{{ .Values.notifications.slack_channel_id }}" +# {{- end }} +# - name: argo.projects.rootapps +# value: "{{ .Values.argo.projects.rootapps }}" +# - name: argo.projects.apps +# value: "{{ .Values.argo.projects.apps }}" +# - name: avp.name +# value: "{{ .Values.avp.name }}" +# - name: avp.secret +# value: "{{ .Values.avp.secret }}" +# - name: avp.values_varname +# value: "{{ .Values.avp.values_varname }}" +# - name: auto_delete +# value: "{{ .Values.auto_delete }}" +# - name: devops.mongo_uri +# value: "{{ .Values.devops.mongo_uri }}" +# - name: devops.build_number +# value: "{{ .Values.devops.build_number }}" +# destination: +# server: 'https://kubernetes.default.svc' +# namespace: {{ .Values.argo.namespace }} +# syncPolicy: +# automated: +# {{- if .Values.auto_delete }} +# prune: true +# {{- end }} +# selfHeal: true +# syncOptions: +# - CreateNamespace=false +# - RespectIgnoreDifferences=true +# retry: +# limit: -1 +# ignoreDifferences: +# - group: '*' +# kind: ServiceAccount +# jsonPointers: +# - /imagePullSecrets +# - group: 'marketplace.redhat.com/v1alpha1' +# kind: MarketplaceConfig +# jsonPointers: +# - /spec +# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger +# revisionHistoryLimit: 1 \ No newline at end of file From 541d750b2792368a592146e35e0668bb67e09edb Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 14:46:39 +0530 Subject: [PATCH 332/491] Delete 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 121 ------------------ 1 file changed, 121 deletions(-) delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml deleted file mode 100644 index 4bc1d6bb2..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ /dev/null @@ -1,121 +0,0 @@ - -# --- -# # IBM AiBroker Instance Application Set -# apiVersion: argoproj.io/v1alpha1 -# kind: ApplicationSet -# metadata: -# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} -# namespace: {{ .Values.argo.namespace }} -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ .Values.instance.id}}' -# annotations: -# argocd.argoproj.io/sync-wave: "070" -# spec: -# goTemplate: true -# generators: -# - merge: -# mergeKeys: -# # Would love to use ".path.path" here to merge the configs together -# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 -# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) -# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up -# - 'merge-key' -# generators: -# # This is the "base" generator, it *must* be first in the list -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" -# syncPolicy: -# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" -# template: -# metadata: -# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ `{{.Values.instance.id}}` }}' -# tenant: '{{ `{{ .Values.tenant.id }}` }}' -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 8 }} -# {{- end }} -# annotations: -# healthCheckTimeout: "1800" -# argocd.argoproj.io/sync-wave: "099" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} -# {{- end }} -# spec: -# project: "{{ .Values.argo.projects.rootapps }}" -# source: -# repoURL: "{{ .Values.source.repo_url }}" -# targetRevision: "{{ .Values.source.revision }}" -# path: root-applications/ibm-aibroker-tenant-root -# helm: -# releaseName: instanceappset -# values: "{{ `{{ toYaml . }}` }}" -# parameters: -# - name: "generator.repo_url" -# value: "{{ .Values.generator.repo_url }}" -# - name: "generator.revision" -# value: "{{ .Values.generator.revision }}" -# - name: "source.revision" -# value: "{{ .Values.source.revision }}" -# - name: "source.repo_url" -# value: "{{ .Values.source.repo_url }}" -# - name: argo.namespace -# value: "{{ .Values.argo.namespace }}" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# - name: "notifications.slack_channel_id" -# value: "{{ .Values.notifications.slack_channel_id }}" -# {{- end }} -# - name: argo.projects.rootapps -# value: "{{ .Values.argo.projects.rootapps }}" -# - name: argo.projects.apps -# value: "{{ .Values.argo.projects.apps }}" -# - name: avp.name -# value: "{{ .Values.avp.name }}" -# - name: avp.secret -# value: "{{ .Values.avp.secret }}" -# - name: avp.values_varname -# value: "{{ .Values.avp.values_varname }}" -# - name: auto_delete -# value: "{{ .Values.auto_delete }}" -# - name: devops.mongo_uri -# value: "{{ .Values.devops.mongo_uri }}" -# - name: devops.build_number -# value: "{{ .Values.devops.build_number }}" -# destination: -# server: 'https://kubernetes.default.svc' -# namespace: {{ .Values.argo.namespace }} -# syncPolicy: -# automated: -# {{- if .Values.auto_delete }} -# prune: true -# {{- end }} -# selfHeal: true -# syncOptions: -# - CreateNamespace=false -# - RespectIgnoreDifferences=true -# retry: -# limit: -1 -# ignoreDifferences: -# - group: '*' -# kind: ServiceAccount -# jsonPointers: -# - /imagePullSecrets -# - group: 'marketplace.redhat.com/v1alpha1' -# kind: MarketplaceConfig -# jsonPointers: -# - /spec -# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger -# revisionHistoryLimit: 1 \ No newline at end of file From 6e2e3c1b6409f059bc00a7e3989f8019579245b8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 15:23:37 +0530 Subject: [PATCH 333/491] update image --- .../114-ibm-kmodels/templates/06-kmodel-watcher.yaml | 2 +- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml index 10e3d96d6..88b8136a4 100644 --- a/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml +++ b/instance-applications/114-ibm-kmodels/templates/06-kmodel-watcher.yaml @@ -101,7 +101,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: watcher - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/watcher:1.0.5" + image: "{{ .Values.image_watcher }}" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 7d16382a8..2bd159db9 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -111,7 +111,7 @@ spec: - name: "{{ .Values.pullSecretName }}" containers: - name: controller - image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/controller:1.0.11" + image: "{{ .Values.image_controller }}" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false From 4150d6f04cefaf483e57c233e08cee620493a063 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 15:26:14 +0530 Subject: [PATCH 334/491] Revert "Delete 070-aibroker-tenant-appset.yaml" This reverts commit 541d750b2792368a592146e35e0668bb67e09edb. --- .../templates/070-aibroker-tenant-appset.yaml | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml new file mode 100644 index 000000000..4bc1d6bb2 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -0,0 +1,121 @@ + +# --- +# # IBM AiBroker Instance Application Set +# apiVersion: argoproj.io/v1alpha1 +# kind: ApplicationSet +# metadata: +# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} +# namespace: {{ .Values.argo.namespace }} +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ .Values.instance.id}}' +# annotations: +# argocd.argoproj.io/sync-wave: "070" +# spec: +# goTemplate: true +# generators: +# - merge: +# mergeKeys: +# # Would love to use ".path.path" here to merge the configs together +# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 +# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) +# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up +# - 'merge-key' +# generators: +# # This is the "base" generator, it *must* be first in the list +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" +# syncPolicy: +# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" +# template: +# metadata: +# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ `{{.Values.instance.id}}` }}' +# tenant: '{{ `{{ .Values.tenant.id }}` }}' +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 8 }} +# {{- end }} +# annotations: +# healthCheckTimeout: "1800" +# argocd.argoproj.io/sync-wave: "099" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} +# {{- end }} +# spec: +# project: "{{ .Values.argo.projects.rootapps }}" +# source: +# repoURL: "{{ .Values.source.repo_url }}" +# targetRevision: "{{ .Values.source.revision }}" +# path: root-applications/ibm-aibroker-tenant-root +# helm: +# releaseName: instanceappset +# values: "{{ `{{ toYaml . }}` }}" +# parameters: +# - name: "generator.repo_url" +# value: "{{ .Values.generator.repo_url }}" +# - name: "generator.revision" +# value: "{{ .Values.generator.revision }}" +# - name: "source.revision" +# value: "{{ .Values.source.revision }}" +# - name: "source.repo_url" +# value: "{{ .Values.source.repo_url }}" +# - name: argo.namespace +# value: "{{ .Values.argo.namespace }}" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# - name: "notifications.slack_channel_id" +# value: "{{ .Values.notifications.slack_channel_id }}" +# {{- end }} +# - name: argo.projects.rootapps +# value: "{{ .Values.argo.projects.rootapps }}" +# - name: argo.projects.apps +# value: "{{ .Values.argo.projects.apps }}" +# - name: avp.name +# value: "{{ .Values.avp.name }}" +# - name: avp.secret +# value: "{{ .Values.avp.secret }}" +# - name: avp.values_varname +# value: "{{ .Values.avp.values_varname }}" +# - name: auto_delete +# value: "{{ .Values.auto_delete }}" +# - name: devops.mongo_uri +# value: "{{ .Values.devops.mongo_uri }}" +# - name: devops.build_number +# value: "{{ .Values.devops.build_number }}" +# destination: +# server: 'https://kubernetes.default.svc' +# namespace: {{ .Values.argo.namespace }} +# syncPolicy: +# automated: +# {{- if .Values.auto_delete }} +# prune: true +# {{- end }} +# selfHeal: true +# syncOptions: +# - CreateNamespace=false +# - RespectIgnoreDifferences=true +# retry: +# limit: -1 +# ignoreDifferences: +# - group: '*' +# kind: ServiceAccount +# jsonPointers: +# - /imagePullSecrets +# - group: 'marketplace.redhat.com/v1alpha1' +# kind: MarketplaceConfig +# jsonPointers: +# - /spec +# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger +# revisionHistoryLimit: 1 \ No newline at end of file From 8373c79440e44521a718076b70c28fb30b42dd1e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 15:26:48 +0530 Subject: [PATCH 335/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4bc1d6bb2..1fedeb781 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,121 +1,121 @@ -# --- -# # IBM AiBroker Instance Application Set -# apiVersion: argoproj.io/v1alpha1 -# kind: ApplicationSet -# metadata: -# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} -# namespace: {{ .Values.argo.namespace }} -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ .Values.instance.id}}' -# annotations: -# argocd.argoproj.io/sync-wave: "070" -# spec: -# goTemplate: true -# generators: -# - merge: -# mergeKeys: -# # Would love to use ".path.path" here to merge the configs together -# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 -# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) -# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up -# - 'merge-key' -# generators: -# # This is the "base" generator, it *must* be first in the list -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" -# syncPolicy: -# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" -# template: -# metadata: -# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ `{{.Values.instance.id}}` }}' -# tenant: '{{ `{{ .Values.tenant.id }}` }}' -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 8 }} -# {{- end }} -# annotations: -# healthCheckTimeout: "1800" -# argocd.argoproj.io/sync-wave: "099" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} -# {{- end }} -# spec: -# project: "{{ .Values.argo.projects.rootapps }}" -# source: -# repoURL: "{{ .Values.source.repo_url }}" -# targetRevision: "{{ .Values.source.revision }}" -# path: root-applications/ibm-aibroker-tenant-root -# helm: -# releaseName: instanceappset -# values: "{{ `{{ toYaml . }}` }}" -# parameters: -# - name: "generator.repo_url" -# value: "{{ .Values.generator.repo_url }}" -# - name: "generator.revision" -# value: "{{ .Values.generator.revision }}" -# - name: "source.revision" -# value: "{{ .Values.source.revision }}" -# - name: "source.repo_url" -# value: "{{ .Values.source.repo_url }}" -# - name: argo.namespace -# value: "{{ .Values.argo.namespace }}" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# - name: "notifications.slack_channel_id" -# value: "{{ .Values.notifications.slack_channel_id }}" -# {{- end }} -# - name: argo.projects.rootapps -# value: "{{ .Values.argo.projects.rootapps }}" -# - name: argo.projects.apps -# value: "{{ .Values.argo.projects.apps }}" -# - name: avp.name -# value: "{{ .Values.avp.name }}" -# - name: avp.secret -# value: "{{ .Values.avp.secret }}" -# - name: avp.values_varname -# value: "{{ .Values.avp.values_varname }}" -# - name: auto_delete -# value: "{{ .Values.auto_delete }}" -# - name: devops.mongo_uri -# value: "{{ .Values.devops.mongo_uri }}" -# - name: devops.build_number -# value: "{{ .Values.devops.build_number }}" -# destination: -# server: 'https://kubernetes.default.svc' -# namespace: {{ .Values.argo.namespace }} -# syncPolicy: -# automated: -# {{- if .Values.auto_delete }} -# prune: true -# {{- end }} -# selfHeal: true -# syncOptions: -# - CreateNamespace=false -# - RespectIgnoreDifferences=true -# retry: -# limit: -1 -# ignoreDifferences: -# - group: '*' -# kind: ServiceAccount -# jsonPointers: -# - /imagePullSecrets -# - group: 'marketplace.redhat.com/v1alpha1' -# kind: MarketplaceConfig -# jsonPointers: -# - /spec -# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger -# revisionHistoryLimit: 1 \ No newline at end of file +--- +# IBM AiBroker Instance Application Set +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id}}' + annotations: + argocd.argoproj.io/sync-wave: "070" +spec: + goTemplate: true + generators: + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + template: + metadata: + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + labels: + environment: '{{ .Values.account.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.Values.instance.id}}` }}' + tenant: '{{ `{{ .Values.tenant.id }}` }}' +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + annotations: + healthCheckTimeout: "1800" + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + spec: + project: "{{ .Values.argo.projects.rootapps }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-tenant-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + syncOptions: + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file From 00e6d2df1616af7f5c3213f6020b80f74de146c9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 15:59:33 +0530 Subject: [PATCH 336/491] update ibm_aibroker_tenant.tenant_id --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- .../templates/060-ibm-aibroker-tenant-app.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 1fedeb781..c13c9973e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}` }}' + tenant: '{{ `{{ .Values.ibm_aibroker_tenant.tenant_id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index e291f58ce..52c35f82b 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,14 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' + tenant: '{{ .Values.ibm_aibroker_tenant.tenant_id }}' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" From 7a0a6b901a56c46fc1d6b9c454a2b41c23f06c52 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 16:09:02 +0530 Subject: [PATCH 337/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c13c9973e..1fedeb781 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.ibm_aibroker_tenant.tenant_id }}` }}' + tenant: '{{ `{{ .Values.tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 1ce166f0ac4ef0c288ddb80fea167a0d741a606c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 16:11:37 +0530 Subject: [PATCH 338/491] Revert "Update 070-aibroker-tenant-appset.yaml" This reverts commit 7a0a6b901a56c46fc1d6b9c454a2b41c23f06c52. --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 1fedeb781..c13c9973e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}` }}' + tenant: '{{ `{{ .Values.ibm_aibroker_tenant.tenant_id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 93d423b75a603a51642dc77702f22ed71391e45f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 16:23:19 +0530 Subject: [PATCH 339/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c13c9973e..94a672d5c 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.ibm_aibroker_tenant.tenant_id }}` }}' + instance: '{{ `{{.instance.id}}` }}' + tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 841766f83d512eec588555035f642e47974a75bf Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 16:29:02 +0530 Subject: [PATCH 340/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 94a672d5c..4692b4b30 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,11 +38,11 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ `{{.instance.id}}` }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.instance.id}}` }}' + instance: '{{ Values.instance.id }}' tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} From 9f9db0f3f8eec4df70a83ea90cc783ac22abee45 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 16:31:14 +0530 Subject: [PATCH 341/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4692b4b30..23b0b6037 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,11 +38,11 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ Values.instance.id }}' + instance: '{{ .Values.instance.id }}' tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} From 864bfe2065816b11eba1268c665b563e07c91cfc Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 16:37:22 +0530 Subject: [PATCH 342/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 23b0b6037..a5e34a4f3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id }}` }}' + tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 49ef5795506c7c61b80f0c3e2f827c30e18e8038 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Wed, 18 Jun 2025 18:14:16 +0530 Subject: [PATCH 343/491] Update 060-ibm-aibroker-tenant-app.yaml added tenant_id --- .../templates/060-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index 52c35f82b..fbd65689e 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -35,7 +35,7 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - + tenant_id: "{{ .Values.ibm_aibroker_tenant.tenant_id }}" mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From aae9b16bbd707852d9abdfb3f97c11a46b0e5a20 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 19:40:30 +0530 Subject: [PATCH 344/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index a5e34a4f3..809064465 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,15 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{- if .ibm_aibroker_tenant.tenant_id }}.{{ .ibm_aibroker_tenant.tenant_id }}{{- end }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}' + {{- if .ibm_aibroker_tenant.tenant_id }} + tenant: '{{ .ibm_aibroker_tenant.tenant_id }}' + {{- end }} + {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 0e36f252861d196b2648cc99fafc94e976508909 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 19:48:11 +0530 Subject: [PATCH 345/491] Revert "Update 070-aibroker-tenant-appset.yaml" This reverts commit aae9b16bbd707852d9abdfb3f97c11a46b0e5a20. --- .../templates/070-aibroker-tenant-appset.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 809064465..a5e34a4f3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,15 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{- if .ibm_aibroker_tenant.tenant_id }}.{{ .ibm_aibroker_tenant.tenant_id }}{{- end }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - {{- if .ibm_aibroker_tenant.tenant_id }} - tenant: '{{ .ibm_aibroker_tenant.tenant_id }}' - {{- end }} - + tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From a522e810e311c03f15b25540b6c00b27814af2ed Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 20:32:30 +0530 Subject: [PATCH 346/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index a5e34a4f3..3d4a3b60e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `aibroker-tenant01` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{.ibm_aibroker_tenant.tenant_id}}` }}' + tenant: '{{ `aibroker-tenant01` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From b95360222187723b945df87ed993bf9abc5f5a72 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 18 Jun 2025 20:38:06 +0530 Subject: [PATCH 347/491] Update 060-ibm-aibroker-tenant-app.yaml --- .../templates/060-ibm-aibroker-tenant-app.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index fbd65689e..4e8bca0a5 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,14 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.ibm_aibroker_tenant.tenant_id }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ 'aibroker-tenant01' }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.ibm_aibroker_tenant.tenant_id }}' + tenant: 'aibroker-tenant01' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" @@ -35,7 +35,7 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "{{ .Values.ibm_aibroker_tenant.tenant_id }}" + tenant_id: "aibroker-tenant01" mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From 2bd203fd5687aacb4e53de3d0522d54a5168ee2b Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 19 Jun 2025 10:22:38 +0530 Subject: [PATCH 348/491] Update 060-ibm-aibroker-tenant-app.yaml --- .../templates/060-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index 4e8bca0a5..ee6d6c60f 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,7 +4,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ 'aibroker-tenant01' }} + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.aibroker-tenant01 namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' From 60b9b154e8f193daad3f52a751bd74ef49220cb0 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 19 Jun 2025 10:31:41 +0530 Subject: [PATCH 349/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 3d4a3b60e..0284ed176 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -49,7 +49,7 @@ spec: {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" + argocd.argoproj.io/sync-wave: "070" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} From ac1fff0805ed6a6ed53a31393dad46417477e079 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 10:59:53 +0530 Subject: [PATCH 350/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 0284ed176..80514616a 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -28,7 +28,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From e047e7e00fff5e7f56e049eabe5cf4182695ed10 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 11:06:14 +0530 Subject: [PATCH 351/491] update tenant base --- .../templates/070-aibroker-tenant-appset.yaml | 6 +++--- .../templates/060-ibm-aibroker-tenant-app.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 80514616a..d10bf501d 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `aibroker-tenant01` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - tenant: '{{ `aibroker-tenant01` }}' + instance: '{{ `{{.Values.instance.id}}` }}' + tenant: '{{ `{{ .Values.tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml index ee6d6c60f..47bc24ae0 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml @@ -4,14 +4,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.aibroker-tenant01 + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' region: '{{ .Values.region.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: 'aibroker-tenant01' + tenant: '{{ .Values.tenant.id }}' annotations: argocd.argoproj.io/sync-wave: "060" healthCheckTimeout: "1800" From 41e79710f2b2a94c24f66c268899de68be357a5b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 11:14:38 +0530 Subject: [PATCH 352/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index d10bf501d..30ba179a4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}` }}' + instance: '{{ .Values.instance.id }}' + tenant: '{{ `{{ .tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From df7a7f328919629ffdd1f12aa12923bb6143408d Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Thu, 19 Jun 2025 11:22:14 +0530 Subject: [PATCH 353/491] added tenant id and generator url --- root-applications/ibm-aibroker-instance-root/values.yaml | 6 ++++++ root-applications/ibm-aibroker-tenant-root/values.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 4b59b73b7..1f438b417 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -17,6 +17,12 @@ region: instance: id: inst1 +tenant: + id: tenant1 + +generator: + repo_url: xxxx + source: repo_url: "https://github.com/ibm-mas/gitops" revision: "poc" diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml index 4b59b73b7..046d341b5 100644 --- a/root-applications/ibm-aibroker-tenant-root/values.yaml +++ b/root-applications/ibm-aibroker-tenant-root/values.yaml @@ -17,6 +17,9 @@ region: instance: id: inst1 +tenant: + id: aibroker-tenant01 + source: repo_url: "https://github.com/ibm-mas/gitops" revision: "poc" From 09ad1d04779dd1c2efd14b1757478e34af029181 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 16:40:49 +0530 Subject: [PATCH 354/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 30ba179a4..ed85537b9 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -61,7 +61,7 @@ spec: targetRevision: "{{ .Values.source.revision }}" path: root-applications/ibm-aibroker-tenant-root helm: - releaseName: instanceappset + releaseName: tenantappset values: "{{ `{{ toYaml . }}` }}" parameters: - name: "generator.repo_url" From 7297223c8aa9dce94ae2edc34236c28a864e3836 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 16:48:00 +0530 Subject: [PATCH 355/491] change sync wave --- ...ibroker-tenant-app.yaml => 100-ibm-aibroker-tenant-app.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename root-applications/ibm-aibroker-tenant-root/templates/{060-ibm-aibroker-tenant-app.yaml => 100-ibm-aibroker-tenant-app.yaml} (99%) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml similarity index 99% rename from root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml rename to root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index 47bc24ae0..2ae0d3aa4 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/060-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -13,7 +13,7 @@ metadata: instance: '{{ .Values.instance.id }}' tenant: '{{ .Values.tenant.id }}' annotations: - argocd.argoproj.io/sync-wave: "060" + argocd.argoproj.io/sync-wave: "100" healthCheckTimeout: "1800" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} From b7a97e876a1181e926fb73c144887f1ee051bd72 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 18:37:20 +0530 Subject: [PATCH 356/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index ed85537b9..cdbbf60a6 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,6 +1,6 @@ --- -# IBM AiBroker Instance Application Set +# IBM AiBroker Tenant Application Set apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: @@ -59,7 +59,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-tenant-root + path: instance-applications/115-ibm-aibroker-tenant helm: releaseName: tenantappset values: "{{ `{{ toYaml . }}` }}" From ef9e6bed7947469b3b7b03645f477a93832213e3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 18:40:29 +0530 Subject: [PATCH 357/491] deleted unwanted --- .../ibm-aibroker-tenant-root/Chart.yaml | 5 - .../ibm-aibroker-tenant-root/README.md | 3 - .../100-ibm-aibroker-tenant-app.yaml | 132 ------- .../ibm-aibroker-tenant-root/values.yaml | 323 ------------------ 4 files changed, 463 deletions(-) delete mode 100644 root-applications/ibm-aibroker-tenant-root/Chart.yaml delete mode 100644 root-applications/ibm-aibroker-tenant-root/README.md delete mode 100644 root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml delete mode 100644 root-applications/ibm-aibroker-tenant-root/values.yaml diff --git a/root-applications/ibm-aibroker-tenant-root/Chart.yaml b/root-applications/ibm-aibroker-tenant-root/Chart.yaml deleted file mode 100644 index 1ed6c0ab2..000000000 --- a/root-applications/ibm-aibroker-tenant-root/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v2 -name: ibm-aibroker-tenant-root -description: IBM AIBroker tenant root -type: application -version: 1.0.0 diff --git a/root-applications/ibm-aibroker-tenant-root/README.md b/root-applications/ibm-aibroker-tenant-root/README.md deleted file mode 100644 index f63a00c8e..000000000 --- a/root-applications/ibm-aibroker-tenant-root/README.md +++ /dev/null @@ -1,3 +0,0 @@ -IBM AIBroker Tenant Root Application -=============================================================================== -Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml deleted file mode 100644 index 2ae0d3aa4..000000000 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ /dev/null @@ -1,132 +0,0 @@ -{{- if not (empty .Values.ibm_aibroker_tenant) }} ---- -# IBM Maximo aibroker-tenant -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - region: '{{ .Values.region.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' - annotations: - argocd.argoproj.io/sync-wave: "100" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/115-ibm-aibroker-tenant - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - - # SAAS - aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" - mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - - # Tenant - artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - - # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" - mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - - # DRO - # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" - mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - - drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - - #sls - slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" - # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" - # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" - # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" - - # WatsonX - mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - - # SLS - mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - - #rsl - rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - - # S3 - mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" - mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" - - - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: aibrokertenantapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml deleted file mode 100644 index 046d341b5..000000000 --- a/root-applications/ibm-aibroker-tenant-root/values.yaml +++ /dev/null @@ -1,323 +0,0 @@ ---- - -avp: - name: "argocd-vault-plugin-helm" - secret: "" - values_varname: "HELM_VALUES" - -account: - id: dev - -cluster: - id: cluster1 - -region: - id: region1 - -instance: - id: inst1 - -tenant: - id: aibroker-tenant01 - -source: - repo_url: "https://github.com/ibm-mas/gitops" - revision: "poc" - -# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), -# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified -# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) -# generator: -# repo_url: "" -# revision: "" - -# These defaults align with the ArgoCD worker setup by gitops-bootstrap -# (openshift-gitops with a single ArgoCD project "mas") -argo: - namespace: "openshift-gitops" - projects: - rootapps: "mas" - apps: "mas" - - -auto_delete: false - -sm: - aws_access_key_id: xxxx - -run_sanity_test: false - -devops: - mongo_uri: - build_number: - -ibm_minio: - minio_namespace: "minio_namespace" - minio_instance_name: "minio" - minio_root_user: "minio" - minio_root_password: "" - minio_storage_class: "default" - minio_storage_size: "40Gi" - minio_image: "quay.io/minio/minio:latest" - - -ibm_odh: - openshift_namespace: "openshift-operators" - odh_pipeline_channel: "latest" - odh_pipeline_installplan: "Automatic" - service_mesh_namespace: "openshift-serverless" - service_mesh_channel: "stable" - service_mesh_catalog_source: "redhat-operators" - serverless_channel: "stable" - authorino_catalog_source: "community-operators" - odh_channel: "fast" - odh_catalog_source: "community-operators" - odh_operator_version: "opendatahub-operator.v2.11.1" - #Odh_Pipeline_operator - odh_pipeline_name: "openshift-pipelines-operator" - odh_pipeline_namespace: "openshift-operators" - odh_pipeline_operatorName: "openshift-pipelines-operator-rh" - odh_pipeline_source: "redhat_operators" - odh_pipeline_sourceNamespace: "openshift_marketplace" - - #Serverless Operator - serverless_namespace: "openshift-serverless" - serverless_operator_name: "serverless-operator" - serverless_operator_source: "redhat-operators" - serverless_operator_sourceNamespace: "openshift-marketplace" - - #opendatahub Operator - opendatahub_OperatorGroup_name: "opendatahub-operator-group" - opendatahub_name: "opendatahub-operator" - opendatahub_namespace: "opendatahub" - opendatahub_installPlanApproval: "Manual" - opendatahub_channel: "fast" - opendatahub_source: "community-operators" - opendatahub__sourceNamespace: "openshift-marketplace" - - aibroker_namespace: "mas_sremat_aibroker" - pull_secret_name: "ibm_entitlement" - mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_accesskey: "" - mas_aibroker_storage_secretkey: "" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - - # MariaDB - mas_aibroker_db_host: "mas_aibroker_db_host" - mas_aibroker_db_port: "mas_aibroker_db_port" - mas_aibroker_db_user: "mas_aibroker_db_user" - mas_aibroker_db_database: "mas_aibroker_db_database" - - mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" - mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" - mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" - - mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - primary_storage_class: "nfs-client" - - -ibm_kmodel: - mas_instance_id: "mas_instance_id" - aibroker_internal_tls: "aibroker_internal_tls" - aibroker_namespace: "mas-sremat-aibroker" - - mas_aibroker_storage_provider: "minio" - mas_aibroker_storage_ssl: "false" - - openshift_namespace: "openshift-operators" - run_sync_hooks: true - - - # following are the variable need to injected via environment variable - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - ssh_secret_name: "sremat-kmodel-aibroker-tls" - # vars file for kmodels - pullSecretName: "pullSecretName" - docker_server: "MAS_ICR_CP/aibroker" - tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" - # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" - primary_storage_class: "PRIMARY_STORAGE_CLASS" - # Bucket names - mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" - mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" - mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" - #container images - image_store: "MAS_ICR_CP/aibroker/store:1.0.2" - image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" - image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" - mas_aibroker_pipeline_steps_tag: 1.0.0 - mas_aibroker_connector_tag: 1.0.0 - - # model - # model_id_unique_length: "model_id_unique_length" - # model_id_prefix: "model_id_prefix" - - # Source container registry - # ----------------------------------------------------------------------------- - # mas_icr_cp: "cp.icr.io/cp" - mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - -ibm_aibroker: - mas_instance_id: "mas_instance_id" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - mas_aibroker_minio_secret: "mas_aibroker_minio_secret" - # Minio - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - # MariaDB - mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" - mas_aibroker_db_user: "mas_aibroker_db_user" - mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" - - # WatsonX - mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" - mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" - mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" - mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" - - # S3 - s3_apikey: "S3_APIKEY" - mas_aibroker_storage_accesskey: "true" - mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" - - mas_aibroker_storage_host: "true" - mas_aibroker_storage_port: "true" - - # SLS - mas_aibroker_sls_registration_key_secret: "sls-registration-key" - - mas_aibroker_db_host: "mas_aibroker_db_host" - mas_aibroker_db_port: "mas_aibroker_db_port" - mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" - - # Bucket names - mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" - mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" - mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" - - slscfg_registration_key: "slscfg_registration_key" - - # DRO - mas_aibroker_dro_token_secret: "dro-token" - mas_aibroker_dro_cacert_secret: "dro-certificates" - - drocfg_ca: "drocfg_ca" - drocfg_registration_key: "drocfg_registration_key" - drocfg_url: "drocfg_url" - - - # JDBC - mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" - - jdbccfg_username: "jdbccfg_username" - jdbccfg_password: "jdbccfg_password" - jdbccfg_url: "jdbccfg_url" - jdbccfg_sslenabled: "jdbccfg_sslenabled" - jdbccfg_ca: "jdbccfg_ca" - - # MAS Entitlement - #mas_entitlement_username: "cp" - mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - mas_entitlement_key: "mas_entitlement_key" - - # Development Registry Entitlement - artifactory_username: "artifactory_username" - artifactory_token: "artifactory_token" - - # Environment Variable: - mas_app_channel: "mas_app_channel" - - # aibroker vars - mas_catalog_source: "mas_catalog_source" - - # Source container registry - # ----------------------------------------------------------------------------- - # mas_icr_cp: "cp.icr.io/cp" - # mas_icr_cpopen: "icr.io/cpopen" - mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" - mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" - - cluster_domain: cluster_domain - in_saas_env: "in_saas_env" - - mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" - mas_aibroker_s3_region: "mas_aibroker_s3_region" - mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" - environment_type: "environment_type" - -ibm_aibroker_tenant: - mas_instance_id: "MAS_INSTANCE_ID" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - ibm_entitlement_key: "" - - # SAAS - aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" - # in_saas_env: "true" - mas_aibroker_saas: "false" - mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" - - # Tenant - artifactory_token: "artifactory_token" - mas_aibroker_tenant_name: "user" - tenant_action: "true" - tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' - - # cluster_domain: "" - mas_icr_cp: "cp.icr.io/cp" - mas_icr_cpopen: "icr.io/cpopen" - - # DRO - # mas_aibroker_dro_token_secret: "dro-token" - mas_aibroker_dro_cacert_secret: "dro-certificates" - - drocfg_ca: "drocfg_ca" - drocfg_registration_key: "drocfg_registration_key" - drocfg_url: "drocfg_url" - - #sls - slscfg_registration_key: "slscfg_registration_key" - slscfg_url: "slscfg_url" - # slscfg_clientId: "slscfg_clientId" - # slscfg_ca: "slscfg_ca" - # slscfg_tls: "slscfg_tls" - # slscfg_key: "slscfg_key" - #RSL ##review - rsl_url: "rsl_url" - rsl_org_id: "rsl_org_id" - mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" - - - # WatsonX - mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY - mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL - mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID - - # SLS - #mas_aibroker_sls_registration_key_secret: "sls-registration-key" - mas_aibroker_sls_subscription_id: "001" - - # S3 - mas_aibroker_storage_provider: "aws" - mas_aibroker_storage_ssl: "true" - # following are the variable need to injected via environment variable - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - - # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" - mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" - mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" - mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" - - tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" - tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" - tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From 7de1f3d1aca46f6d540ad67b8981b29cf69df12f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:01:36 +0530 Subject: [PATCH 358/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index cdbbf60a6..c9e928ad7 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -94,6 +94,89 @@ spec: value: "{{ .Values.devops.mongo_uri }}" - name: devops.build_number value: "{{ .Values.devops.build_number }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + tenant_id: "aibroker-tenant01" + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + + # SAAS + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + + # Tenant + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + + # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + + # DRO + # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" + + #sls + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" + # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" + # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" + + # WatsonX + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + + # SLS + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + #rsl + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + + # S3 + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: aibrokertenantapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} From 913eef8f81c9c1942db8fe3c54b48b4325db4d20 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:05:43 +0530 Subject: [PATCH 359/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c9e928ad7..28b12e101 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -60,40 +60,6 @@ spec: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" path: instance-applications/115-ibm-aibroker-tenant - helm: - releaseName: tenantappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" plugin: name: {{ .Values.avp.name }} env: From 91882264353413db44c2ec271e886ac1ae11843e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:12:51 +0530 Subject: [PATCH 360/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 147 +++++++++--------- 1 file changed, 73 insertions(+), 74 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 28b12e101..86f8c0ff3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -61,88 +61,87 @@ spec: targetRevision: "{{ .Values.source.revision }}" path: instance-applications/115-ibm-aibroker-tenant plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + tenant_id: "aibroker-tenant01" + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - # SAAS - aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" - mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + # SAAS + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - # Tenant - artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + # Tenant + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" - mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - # DRO - # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" - mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + # DRO + # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - #sls - slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" - # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" - # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" - # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" + #sls + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" + # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" + # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" - # WatsonX - mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - - # SLS - mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - - #rsl - rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - - # S3 - mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" - mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: aibrokertenantapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} + # WatsonX + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + # SLS + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + #rsl + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + + # S3 + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: aibrokertenantapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} From 37b2433d1f1d4ae254c20863191801b9f082a0ac Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:20:35 +0530 Subject: [PATCH 361/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 86f8c0ff3..c89ad97a4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -66,56 +66,40 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + mas_instance_id: '{{ `{{ .ibm_aibroker_tenant.mas_instance_id }}` }}' aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - # SAAS aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - # Tenant artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - # DRO - # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - #sls slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" - # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" - # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" - # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" - - # WatsonX mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - # SLS mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - #rsl rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - # S3 mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" @@ -123,7 +107,6 @@ spec: mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" @@ -165,5 +148,4 @@ spec: kind: MarketplaceConfig jsonPointers: - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger revisionHistoryLimit: 1 \ No newline at end of file From 9565e8e0d22e3a202361abd8682ec92d7cea1bdb Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:37:42 +0530 Subject: [PATCH 362/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c89ad97a4..4948649d2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -66,7 +66,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "aibroker-tenant01" - mas_instance_id: '{{ `{{ .ibm_aibroker_tenant.mas_instance_id }}` }}' + mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From bc269b3a5fccba0ef59cb22bed1f0f2601b56598 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 19:44:38 +0530 Subject: [PATCH 363/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 95 +++++++++---------- 1 file changed, 43 insertions(+), 52 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4948649d2..5fa9384b4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -65,60 +65,51 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "aibroker-tenant01" + tenant_id: "{{ .ibm_aibroker_tenant.tenant_id }}" mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - - aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - - artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - - mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - - mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - - drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - - slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - - mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - - rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - - mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} + aibroker_namespace: "mas-{{ .ibm_aibroker_tenant.mas_instance_id }}-aibroker" + ibm_entitlement_key: "{{ .ibm_aibroker_tenant.ibm_entitlement_key }}" + aibroker_saas_apikey: "{{ .ibm_aibroker_tenant.aibroker_saas_apikey }}" + mas_aibroker_saas: "{{ .ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + artifactory_token: "{{ .ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "aibroker-{{ .ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + mas_icr_cp: "{{ .ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .ibm_aibroker_tenant.mas_icr_cpopen }}" + mas_aibroker_dro_cacert_secret: "{{ .ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + drocfg_ca: "{{ .ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .ibm_aibroker_tenant.drocfg_url }}" + slscfg_registration_key: "{{ .ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .ibm_aibroker_tenant.slscfg_url }}" + mas_aibroker_watsonxai_apikey: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + mas_aibroker_sls_subscription_id: "{{ .ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + rsl_url: "{{ .ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .ibm_aibroker_tenant.rsl_token }}" + mas_aibroker_storage_provider: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_region }}" + mas_aibroker_s3_endpoint_url: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .ibm_aibroker_tenant.tenant_entitlement_end_date }}" junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" + reporter_name: "ibm-aibroker-tenant-{{ .ibm_aibroker_tenant.mas_instance_id }}" + cluster_id: "{{ .cluster.id }}" + devops_mongo_uri: "{{ .devops.mongo_uri }}" + devops_build_number: "{{ .devops.build_number }}" + gitops_version: "{{ .source.revision }}" - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From f753d78ac3fa9e2d24979c8ca307e0e82ad5e10d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 19 Jun 2025 20:17:57 +0530 Subject: [PATCH 364/491] Revert "Update 070-aibroker-tenant-appset.yaml" This reverts commit bc269b3a5fccba0ef59cb22bed1f0f2601b56598. --- .../templates/070-aibroker-tenant-appset.yaml | 95 ++++++++++--------- 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 5fa9384b4..4948649d2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -65,51 +65,60 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "{{ .ibm_aibroker_tenant.tenant_id }}" + tenant_id: "aibroker-tenant01" mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "mas-{{ .ibm_aibroker_tenant.mas_instance_id }}-aibroker" - ibm_entitlement_key: "{{ .ibm_aibroker_tenant.ibm_entitlement_key }}" - aibroker_saas_apikey: "{{ .ibm_aibroker_tenant.aibroker_saas_apikey }}" - mas_aibroker_saas: "{{ .ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - artifactory_token: "{{ .ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "aibroker-{{ .ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - mas_icr_cp: "{{ .ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .ibm_aibroker_tenant.mas_icr_cpopen }}" - mas_aibroker_dro_cacert_secret: "{{ .ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - drocfg_ca: "{{ .ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .ibm_aibroker_tenant.drocfg_url }}" - slscfg_registration_key: "{{ .ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .ibm_aibroker_tenant.slscfg_url }}" - mas_aibroker_watsonxai_apikey: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - mas_aibroker_sls_subscription_id: "{{ .ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - rsl_url: "{{ .ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .ibm_aibroker_tenant.rsl_token }}" - mas_aibroker_storage_provider: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .ibm_aibroker_tenant.mas_aibroker_storage_region }}" - mas_aibroker_s3_endpoint_url: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .ibm_aibroker_tenant.tenant_entitlement_end_date }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" + + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .ibm_aibroker_tenant.mas_instance_id }}" - cluster_id: "{{ .cluster.id }}" - devops_mongo_uri: "{{ .devops.mongo_uri }}" - devops_build_number: "{{ .devops.build_number }}" - gitops_version: "{{ .source.revision }}" + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From c077c62375ff82b3155760245432ec9b218a7df1 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 20 Jun 2025 10:12:13 +0530 Subject: [PATCH 365/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4948649d2..8591fc1ff 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -66,7 +66,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From 030a502e16c5577584d249feedbbf9b3c754ec9f Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 20 Jun 2025 10:16:46 +0530 Subject: [PATCH 366/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 8591fc1ff..da59576bf 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -112,7 +112,7 @@ spec: mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }} + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" junitreporter: reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" From 35f148c1ce6a5a447b4ba73af9db37693bdf1a40 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 20 Jun 2025 10:33:43 +0530 Subject: [PATCH 367/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index da59576bf..4f558d725 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -64,61 +64,7 @@ spec: name: {{ .Values.avp.name }} env: - name: {{ .Values.avp.values_varname }} - value: | - tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - - aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - - artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - - mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - - mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - - drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - - slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - - mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - - rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - - mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" + value: '{{ .ibm_aibroker_tenant | toPrettyJson }}' - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From 46ad9bcee1e801387be9159578de05706c116b2b Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 11:04:13 +0530 Subject: [PATCH 368/491] fix tenant name --- .../templates/070-aibroker-tenant-appset.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4f558d725..45c9f7482 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -10,6 +10,7 @@ metadata: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id}}' + tenant: '{{ .Values.tenant.id}}' annotations: argocd.argoproj.io/sync-wave: "070" spec: @@ -38,12 +39,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{ .tenant.id }}` }}' + tenant: '{{ .Values.tenant.id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 48c40117bdb6f09248d740496409c631cded290e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 11:40:53 +0530 Subject: [PATCH 369/491] Revert "Update 070-aibroker-tenant-appset.yaml" This reverts commit 35f148c1ce6a5a447b4ba73af9db37693bdf1a40. --- .../templates/070-aibroker-tenant-appset.yaml | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4f558d725..da59576bf 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -64,7 +64,61 @@ spec: name: {{ .Values.avp.name }} env: - name: {{ .Values.avp.values_varname }} - value: '{{ .ibm_aibroker_tenant | toPrettyJson }}' + value: | + tenant_id: "aibroker-tenant01" + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" + + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From 1f09487357f4c8b37a56555619094239629d8e8e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 11:43:51 +0530 Subject: [PATCH 370/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c357e8845..657d2064f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -29,12 +29,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: From 578cae040d62ea430965f40f54b6bfe1feea1c3f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 11:54:32 +0530 Subject: [PATCH 371/491] Update values.yaml --- .../ibm-aibroker-instance-root/values.yaml | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 1f438b417..909d0fd03 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -255,72 +255,72 @@ ibm_aibroker: mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" environment_type: "environment_type" -ibm_aibroker_tenant: - mas_instance_id: "MAS_INSTANCE_ID" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' - ibm_entitlement_key: "" - - # SAAS - aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" - # in_saas_env: "true" - mas_aibroker_saas: "false" - mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" - - # Tenant - artifactory_token: "artifactory_token" - mas_aibroker_tenant_name: "user" - tenant_action: "true" - tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' - - # cluster_domain: "" - mas_icr_cp: "cp.icr.io/cp" - mas_icr_cpopen: "icr.io/cpopen" - - # DRO - # mas_aibroker_dro_token_secret: "dro-token" - mas_aibroker_dro_cacert_secret: "dro-certificates" - - drocfg_ca: "drocfg_ca" - drocfg_registration_key: "drocfg_registration_key" - drocfg_url: "drocfg_url" - - #sls - slscfg_registration_key: "slscfg_registration_key" - slscfg_url: "slscfg_url" - # slscfg_clientId: "slscfg_clientId" - # slscfg_ca: "slscfg_ca" - # slscfg_tls: "slscfg_tls" - # slscfg_key: "slscfg_key" - #RSL ##review - rsl_url: "rsl_url" - rsl_org_id: "rsl_org_id" - mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" +# ibm_aibroker_tenant: +# mas_instance_id: "MAS_INSTANCE_ID" +# aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' +# ibm_entitlement_key: "" + +# # SAAS +# aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" +# # in_saas_env: "true" +# mas_aibroker_saas: "false" +# mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" + +# # Tenant +# artifactory_token: "artifactory_token" +# mas_aibroker_tenant_name: "user" +# tenant_action: "true" +# tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + +# # cluster_domain: "" +# mas_icr_cp: "cp.icr.io/cp" +# mas_icr_cpopen: "icr.io/cpopen" + +# # DRO +# # mas_aibroker_dro_token_secret: "dro-token" +# mas_aibroker_dro_cacert_secret: "dro-certificates" + +# drocfg_ca: "drocfg_ca" +# drocfg_registration_key: "drocfg_registration_key" +# drocfg_url: "drocfg_url" + +# #sls +# slscfg_registration_key: "slscfg_registration_key" +# slscfg_url: "slscfg_url" +# # slscfg_clientId: "slscfg_clientId" +# # slscfg_ca: "slscfg_ca" +# # slscfg_tls: "slscfg_tls" +# # slscfg_key: "slscfg_key" +# #RSL ##review +# rsl_url: "rsl_url" +# rsl_org_id: "rsl_org_id" +# mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" - # WatsonX - mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY - mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL - mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID - - # SLS - #mas_aibroker_sls_registration_key_secret: "sls-registration-key" - mas_aibroker_sls_subscription_id: "001" - - # S3 - mas_aibroker_storage_provider: "aws" - mas_aibroker_storage_ssl: "true" - # following are the variable need to injected via environment variable - mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" - mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" - mas_aibroker_storage_host: "mas_aibroker_storage_host" - mas_aibroker_storage_port: "mas_aibroker_storage_port" - mas_aibroker_storage_region: "mas_aibroker_storage_region" - - # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" - mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" - mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" - mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" - - tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" - tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" - tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" +# # WatsonX +# mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY +# mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL +# mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + +# # SLS +# #mas_aibroker_sls_registration_key_secret: "sls-registration-key" +# mas_aibroker_sls_subscription_id: "001" + +# # S3 +# mas_aibroker_storage_provider: "aws" +# mas_aibroker_storage_ssl: "true" +# # following are the variable need to injected via environment variable +# mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" +# mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" +# mas_aibroker_storage_host: "mas_aibroker_storage_host" +# mas_aibroker_storage_port: "mas_aibroker_storage_port" +# mas_aibroker_storage_region: "mas_aibroker_storage_region" + +# # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" +# mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" +# mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" +# mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + +# tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" +# tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" +# tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From cd278e2cb743eff0f333e87fcd5b54b67b0432b2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 12:00:08 +0530 Subject: [PATCH 372/491] Revert "fix tenant name" This reverts commit 46ad9bcee1e801387be9159578de05706c116b2b. --- .../templates/070-aibroker-tenant-appset.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 657d2064f..a251dc4f3 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -10,7 +10,6 @@ metadata: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id}}' - tenant: '{{ .Values.tenant.id}}' annotations: argocd.argoproj.io/sync-wave: "070" spec: @@ -39,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' + tenant: '{{ `{{ .tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From 673e23f0f11031c390503f85d96996f6930b80c2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 12:08:43 +0530 Subject: [PATCH 373/491] check --- .../templates/070-aibroker-tenant-appset.yaml | 32 ++--- .../ibm-aibroker-instance-root/values.yaml | 134 +++++++++--------- 2 files changed, 81 insertions(+), 85 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index a251dc4f3..1b0fdd57e 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -55,7 +55,11 @@ spec: notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} {{- end }} spec: - project: "{{ .Values.argo.projects.rootapps }}" + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_aibroker_tenant.openshift_namespace }}" + source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" @@ -125,27 +129,19 @@ spec: - name: AVP_SECRET value: {{ .Values.avp.secret }} {{- end }} - destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} syncPolicy: automated: {{- if .Values.auto_delete }} prune: true {{- end }} selfHeal: true - syncOptions: - - CreateNamespace=false - - RespectIgnoreDifferences=true retry: - limit: -1 - ignoreDifferences: - - group: '*' - kind: ServiceAccount - jsonPointers: - - /imagePullSecrets - - group: 'marketplace.redhat.com/v1alpha1' - kind: MarketplaceConfig - jsonPointers: - - /spec - revisionHistoryLimit: 1 \ No newline at end of file + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: + {{- if .Values.custom_labels }} + {{ .Values.custom_labels | toYaml | indent 8 }} + {{- end }} + {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 909d0fd03..a3c746b69 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -255,72 +255,72 @@ ibm_aibroker: mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" environment_type: "environment_type" -# ibm_aibroker_tenant: -# mas_instance_id: "MAS_INSTANCE_ID" -# aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' -# ibm_entitlement_key: "" - -# # SAAS -# aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" -# # in_saas_env: "true" -# mas_aibroker_saas: "false" -# mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" - -# # Tenant -# artifactory_token: "artifactory_token" -# mas_aibroker_tenant_name: "user" -# tenant_action: "true" -# tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' - -# # cluster_domain: "" -# mas_icr_cp: "cp.icr.io/cp" -# mas_icr_cpopen: "icr.io/cpopen" - -# # DRO -# # mas_aibroker_dro_token_secret: "dro-token" -# mas_aibroker_dro_cacert_secret: "dro-certificates" - -# drocfg_ca: "drocfg_ca" -# drocfg_registration_key: "drocfg_registration_key" -# drocfg_url: "drocfg_url" - -# #sls -# slscfg_registration_key: "slscfg_registration_key" -# slscfg_url: "slscfg_url" -# # slscfg_clientId: "slscfg_clientId" -# # slscfg_ca: "slscfg_ca" -# # slscfg_tls: "slscfg_tls" -# # slscfg_key: "slscfg_key" -# #RSL ##review -# rsl_url: "rsl_url" -# rsl_org_id: "rsl_org_id" -# mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" +ibm_aibroker_tenant: + mas_instance_id: "MAS_INSTANCE_ID" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + ibm_entitlement_key: "" + openshift_namespace: "openshift-operators" + # SAAS + aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" + # in_saas_env: "true" + mas_aibroker_saas: "false" + mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" + + # Tenant + artifactory_token: "artifactory_token" + mas_aibroker_tenant_name: "user" + tenant_action: "true" + tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + + # cluster_domain: "" + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + # DRO + # mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + #sls + slscfg_registration_key: "slscfg_registration_key" + slscfg_url: "slscfg_url" + # slscfg_clientId: "slscfg_clientId" + # slscfg_ca: "slscfg_ca" + # slscfg_tls: "slscfg_tls" + # slscfg_key: "slscfg_key" + #RSL ##review + rsl_url: "rsl_url" + rsl_org_id: "rsl_org_id" + mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" -# # WatsonX -# mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY -# mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL -# mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID - -# # SLS -# #mas_aibroker_sls_registration_key_secret: "sls-registration-key" -# mas_aibroker_sls_subscription_id: "001" - -# # S3 -# mas_aibroker_storage_provider: "aws" -# mas_aibroker_storage_ssl: "true" -# # following are the variable need to injected via environment variable -# mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" -# mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" -# mas_aibroker_storage_host: "mas_aibroker_storage_host" -# mas_aibroker_storage_port: "mas_aibroker_storage_port" -# mas_aibroker_storage_region: "mas_aibroker_storage_region" - -# # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" -# mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" -# mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" -# mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" - -# tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" -# tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" -# tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" + # WatsonX + mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY + mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL + mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + + # SLS + #mas_aibroker_sls_registration_key_secret: "sls-registration-key" + mas_aibroker_sls_subscription_id: "001" + + # S3 + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" + mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" + mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + + tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" + tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" + tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From 587cba99c1ee0a17c8f251081fe90f98a970fb8d Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 12:12:41 +0530 Subject: [PATCH 374/491] unexpected end --- .../templates/070-aibroker-tenant-appset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 1b0fdd57e..f6c141d9f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -143,5 +143,4 @@ spec: labels: {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} - {{- end }} {{- end }} \ No newline at end of file From 686e76c144b36975a50ddaeb63b9cc8c014c54d8 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 12:18:38 +0530 Subject: [PATCH 375/491] remove goTemplate --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index f6c141d9f..a8408dc1f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -13,7 +13,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "070" spec: - goTemplate: true + # goTemplate: true generators: - merge: mergeKeys: From d5aa650d8d47e6164cafbc7b1ef5a11d6ee470cb Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 12:20:50 +0530 Subject: [PATCH 376/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index a8408dc1f..6fc39983b 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{ .tenant.id }}` }}' + tenant: '{{ .Values.tenant.id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From c967b8629ae9df41f6c7883aa0520275a62a0247 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:06:46 +0530 Subject: [PATCH 377/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 6fc39983b..84c9d7327 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -13,7 +13,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "070" spec: - # goTemplate: true + goTemplate: true generators: - merge: mergeKeys: @@ -38,12 +38,12 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' + tenant: '{{ `{{.tenant.id}}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -55,15 +55,12 @@ spec: notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} {{- end }} spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_aibroker_tenant.openshift_namespace }}" + project: "{{ .Values.argo.projects.rootapps }}" source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: instance-applications/115-ibm-aibroker-tenant + path: root-applications/ibm-aibroker-instance-root plugin: name: {{ .Values.avp.name }} env: @@ -129,18 +126,28 @@ spec: - name: AVP_SECRET value: {{ .Values.avp.secret }} {{- end }} + destination: + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} syncPolicy: automated: {{- if .Values.auto_delete }} prune: true {{- end }} selfHeal: true - retry: - limit: 20 syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: - {{- if .Values.custom_labels }} - {{ .Values.custom_labels | toYaml | indent 8 }} - {{- end }} \ No newline at end of file + - CreateNamespace=false + - RespectIgnoreDifferences=true + retry: + limit: -1 + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + - group: 'marketplace.redhat.com/v1alpha1' + kind: MarketplaceConfig + jsonPointers: + - /spec + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1 \ No newline at end of file From 96ee6bcd3b19884af4a8e0bd7537984c60b1934c Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:11:18 +0530 Subject: [PATCH 378/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 84c9d7327..9f1024faa 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -65,7 +65,7 @@ spec: name: {{ .Values.avp.name }} env: - name: {{ .Values.avp.values_varname }} - value: | + # value: | tenant_id: "aibroker-tenant01" mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" From 1b73578a8a27f432c55eeaf867240cb22ca27ce5 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:12:11 +0530 Subject: [PATCH 379/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 9f1024faa..c7842b2db 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -64,7 +64,7 @@ spec: plugin: name: {{ .Values.avp.name }} env: - - name: {{ .Values.avp.values_varname }} + # - name: {{ .Values.avp.values_varname }} # value: | tenant_id: "aibroker-tenant01" mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" From 677c37da4f08dc1c62d677d03f0e83d135580d23 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:13:33 +0530 Subject: [PATCH 380/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 99 +++++++------------ 1 file changed, 34 insertions(+), 65 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index c7842b2db..24bb428f2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -61,71 +61,40 @@ spec: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" path: root-applications/ibm-aibroker-instance-root - plugin: - name: {{ .Values.avp.name }} - env: - # - name: {{ .Values.avp.values_varname }} - # value: | - tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" - aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" - ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" - - aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" - mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" - mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" - - artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" - mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" - tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" - tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" - - mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" - mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" - - mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" - - drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" - drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" - drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" - - slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" - slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" - mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" - mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" - mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" - - mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" - - rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" - rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" - rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" - - mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" - mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" - mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" - mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" - mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" - mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" - mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" - mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" - mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" - mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" - tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" - tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" - tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: aibrokertenantapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} From 389411b0d3f4b9345a10ad2acce89df6e9a0cd71 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:15:32 +0530 Subject: [PATCH 381/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 24bb428f2..d474800b5 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -60,7 +60,7 @@ spec: source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root + path: root-applications/ibm-aibroker-instance-root/070-aibroker-tenant-appset.yaml helm: releaseName: instanceappset values: "{{ `{{ toYaml . }}` }}" From 883900d420fb0441a563d8de7d764d7a994f5752 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 13:32:48 +0530 Subject: [PATCH 382/491] update template --- .../templates/070-aibroker-tenant-appset.yaml | 55 +++++-------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index d474800b5..4f558d725 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -28,12 +28,12 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: @@ -43,7 +43,7 @@ spec: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{.tenant.id}}` }}' + tenant: '{{ `{{ .tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -56,45 +56,21 @@ spec: {{- end }} spec: project: "{{ .Values.argo.projects.rootapps }}" - source: repoURL: "{{ .Values.source.repo_url }}" targetRevision: "{{ .Values.source.revision }}" - path: root-applications/ibm-aibroker-instance-root/070-aibroker-tenant-appset.yaml - helm: - releaseName: instanceappset - values: "{{ `{{ toYaml . }}` }}" - parameters: - - name: "generator.repo_url" - value: "{{ .Values.generator.repo_url }}" - - name: "generator.revision" - value: "{{ .Values.generator.revision }}" - - name: "source.revision" - value: "{{ .Values.source.revision }}" - - name: "source.repo_url" - value: "{{ .Values.source.repo_url }}" - - name: argo.namespace - value: "{{ .Values.argo.namespace }}" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - - name: "notifications.slack_channel_id" - value: "{{ .Values.notifications.slack_channel_id }}" - {{- end }} - - name: argo.projects.rootapps - value: "{{ .Values.argo.projects.rootapps }}" - - name: argo.projects.apps - value: "{{ .Values.argo.projects.apps }}" - - name: avp.name - value: "{{ .Values.avp.name }}" - - name: avp.secret - value: "{{ .Values.avp.secret }}" - - name: avp.values_varname - value: "{{ .Values.avp.values_varname }}" - - name: auto_delete - value: "{{ .Values.auto_delete }}" - - name: devops.mongo_uri - value: "{{ .Values.devops.mongo_uri }}" - - name: devops.build_number - value: "{{ .Values.devops.build_number }}" + path: instance-applications/115-ibm-aibroker-tenant + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: '{{ .ibm_aibroker_tenant | toPrettyJson }}' + - name: ARGOCD_APP_NAME + value: aibrokertenantapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} destination: server: 'https://kubernetes.default.svc' namespace: {{ .Values.argo.namespace }} @@ -118,5 +94,4 @@ spec: kind: MarketplaceConfig jsonPointers: - /spec - # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger revisionHistoryLimit: 1 \ No newline at end of file From 79b104b675277d5d5948a9f860fedb6d40874734 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 14:16:59 +0530 Subject: [PATCH 383/491] update to use only ibm-aibroker-tenant.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4f558d725..cec5a10f8 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -10,6 +10,7 @@ metadata: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id}}' + tenant: '{{ .Values.tenant.id}}' annotations: argocd.argoproj.io/sync-wave: "070" spec: @@ -24,26 +25,26 @@ spec: - 'merge-key' generators: # This is the "base" generator, it *must* be first in the list + # - git: + # repoURL: "{{ .Values.generator.repo_url }}" + # revision: "{{ .Values.generator.revision }}" + # files: + # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' instance: '{{ .Values.instance.id }}' - tenant: '{{ `{{ .tenant.id }}` }}' + tenant: '{{ .Values.tenant.id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -64,7 +65,16 @@ spec: name: {{ .Values.avp.name }} env: - name: {{ .Values.avp.values_varname }} - value: '{{ .ibm_aibroker_tenant | toPrettyJson }}' + value: | + tenant_id: "aibroker-tenant01" + mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .ibm_aibroker_tenant.aibroker_namespace }}" + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From f45de3c081c3854e9a4b290fc8448510463a0927 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:21:43 +0530 Subject: [PATCH 384/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index cec5a10f8..4cec36cfa 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -67,7 +67,6 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "aibroker-tenant01" - mas_instance_id: "{{ .ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .ibm_aibroker_tenant.aibroker_namespace }}" junitreporter: reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" From 5b23f5220e6d0e0e08acce43a343d751aa7c4199 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 14:24:38 +0530 Subject: [PATCH 385/491] update to use only ibm-aibroker-tenant.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4cec36cfa..1c22c359f 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -67,7 +67,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "aibroker-tenant01" - aibroker_namespace: "{{ .ibm_aibroker_tenant.aibroker_namespace }}" + aibroker_namespace: '{{ .ibm_aibroker_tenant.aibroker_namespace }}' junitreporter: reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" From 0d3025869cd8ad9cb960c5711c8c421bc6572ae5 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:27:09 +0530 Subject: [PATCH 386/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 100 ++++++++---------- 1 file changed, 42 insertions(+), 58 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 4cec36cfa..5630df667 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,4 +1,3 @@ - --- # IBM AiBroker Tenant Application Set apiVersion: argoproj.io/v1alpha1 @@ -9,85 +8,70 @@ metadata: labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id}}' - tenant: '{{ .Values.tenant.id}}' + instance: '{{ .Values.instance.id }}' + tenant: '{{ .Values.tenant.id }}' annotations: argocd.argoproj.io/sync-wave: "070" spec: goTemplate: true generators: - - merge: - mergeKeys: - # Would love to use ".path.path" here to merge the configs together - # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 - # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) - # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up - - 'merge-key' - generators: - # This is the "base" generator, it *must* be first in the list - # - git: - # repoURL: "{{ .Values.generator.repo_url }}" - # revision: "{{ .Values.generator.revision }}" - # files: - # - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" - syncPolicy: - applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant*/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "aibroker-tenant.{{ .cluster_id }}.{{ .instance_id }}.{{ .tenant_id }}" labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' + environment: '{{ .environment }}' + cluster: '{{ .cluster_id }}' + instance: '{{ .instance_id }}' + tenant: '{{ .tenant_id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} annotations: healthCheckTimeout: "1800" argocd.argoproj.io/sync-wave: "070" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +{{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} +{{- end }} spec: project: "{{ .Values.argo.projects.rootapps }}" source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: instance-applications/115-ibm-aibroker-tenant - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - tenant_id: "aibroker-tenant01" - aibroker_namespace: "{{ .ibm_aibroker_tenant.aibroker_namespace }}" - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: aibrokertenantapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: instance-applications/115-ibm-aibroker-tenant + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + tenant_id: "{{ .tenant_id }}" + mas_instance_id: "{{ .mas_instance_id }}" + aibroker_namespace: "{{ .aibroker_namespace }}" + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .instance_id }}" + cluster_id: "{{ .cluster_id }}" + devops_mongo_uri: "{{ .devops_mongo_uri }}" + devops_build_number: "{{ .devops_build_number }}" + gitops_version: "{{ .gitops_version }}" + - name: ARGOCD_APP_NAME + value: aibrokertenantapp +{{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} +{{- end }} destination: - server: 'https://kubernetes.default.svc' - namespace: {{ .Values.argo.namespace }} + server: https://kubernetes.default.svc + namespace: {{ .aibroker_namespace }} syncPolicy: automated: - {{- if .Values.auto_delete }} +{{- if .Values.auto_delete }} prune: true - {{- end }} +{{- end }} selfHeal: true syncOptions: - CreateNamespace=false @@ -103,4 +87,4 @@ spec: kind: MarketplaceConfig jsonPointers: - /spec - revisionHistoryLimit: 1 \ No newline at end of file + revisionHistoryLimit: 1 From e535bdb5d81a9e14eda28530d5898b9e3261649f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:31:13 +0530 Subject: [PATCH 387/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 5630df667..792625651 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -19,7 +19,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant*/ibm-aibroker-tenant.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: name: "aibroker-tenant.{{ .cluster_id }}.{{ .instance_id }}.{{ .tenant_id }}" From 71b9765b0a61ab604eea34d6833bf04a447a65a5 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 14:41:26 +0530 Subject: [PATCH 388/491] update to use only ibm-aibroker-tenant.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 792625651..7e9b44dc4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -22,12 +22,12 @@ spec: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{ .cluster_id }}.{{ .instance_id }}.{{ .tenant_id }}" + name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" labels: - environment: '{{ .environment }}' - cluster: '{{ .cluster_id }}' - instance: '{{ .instance_id }}' - tenant: '{{ .tenant_id }}' + environment: '{{.environment }}' + cluster: '{{.cluster_id }}' + instance: '{{.instance_id }}' + tenant: '{{.tenant_id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} From ca7d7db96259c1898a4ca57fc1f2f2f9c26a4c3a Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 20 Jun 2025 14:44:14 +0530 Subject: [PATCH 389/491] update to use only ibm-aibroker-tenant.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 7e9b44dc4..271ce4a85 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -22,9 +22,9 @@ spec: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" + name: "aibroker-tenant.{{ .Values.cluster_id }}.{{ .Values.instance_id }}.{{ .Values.tenant_id }}" labels: - environment: '{{.environment }}' + environment: '{{ .Values.environment }}' cluster: '{{.cluster_id }}' instance: '{{.instance_id }}' tenant: '{{.tenant_id }}' From 219ccf31ff128880210cdd8e0e464653b4172f07 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:52:03 +0530 Subject: [PATCH 390/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 7e9b44dc4..6de5121f7 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -22,12 +22,11 @@ spec: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" + name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}" labels: environment: '{{.environment }}' cluster: '{{.cluster_id }}' instance: '{{.instance_id }}' - tenant: '{{.tenant_id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -49,7 +48,6 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "{{ .tenant_id }}" mas_instance_id: "{{ .mas_instance_id }}" aibroker_namespace: "{{ .aibroker_namespace }}" junitreporter: From d5deabc8ebbeccfe1fdcbae6e91dc8feef91bd7a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:54:31 +0530 Subject: [PATCH 391/491] Revert "Update 070-aibroker-tenant-appset.yaml" This reverts commit 219ccf31ff128880210cdd8e0e464653b4172f07. --- .../templates/070-aibroker-tenant-appset.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 277cd0acf..29af4ab0c 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -22,11 +22,12 @@ spec: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}" + name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" labels: environment: '{{ .Values.environment }}' cluster: '{{.cluster_id }}' instance: '{{.instance_id }}' + tenant: '{{.tenant_id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -48,6 +49,7 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | + tenant_id: "{{ .tenant_id }}" mas_instance_id: "{{ .mas_instance_id }}" aibroker_namespace: "{{ .aibroker_namespace }}" junitreporter: From 658c9f6189ed2e5697c1d24e5c58ae341e3264da Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 14:55:02 +0530 Subject: [PATCH 392/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 29af4ab0c..73fbee7c2 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -15,11 +15,11 @@ metadata: spec: goTemplate: true generators: - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" From d630833cc15a635f4d7237400b3ddaab4c223c81 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:16:25 +0530 Subject: [PATCH 393/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 73fbee7c2..cd84d4b78 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -22,12 +22,11 @@ spec: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" template: metadata: - name: "aibroker-tenant.{{.cluster_id }}.{{.instance_id }}.{{.tenant_id }}" + name: "aibroker-tenant.{{cluster_id }}.{{instance_id }}.{{tenant_id }}" labels: - environment: '{{ .Values.environment }}' - cluster: '{{.cluster_id }}' - instance: '{{.instance_id }}' - tenant: '{{.tenant_id }}' + cluster: '{{cluster_id }}' + instance: '{{instance_id }}' + tenant: '{{tenant_id }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} @@ -49,9 +48,9 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "{{ .tenant_id }}" - mas_instance_id: "{{ .mas_instance_id }}" - aibroker_namespace: "{{ .aibroker_namespace }}" + tenant_id: "{{tenant_id }}" + mas_instance_id: "{{mas_instance_id }}" + aibroker_namespace: "{{aibroker_namespace }}" junitreporter: reporter_name: "ibm-aibroker-tenant-{{ .instance_id }}" cluster_id: "{{ .cluster_id }}" From 1ce8ce581b6b6b9597d048b787f55e2c4e1540c3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:19:39 +0530 Subject: [PATCH 394/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index cd84d4b78..af597a8b4 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -51,12 +51,6 @@ spec: tenant_id: "{{tenant_id }}" mas_instance_id: "{{mas_instance_id }}" aibroker_namespace: "{{aibroker_namespace }}" - junitreporter: - reporter_name: "ibm-aibroker-tenant-{{ .instance_id }}" - cluster_id: "{{ .cluster_id }}" - devops_mongo_uri: "{{ .devops_mongo_uri }}" - devops_build_number: "{{ .devops_build_number }}" - gitops_version: "{{ .gitops_version }}" - name: ARGOCD_APP_NAME value: aibrokertenantapp {{- if not (empty .Values.avp.secret) }} From 21155b116e6b6652246f8e597b4bd2adb1089406 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:27:47 +0530 Subject: [PATCH 395/491] Revert "deleted unwanted" This reverts commit ef9e6bed7947469b3b7b03645f477a93832213e3. --- .../ibm-aibroker-tenant-root/Chart.yaml | 5 + .../ibm-aibroker-tenant-root/README.md | 3 + .../100-ibm-aibroker-tenant-app.yaml | 132 +++++++ .../ibm-aibroker-tenant-root/values.yaml | 323 ++++++++++++++++++ 4 files changed, 463 insertions(+) create mode 100644 root-applications/ibm-aibroker-tenant-root/Chart.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/README.md create mode 100644 root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml create mode 100644 root-applications/ibm-aibroker-tenant-root/values.yaml diff --git a/root-applications/ibm-aibroker-tenant-root/Chart.yaml b/root-applications/ibm-aibroker-tenant-root/Chart.yaml new file mode 100644 index 000000000..1ed6c0ab2 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: ibm-aibroker-tenant-root +description: IBM AIBroker tenant root +type: application +version: 1.0.0 diff --git a/root-applications/ibm-aibroker-tenant-root/README.md b/root-applications/ibm-aibroker-tenant-root/README.md new file mode 100644 index 000000000..f63a00c8e --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/README.md @@ -0,0 +1,3 @@ +IBM AIBroker Tenant Root Application +=============================================================================== +Installs various ArgoCD Applications for managing instance-level AIBroker dependencies (e.g. Minio, ODH etc) and AIBroker Applications (e.g. kmodel, aibroker-tenant etc) on the target cluster. \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml new file mode 100644 index 000000000..2ae0d3aa4 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -0,0 +1,132 @@ +{{- if not (empty .Values.ibm_aibroker_tenant) }} +--- +# IBM Maximo aibroker-tenant +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + tenant: '{{ .Values.tenant.id }}' + annotations: + argocd.argoproj.io/sync-wave: "100" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/115-ibm-aibroker-tenant + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + tenant_id: "aibroker-tenant01" + mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" + ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" + + # SAAS + aibroker_saas_apikey: "{{ .Values.ibm_aibroker_tenant.aibroker_saas_apikey }}" + # in_saas_env: "{{ .Values.ibm_aibroker_tenant.in_saas_env }}" + mas_aibroker_saas: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_saas }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_provision_tenant }}" + + # Tenant + artifactory_token: "{{ .Values.ibm_aibroker_tenant.artifactory_token }}" + mas_aibroker_tenant_name: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_tenant_name }}" + tenant_action: "{{ .Values.ibm_aibroker_tenant.tenant_action }}" + tenantNamespace: "{{ .Values.ibm_aibroker_tenant.tenantNamespace }}" + + # cluster_domain: "{{ .Values.ibm_aibroker_tenant.cluster_domain }}" + mas_icr_cp: "{{ .Values.ibm_aibroker_tenant.mas_icr_cp }}" + mas_icr_cpopen: "{{ .Values.ibm_aibroker_tenant.mas_icr_cpopen }}" + + # DRO + # mas_aibroker_dro_token_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_token_secret }}" + mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_dro_cacert_secret }}" + + drocfg_ca: "{{ .Values.ibm_aibroker_tenant.drocfg_ca }}" + drocfg_registration_key: "{{ .Values.ibm_aibroker_tenant.drocfg_registration_key }}" + drocfg_url: "{{ .Values.ibm_aibroker_tenant.drocfg_url }}" + + #sls + slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" + slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" + # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" + # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" + # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" + + # WatsonX + mas_aibroker_watsonxai_apikey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_apikey }}" + mas_aibroker_watsonxai_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_url }}" + mas_aibroker_watsonxai_project_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_watsonxai_project_id }}" + + # SLS + mas_aibroker_sls_subscription_id: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_sls_subscription_id }}" + + #rsl + rsl_url: "{{ .Values.ibm_aibroker_tenant.rsl_url }}" + rsl_org_id: "{{ .Values.ibm_aibroker_tenant.rsl_org_id }}" + rsl_token: "{{ .Values.ibm_aibroker_tenant.rsl_token }}" + + # S3 + mas_aibroker_storage_provider: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_provider }}" + mas_aibroker_storage_ssl: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_ssl }}" + mas_aibroker_storage_accesskey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_accesskey }}" + mas_aibroker_storage_secretkey: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_secretkey }}" + mas_aibroker_storage_host: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_host }}" + mas_aibroker_storage_port: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_port }}" + mas_aibroker_storage_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_region }}" + # mas_aibroker_storage_pipelines_bucket: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_storage_pipelines_bucket }}" + mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_endpoint_url }}" + mas_aibroker_s3_region: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_region }}" + mas_aibroker_s3_bucket_prefix: "{{ .Values.ibm_aibroker_tenant.mas_aibroker_s3_bucket_prefix }}" + tenant_entitlement_type: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_type }}" + tenant_entitlement_start_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_start_date }}" + tenant_entitlement_end_date: "{{ .Values.ibm_aibroker_tenant.tenant_entitlement_end_date }}" + + + junitreporter: + reporter_name: "ibm-aibroker-tenant-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: aibrokertenantapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-aibroker-tenant-root/values.yaml b/root-applications/ibm-aibroker-tenant-root/values.yaml new file mode 100644 index 000000000..046d341b5 --- /dev/null +++ b/root-applications/ibm-aibroker-tenant-root/values.yaml @@ -0,0 +1,323 @@ +--- + +avp: + name: "argocd-vault-plugin-helm" + secret: "" + values_varname: "HELM_VALUES" + +account: + id: dev + +cluster: + id: cluster1 + +region: + id: region1 + +instance: + id: inst1 + +tenant: + id: aibroker-tenant01 + +source: + repo_url: "https://github.com/ibm-mas/gitops" + revision: "poc" + +# Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), +# So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified +# Both of these correspond to requirement arguments of the gitops-bootstrap CLI function (--github-url and --github-revision) +# generator: +# repo_url: "" +# revision: "" + +# These defaults align with the ArgoCD worker setup by gitops-bootstrap +# (openshift-gitops with a single ArgoCD project "mas") +argo: + namespace: "openshift-gitops" + projects: + rootapps: "mas" + apps: "mas" + + +auto_delete: false + +sm: + aws_access_key_id: xxxx + +run_sanity_test: false + +devops: + mongo_uri: + build_number: + +ibm_minio: + minio_namespace: "minio_namespace" + minio_instance_name: "minio" + minio_root_user: "minio" + minio_root_password: "" + minio_storage_class: "default" + minio_storage_size: "40Gi" + minio_image: "quay.io/minio/minio:latest" + + +ibm_odh: + openshift_namespace: "openshift-operators" + odh_pipeline_channel: "latest" + odh_pipeline_installplan: "Automatic" + service_mesh_namespace: "openshift-serverless" + service_mesh_channel: "stable" + service_mesh_catalog_source: "redhat-operators" + serverless_channel: "stable" + authorino_catalog_source: "community-operators" + odh_channel: "fast" + odh_catalog_source: "community-operators" + odh_operator_version: "opendatahub-operator.v2.11.1" + #Odh_Pipeline_operator + odh_pipeline_name: "openshift-pipelines-operator" + odh_pipeline_namespace: "openshift-operators" + odh_pipeline_operatorName: "openshift-pipelines-operator-rh" + odh_pipeline_source: "redhat_operators" + odh_pipeline_sourceNamespace: "openshift_marketplace" + + #Serverless Operator + serverless_namespace: "openshift-serverless" + serverless_operator_name: "serverless-operator" + serverless_operator_source: "redhat-operators" + serverless_operator_sourceNamespace: "openshift-marketplace" + + #opendatahub Operator + opendatahub_OperatorGroup_name: "opendatahub-operator-group" + opendatahub_name: "opendatahub-operator" + opendatahub_namespace: "opendatahub" + opendatahub_installPlanApproval: "Manual" + opendatahub_channel: "fast" + opendatahub_source: "community-operators" + opendatahub__sourceNamespace: "openshift-marketplace" + + aibroker_namespace: "mas_sremat_aibroker" + pull_secret_name: "ibm_entitlement" + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_accesskey: "" + mas_aibroker_storage_secretkey: "" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_ssl: "mas_aibroker_storage_ssl" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # MariaDB + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_database: "mas_aibroker_db_database" + + mas_aibroker_db_secret_key: "mas_aibroker_db_secret_key" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + primary_storage_class: "nfs-client" + + +ibm_kmodel: + mas_instance_id: "mas_instance_id" + aibroker_internal_tls: "aibroker_internal_tls" + aibroker_namespace: "mas-sremat-aibroker" + + mas_aibroker_storage_provider: "minio" + mas_aibroker_storage_ssl: "false" + + openshift_namespace: "openshift-operators" + run_sync_hooks: true + + + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + ssh_secret_name: "sremat-kmodel-aibroker-tls" + # vars file for kmodels + pullSecretName: "pullSecretName" + docker_server: "MAS_ICR_CP/aibroker" + tenantNamespace: "aibroker-MAS_AIBROKER_TENANT_NAME" + # mas_aibroker_provision_tenant: "MAS_AIBROKER_PROVISION_TENANT" + primary_storage_class: "PRIMARY_STORAGE_CLASS" + # Bucket names + mas_aibroker_storage_templates_bucket: "mas_aibroker_storage_templates_bucket" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_pipelines_bucket: "mas_aibroker_storage_pipelines_bucket" + #container images + image_store: "MAS_ICR_CP/aibroker/store:1.0.2" + image_watcher: "MAS_ICR_CP/aibroker/watcher:1.0.2-pre.dev10x" + image_controller: "MAS_ICR_CP/aibroker/controller:1.0.2-pre.dev10x" + mas_aibroker_pipeline_steps_tag: 1.0.0 + mas_aibroker_connector_tag: 1.0.0 + + # model + # model_id_unique_length: "model_id_unique_length" + # model_id_prefix: "model_id_prefix" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + +ibm_aibroker: + mas_instance_id: "mas_instance_id" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + mas_aibroker_minio_secret: "mas_aibroker_minio_secret" + # Minio + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + # MariaDB + mas_aibroker_mariadb_secret: "mas_aibroker_mariadb_secret" + mas_aibroker_db_user: "mas_aibroker_db_user" + mas_aibroker_db_secret_value: "mas_aibroker_db_secret_value" + + # WatsonX + mas_aibroker_watsonx_secret: "mas_aibroker_watsonx_secret" + mas_aibroker_watsonxai_apikey: "MAS_AIBROKER_WATSONXAI_APIKEY" + mas_aibroker_watsonxai_url: "MAS_AIBROKER_WATSONXAI_URL" + mas_aibroker_watsonxai_project_id: "MAS_AIBROKER_WATSONXAI_PROJECT_ID" + + # S3 + s3_apikey: "S3_APIKEY" + mas_aibroker_storage_accesskey: "true" + mas_aibroker_storage_secretkey: "MAS_AIBROKER_STORAGE_SECRETKEY" + + mas_aibroker_storage_host: "true" + mas_aibroker_storage_port: "true" + + # SLS + mas_aibroker_sls_registration_key_secret: "sls-registration-key" + + mas_aibroker_db_host: "mas_aibroker_db_host" + mas_aibroker_db_port: "mas_aibroker_db_port" + mas_aibroker_db_secret_name: "mas_aibroker_db_secret_name" + + # Bucket names + mas_aibroker_storage_pipelines_bucket: "MAS_AIBROKER_STORAGE_PIPELINES_BUCKET" + mas_aibroker_storage_tenants_bucket: "mas_aibroker_storage_tenants_bucket" + mas_aibroker_storage_templates_bucket: "MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET" + + slscfg_registration_key: "slscfg_registration_key" + + # DRO + mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + + # JDBC + mas_aibroker_db2_jdbc_secret: "aibroker-jdbccfg" + + jdbccfg_username: "jdbccfg_username" + jdbccfg_password: "jdbccfg_password" + jdbccfg_url: "jdbccfg_url" + jdbccfg_sslenabled: "jdbccfg_sslenabled" + jdbccfg_ca: "jdbccfg_ca" + + # MAS Entitlement + #mas_entitlement_username: "cp" + mas_entitlement_username: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_entitlement_key: "mas_entitlement_key" + + # Development Registry Entitlement + artifactory_username: "artifactory_username" + artifactory_token: "artifactory_token" + + # Environment Variable: + mas_app_channel: "mas_app_channel" + + # aibroker vars + mas_catalog_source: "mas_catalog_source" + + # Source container registry + # ----------------------------------------------------------------------------- + # mas_icr_cp: "cp.icr.io/cp" + # mas_icr_cpopen: "icr.io/cpopen" + mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" + mas_icr_cpopen: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/cpopen" + + cluster_domain: cluster_domain + in_saas_env: "in_saas_env" + + mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" + mas_aibroker_s3_region: "mas_aibroker_s3_region" + mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" + environment_type: "environment_type" + +ibm_aibroker_tenant: + mas_instance_id: "MAS_INSTANCE_ID" + aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + ibm_entitlement_key: "" + + # SAAS + aibroker_saas_apikey: "AIBROKER_SAAS_APIKEY" + # in_saas_env: "true" + mas_aibroker_saas: "false" + mas_aibroker_provision_tenant: "mas_aibroker_provision_tenant" + + # Tenant + artifactory_token: "artifactory_token" + mas_aibroker_tenant_name: "user" + tenant_action: "true" + tenantNamespace: 'aibroker-{{ mas_aibroker_tenant_name }}' + + # cluster_domain: "" + mas_icr_cp: "cp.icr.io/cp" + mas_icr_cpopen: "icr.io/cpopen" + + # DRO + # mas_aibroker_dro_token_secret: "dro-token" + mas_aibroker_dro_cacert_secret: "dro-certificates" + + drocfg_ca: "drocfg_ca" + drocfg_registration_key: "drocfg_registration_key" + drocfg_url: "drocfg_url" + + #sls + slscfg_registration_key: "slscfg_registration_key" + slscfg_url: "slscfg_url" + # slscfg_clientId: "slscfg_clientId" + # slscfg_ca: "slscfg_ca" + # slscfg_tls: "slscfg_tls" + # slscfg_key: "slscfg_key" + #RSL ##review + rsl_url: "rsl_url" + rsl_org_id: "rsl_org_id" + mas_aibroker_rsl_secret: "mas_aibroker_rsl_secret" + + + # WatsonX + mas_aibroker_watsonxai_apikey: MAS_AIBROKER_WATSONXAI_APIKEY + mas_aibroker_watsonxai_url: MAS_AIBROKER_WATSONXAI_URL + mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID + + # SLS + #mas_aibroker_sls_registration_key_secret: "sls-registration-key" + mas_aibroker_sls_subscription_id: "001" + + # S3 + mas_aibroker_storage_provider: "aws" + mas_aibroker_storage_ssl: "true" + # following are the variable need to injected via environment variable + mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" + mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" + mas_aibroker_storage_host: "mas_aibroker_storage_host" + mas_aibroker_storage_port: "mas_aibroker_storage_port" + mas_aibroker_storage_region: "mas_aibroker_storage_region" + + # mas_aibroker_storage_pipelines_bucket: "aibrokeruser-training-bucket" + mas_aibroker_s3_endpoint_url: "MAS_AIBROKER_TENANT_S3_ENDPOINT_URL" + mas_aibroker_s3_region: "MAS_AIBROKER_TENANT_S3_REGION" + mas_aibroker_s3_bucket_prefix: "MAS_AIBROKER_TENANT_S3_BUCKET_PREFIX" + + tenant_entitlement_type: "MAS_AIBROKER_TENANT_ENTITLEMENT_TYPE" + tenant_entitlement_start_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_START_DATE" + tenant_entitlement_end_date: "MAS_AIBROKER_TENANT_ENTITLEMENT_END_DATE" From e31491825129f8ee6233c4a0ed49c76125369eda Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:35:54 +0530 Subject: [PATCH 396/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 122 +++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index af597a8b4..30af41cd5 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,4 +1,124 @@ ---- + +# --- +# # IBM AiBroker Instance Application Set +# apiVersion: argoproj.io/v1alpha1 +# kind: ApplicationSet +# metadata: +# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} +# namespace: {{ .Values.argo.namespace }} +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ .Values.instance.id}}' +# annotations: +# argocd.argoproj.io/sync-wave: "070" +# spec: +# goTemplate: true +# generators: +# - merge: +# mergeKeys: +# # Would love to use ".path.path" here to merge the configs together +# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 +# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) +# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up +# - 'merge-key' +# generators: +# # This is the "base" generator, it *must* be first in the list +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" +# - git: +# repoURL: "{{ .Values.generator.repo_url }}" +# revision: "{{ .Values.generator.revision }}" +# files: +# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" +# syncPolicy: +# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" +# template: +# metadata: +# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" +# labels: +# environment: '{{ .Values.account.id }}' +# cluster: '{{ .Values.cluster.id }}' +# instance: '{{ `{{.Values.instance.id}}` }}' +# tenant: '{{ `{{ .Values.tenant.id }}` }}' +# {{- if .Values.custom_labels }} +# {{ .Values.custom_labels | toYaml | indent 8 }} +# {{- end }} +# annotations: +# healthCheckTimeout: "1800" +# argocd.argoproj.io/sync-wave: "099" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} +# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} +# {{- end }} +# spec: +# project: "{{ .Values.argo.projects.rootapps }}" +# source: +# repoURL: "{{ .Values.source.repo_url }}" +# targetRevision: "{{ .Values.source.revision }}" +# path: root-applications/ibm-aibroker-tenant-root +# helm: +# releaseName: instanceappset +# values: "{{ `{{ toYaml . }}` }}" +# parameters: +# - name: "generator.repo_url" +# value: "{{ .Values.generator.repo_url }}" +# - name: "generator.revision" +# value: "{{ .Values.generator.revision }}" +# - name: "source.revision" +# value: "{{ .Values.source.revision }}" +# - name: "source.repo_url" +# value: "{{ .Values.source.repo_url }}" +# - name: argo.namespace +# value: "{{ .Values.argo.namespace }}" +# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} +# - name: "notifications.slack_channel_id" +# value: "{{ .Values.notifications.slack_channel_id }}" +# {{- end }} +# - name: argo.projects.rootapps +# value: "{{ .Values.argo.projects.rootapps }}" +# - name: argo.projects.apps +# value: "{{ .Values.argo.projects.apps }}" +# - name: avp.name +# value: "{{ .Values.avp.name }}" +# - name: avp.secret +# value: "{{ .Values.avp.secret }}" +# - name: avp.values_varname +# value: "{{ .Values.avp.values_varname }}" +# - name: auto_delete +# value: "{{ .Values.auto_delete }}" +# - name: devops.mongo_uri +# value: "{{ .Values.devops.mongo_uri }}" +# - name: devops.build_number +# value: "{{ .Values.devops.build_number }}" +# destination: +# server: 'https://kubernetes.default.svc' +# namespace: {{ .Values.argo.namespace }} +# syncPolicy: +# automated: +# {{- if .Values.auto_delete }} +# prune: true +# {{- end }} +# selfHeal: true +# syncOptions: +# - CreateNamespace=false +# - RespectIgnoreDifferences=true +# retry: +# limit: -1 +# ignoreDifferences: +# - group: '*' +# kind: ServiceAccount +# jsonPointers: +# - /imagePullSecrets +# - group: 'marketplace.redhat.com/v1alpha1' +# kind: MarketplaceConfig +# jsonPointers: +# - /spec +# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger +# revisionHistoryLimit: 1--- # IBM AiBroker Tenant Application Set apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet From 798d85c729f5e4cfb4e7b5f965a5af1e1754d5d3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:37:27 +0530 Subject: [PATCH 397/491] Update 070-aibroker-tenant-appset.yaml --- .../templates/070-aibroker-tenant-appset.yaml | 232 ++++++------------ 1 file changed, 75 insertions(+), 157 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 30af41cd5..255b15be8 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -1,125 +1,6 @@ -# --- -# # IBM AiBroker Instance Application Set -# apiVersion: argoproj.io/v1alpha1 -# kind: ApplicationSet -# metadata: -# name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} -# namespace: {{ .Values.argo.namespace }} -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ .Values.instance.id}}' -# annotations: -# argocd.argoproj.io/sync-wave: "070" -# spec: -# goTemplate: true -# generators: -# - merge: -# mergeKeys: -# # Would love to use ".path.path" here to merge the configs together -# # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 -# # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) -# # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up -# - 'merge-key' -# generators: -# # This is the "base" generator, it *must* be first in the list -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" -# - git: -# repoURL: "{{ .Values.generator.repo_url }}" -# revision: "{{ .Values.generator.revision }}" -# files: -# - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" -# syncPolicy: -# applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" -# template: -# metadata: -# name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" -# labels: -# environment: '{{ .Values.account.id }}' -# cluster: '{{ .Values.cluster.id }}' -# instance: '{{ `{{.Values.instance.id}}` }}' -# tenant: '{{ `{{ .Values.tenant.id }}` }}' -# {{- if .Values.custom_labels }} -# {{ .Values.custom_labels | toYaml | indent 8 }} -# {{- end }} -# annotations: -# healthCheckTimeout: "1800" -# argocd.argoproj.io/sync-wave: "099" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} -# notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} -# {{- end }} -# spec: -# project: "{{ .Values.argo.projects.rootapps }}" -# source: -# repoURL: "{{ .Values.source.repo_url }}" -# targetRevision: "{{ .Values.source.revision }}" -# path: root-applications/ibm-aibroker-tenant-root -# helm: -# releaseName: instanceappset -# values: "{{ `{{ toYaml . }}` }}" -# parameters: -# - name: "generator.repo_url" -# value: "{{ .Values.generator.repo_url }}" -# - name: "generator.revision" -# value: "{{ .Values.generator.revision }}" -# - name: "source.revision" -# value: "{{ .Values.source.revision }}" -# - name: "source.repo_url" -# value: "{{ .Values.source.repo_url }}" -# - name: argo.namespace -# value: "{{ .Values.argo.namespace }}" -# {{- if and .Values.notifications .Values.notifications.slack_channel_id }} -# - name: "notifications.slack_channel_id" -# value: "{{ .Values.notifications.slack_channel_id }}" -# {{- end }} -# - name: argo.projects.rootapps -# value: "{{ .Values.argo.projects.rootapps }}" -# - name: argo.projects.apps -# value: "{{ .Values.argo.projects.apps }}" -# - name: avp.name -# value: "{{ .Values.avp.name }}" -# - name: avp.secret -# value: "{{ .Values.avp.secret }}" -# - name: avp.values_varname -# value: "{{ .Values.avp.values_varname }}" -# - name: auto_delete -# value: "{{ .Values.auto_delete }}" -# - name: devops.mongo_uri -# value: "{{ .Values.devops.mongo_uri }}" -# - name: devops.build_number -# value: "{{ .Values.devops.build_number }}" -# destination: -# server: 'https://kubernetes.default.svc' -# namespace: {{ .Values.argo.namespace }} -# syncPolicy: -# automated: -# {{- if .Values.auto_delete }} -# prune: true -# {{- end }} -# selfHeal: true -# syncOptions: -# - CreateNamespace=false -# - RespectIgnoreDifferences=true -# retry: -# limit: -1 -# ignoreDifferences: -# - group: '*' -# kind: ServiceAccount -# jsonPointers: -# - /imagePullSecrets -# - group: 'marketplace.redhat.com/v1alpha1' -# kind: MarketplaceConfig -# jsonPointers: -# - /spec -# # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger -# revisionHistoryLimit: 1--- -# IBM AiBroker Tenant Application Set +--- +# IBM AiBroker Instance Application Set apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: @@ -128,63 +9,99 @@ metadata: labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - tenant: '{{ .Values.tenant.id }}' + instance: '{{ .Values.instance.id}}' annotations: argocd.argoproj.io/sync-wave: "070" spec: goTemplate: true generators: - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/aibroker-tenant01/ibm-aibroker-tenant.yaml" + - merge: + mergeKeys: + # Would love to use ".path.path" here to merge the configs together + # but this is not possible currently with goTemplate: true - see https://github.com/argoproj/argo-cd/issues/12836 + # (and we really want goTemplate: true so we can dump the entire config file into HELM_VALUES using toPrettyJson) + # instead, we are forced to explicitly provide a merge key in all of our config files to make them line up + - 'merge-key' + generators: + # This is the "base" generator, it *must* be first in the list + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant.yaml" + syncPolicy: + applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{cluster_id }}.{{instance_id }}.{{tenant_id }}" + name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" labels: - cluster: '{{cluster_id }}' - instance: '{{instance_id }}' - tenant: '{{tenant_id }}' + environment: '{{ .Values.account.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ `{{.Values.instance.id}}` }}' + tenant: '{{ `{{ .Values.tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "070" -{{- if and .Values.notifications .Values.notifications.slack_channel_id }} + argocd.argoproj.io/sync-wave: "099" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} -{{- end }} + {{- end }} spec: project: "{{ .Values.argo.projects.rootapps }}" source: - repoURL: "{{ .Values.source.repo_url }}" - targetRevision: "{{ .Values.source.revision }}" - path: instance-applications/115-ibm-aibroker-tenant - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - tenant_id: "{{tenant_id }}" - mas_instance_id: "{{mas_instance_id }}" - aibroker_namespace: "{{aibroker_namespace }}" - - name: ARGOCD_APP_NAME - value: aibrokertenantapp -{{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} -{{- end }} + repoURL: "{{ .Values.source.repo_url }}" + targetRevision: "{{ .Values.source.revision }}" + path: root-applications/ibm-aibroker-tenant-root + helm: + releaseName: instanceappset + values: "{{ `{{ toYaml . }}` }}" + parameters: + - name: "generator.repo_url" + value: "{{ .Values.generator.repo_url }}" + - name: "generator.revision" + value: "{{ .Values.generator.revision }}" + - name: "source.revision" + value: "{{ .Values.source.revision }}" + - name: "source.repo_url" + value: "{{ .Values.source.repo_url }}" + - name: argo.namespace + value: "{{ .Values.argo.namespace }}" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + - name: "notifications.slack_channel_id" + value: "{{ .Values.notifications.slack_channel_id }}" + {{- end }} + - name: argo.projects.rootapps + value: "{{ .Values.argo.projects.rootapps }}" + - name: argo.projects.apps + value: "{{ .Values.argo.projects.apps }}" + - name: avp.name + value: "{{ .Values.avp.name }}" + - name: avp.secret + value: "{{ .Values.avp.secret }}" + - name: avp.values_varname + value: "{{ .Values.avp.values_varname }}" + - name: auto_delete + value: "{{ .Values.auto_delete }}" + - name: devops.mongo_uri + value: "{{ .Values.devops.mongo_uri }}" + - name: devops.build_number + value: "{{ .Values.devops.build_number }}" destination: - server: https://kubernetes.default.svc - namespace: {{ .aibroker_namespace }} + server: 'https://kubernetes.default.svc' + namespace: {{ .Values.argo.namespace }} syncPolicy: automated: -{{- if .Values.auto_delete }} + {{- if .Values.auto_delete }} prune: true -{{- end }} + {{- end }} selfHeal: true syncOptions: - CreateNamespace=false @@ -200,4 +117,5 @@ spec: kind: MarketplaceConfig jsonPointers: - /spec - revisionHistoryLimit: 1 + # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger + revisionHistoryLimit: 1--- \ No newline at end of file From 650c2e97599cc2122bd4fd87899b25d5841a4bf8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 15:56:50 +0530 Subject: [PATCH 398/491] new update --- .../templates/070-aibroker-tenant-appset.yaml | 14 +++++++------- .../templates/100-ibm-aibroker-tenant-app.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml index 255b15be8..ec137b7c9 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/070-aibroker-tenant-appset.yaml @@ -4,7 +4,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: aibroker-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + name: ai-tenant-appset.{{ .Values.cluster.id }}.{{ .Values.instance.id }} namespace: {{ .Values.argo.namespace }} labels: environment: '{{ .Values.account.id }}' @@ -28,7 +28,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/{{ .Values.instance.id }}/*/ibm-aibroker-tenant-base.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" @@ -38,18 +38,18 @@ spec: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: metadata: - name: "aibroker-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ .Values.tenant.id }}" + name: "ai-tenant.{{ .Values.cluster.id }}.{{ .Values.instance.id }}.{{ `{{.tenant.id}}` }}" labels: environment: '{{ .Values.account.id }}' cluster: '{{ .Values.cluster.id }}' - instance: '{{ `{{.Values.instance.id}}` }}' - tenant: '{{ `{{ .Values.tenant.id }}` }}' + instance: '{{ .Values.instance.id }}' + tenant: '{{ `{{ .tenant.id }}` }}' {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} annotations: healthCheckTimeout: "1800" - argocd.argoproj.io/sync-wave: "099" + argocd.argoproj.io/sync-wave: "070" {{- if and .Values.notifications .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} @@ -118,4 +118,4 @@ spec: jsonPointers: - /spec # revisionHistoryLimit set to 1 due to size limit of what can be stored in etcd for anything larger - revisionHistoryLimit: 1--- \ No newline at end of file + revisionHistoryLimit: 1 \ No newline at end of file diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index 2ae0d3aa4..b197e69aa 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -129,4 +129,4 @@ spec: {{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} -{{- end }} +{{- end }} \ No newline at end of file From ce2ecb1daa28d7e85010421a4d03794781b7d0f5 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 16:04:59 +0530 Subject: [PATCH 399/491] Update 100-ibm-aibroker-tenant-app.yaml --- .../templates/100-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index b197e69aa..c3ce6f0ee 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -35,7 +35,7 @@ spec: env: - name: {{ .Values.avp.values_varname }} value: | - tenant_id: "aibroker-tenant01" + tenant_id: "{{ .Values.ibm_aibroker_tenant.tenant_id }}" mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From f6a5fd378834322d6e1601505264d3970462ae6f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 16:30:02 +0530 Subject: [PATCH 400/491] Update 14-aibroker-rsl-secret.yaml --- .../templates/14-aibroker-rsl-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml index 3dfce5dd0..72eeffc71 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml @@ -15,7 +15,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "318" + argocd.argoproj.io/sync-wave: "317" stringData: rsl_org_id: "{{ .Values.rsl_org_id }}" rsl_url: "{{ .Values.rsl_url }}" From 98a009009e660cd83eaea842b9df9cfaf88b22aa Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 20:16:07 +0530 Subject: [PATCH 401/491] Update 14-aibroker-rsl-secret.yaml --- .../templates/14-aibroker-rsl-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml index 72eeffc71..8cd402c74 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml @@ -14,8 +14,8 @@ metadata: {{ $key | quote }}: {{ $value | quote }} {{- end }} {{- end }} -annotations: - argocd.argoproj.io/sync-wave: "317" + annotations: + argocd.argoproj.io/sync-wave: "317" stringData: rsl_org_id: "{{ .Values.rsl_org_id }}" rsl_url: "{{ .Values.rsl_url }}" From 67150cab28b6527e3504a3b76f41828435e9788d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 20:39:36 +0530 Subject: [PATCH 402/491] Update 13-aibroker-s3-secret.yaml --- .../templates/13-aibroker-s3-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml index 939f13cba..8eacac1b6 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.mas_aibroker_provision_tenant }}----s3-secret" + name: "{{ .Values.tenantNamespace }}----s3-secret" namespace: "{{ .Values.aibroker_namespace }}" {{- if .Values.custom_labels }} labels: From ca38fc71595c3b88f0fb1cb5816ddf25c886e3b7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 20 Jun 2025 20:52:18 +0530 Subject: [PATCH 403/491] Delete 01-aibroker-saas-apikey-secret.yaml --- .../templates/01-aibroker-saas-apikey-secret.yaml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml deleted file mode 100644 index 890bc7cac..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-saas-apikey-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.mas_aibroker_provision_tenant }}----apikey-secret" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "300" -type: Opaque -data: - AIBROKER_APIKEY: {{ randAlphaNum 32 | b64enc | quote }} \ No newline at end of file From 1b641666e565e7297b318b9084f25068ad442ac4 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Fri, 20 Jun 2025 21:24:17 +0530 Subject: [PATCH 404/491] Delete 03-aibroker-configmap.yaml removed as this is not used for mas_app_channel == "9.1.x" --- .../templates/03-aibroker-configmap.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml deleted file mode 100644 index fe1f558b7..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: connector-config - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "304" -data: {} \ No newline at end of file From 1a821638a49246a6017d857539e95de1ec252ff7 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sat, 21 Jun 2025 12:05:23 +0530 Subject: [PATCH 405/491] Update 09-aibroker-app.yaml encoding drocfg_ca --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 1463b509c..b9084e1d6 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" + ca: "{{ .Values.drocfg_ca | b64enc}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From 9c5c13de04ee698dce87cc30ccf9115830f0f2da Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sat, 21 Jun 2025 12:16:49 +0530 Subject: [PATCH 406/491] Revert "Update 09-aibroker-app.yaml" This reverts commit 1a821638a49246a6017d857539e95de1ec252ff7. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index b9084e1d6..1463b509c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca | b64enc}}" + ca: "{{ .Values.drocfg_ca}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From cd288df60d207de84b419c576d9fba9c44af7036 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Sat, 21 Jun 2025 12:44:29 +0530 Subject: [PATCH 407/491] Update 17-aibroker-workspace.yaml --- .../templates/17-aibroker-workspace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml index 00dbe90e2..9f9714e80 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml @@ -33,7 +33,7 @@ spec: rsl: url: "{{ .Values.rsl_url }}" orgId: "{{ .Values.rsl_org_id }}" - secretName: "{{ .Values.mas_aibroker_rsl_secret }}" + secretName: "{{ .Values.tenantNamespace }}----rsl-secret" watsonxai: url: "{{ .Values.mas_aibroker_watsonxai_url }}" secretName: "{{ .Values.tenantNamespace }}----wx-secret" From 967431ccb9390bcfa3994f4dc47d136b44e45a85 Mon Sep 17 00:00:00 2001 From: Hardik-Prajapati Date: Mon, 23 Jun 2025 11:30:07 +0530 Subject: [PATCH 408/491] Update 15-aibroker-wx.yaml update wx secret --- .../templates/15-aibroker-wx.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml index 797337837..a2a1a207b 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml @@ -14,9 +14,9 @@ metadata: argocd.argoproj.io/sync-wave: "317" type: Opaque stringData: - WATSONXAI_APIKEY: "{{ .Values.mas_aibroker_watsonxai_apikey }}" - WATSONXAI_URL: "{{ .Values.mas_aibroker_watsonxai_url }}" - WATSONXAI_PROJECT_ID: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" + wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" # Copy secrets to tenant namespace @@ -36,6 +36,6 @@ metadata: argocd.argoproj.io/sync-wave: "318" type: Opaque stringData: - WATSONXAI_APIKEY: "{{ .Values.mas_aibroker_watsonxai_apikey }}" - WATSONXAI_URL: "{{ .Values.mas_aibroker_watsonxai_url }}" - WATSONXAI_PROJECT_ID: "{{ .Values.mas_aibroker_watsonxai_project_id }}" + wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" + wx_url: "{{ .Values.mas_aibroker_watsonxai_url }}" + wx_project_id: "{{ .Values.mas_aibroker_watsonxai_project_id }}" From c91962700a4ffc8b408569948590980e9f406fdd Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 23 Jun 2025 14:04:15 +0530 Subject: [PATCH 409/491] AIbroker and Aibroker-tenant changes update --- ...ml => 03-aibroker-sls-tenant-details.yaml} | 2 +- .../03-aibroker-watsonx-apikey-secret.yaml | 11 -- .../templates/06-aibroker-dro.yaml | 15 ++- ...ecret.yaml => 01-aibroker-sls-secret.yaml} | 2 +- .../templates/02-aibroker-copy-secret.yaml | 45 ------- ...ecret.yaml => 02-aibroker-rsl-secret.yaml} | 2 +- ...ecret.yaml => 03-aibroker-dro-secret.yaml} | 2 +- ...secret.yaml => 04-aibroker-s3-secret.yaml} | 2 +- .../04-aibroker-service-account.yaml | 10 -- .../05-aibroker-kserve-huggingfaceserver.yaml | 35 ----- ...5-aibroker-wx.yaml => 05-aibroker-wx.yaml} | 4 +- .../06-aibroker-kserve-lgbserver.yaml | 35 ----- ...kspace.yaml => 06-aibroker-workspace.yaml} | 2 +- ...ml => 07-aibroker-ingress-allow-isvc.yaml} | 2 +- .../07-aibroker-kserve-sklearnserver.yaml | 34 ----- .../08-aibroker-kserve-xgbserver.yaml | 35 ----- .../templates/09-aibroker-rbac.yaml | 121 ------------------ .../templates/12-aibroker-apikey.yaml | 11 -- 18 files changed, 17 insertions(+), 353 deletions(-) rename instance-applications/113-ibm-aibroker/templates/{04-aibroker-sls-tenant-details.yaml => 03-aibroker-sls-tenant-details.yaml} (86%) delete mode 100644 instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml rename instance-applications/115-ibm-aibroker-tenant/templates/{10-aibroker-sls-secret.yaml => 01-aibroker-sls-secret.yaml} (94%) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml rename instance-applications/115-ibm-aibroker-tenant/templates/{14-aibroker-rsl-secret.yaml => 02-aibroker-rsl-secret.yaml} (92%) rename instance-applications/115-ibm-aibroker-tenant/templates/{11-aibroker-dro-secret.yaml => 03-aibroker-dro-secret.yaml} (92%) rename instance-applications/115-ibm-aibroker-tenant/templates/{13-aibroker-s3-secret.yaml => 04-aibroker-s3-secret.yaml} (95%) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml rename instance-applications/115-ibm-aibroker-tenant/templates/{15-aibroker-wx.yaml => 05-aibroker-wx.yaml} (93%) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml rename instance-applications/115-ibm-aibroker-tenant/templates/{17-aibroker-workspace.yaml => 06-aibroker-workspace.yaml} (98%) rename instance-applications/115-ibm-aibroker-tenant/templates/{16-aibroker-ingress-allow-isvc.yaml => 07-aibroker-ingress-allow-isvc.yaml} (86%) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml similarity index 86% rename from instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml rename to instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml index 2b677196f..2db37a571 100644 --- a/instance-applications/113-ibm-aibroker/templates/04-aibroker-sls-tenant-details.yaml +++ b/instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "143" + argocd.argoproj.io/sync-wave: "142" stringData: SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" type: Opaque \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml deleted file mode 100644 index 23c6b68ec..000000000 --- a/instance-applications/113-ibm-aibroker/templates/03-aibroker-watsonx-apikey-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.mas_aibroker_watsonx_secret }}" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "142" -type: Opaque -stringData: - api_key: "{{ .Values.mas_aibroker_storage_accesskey }}" \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 85cb53750..87b1f52e8 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -2,22 +2,23 @@ kind: Secret apiVersion: v1 metadata: - name: "{{ .Values.mas_aibroker_dro_cacert_secret }}" + name: "{{ .Values.mas_aibroker_dro_token_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "144" + argocd.argoproj.io/sync-wave: "143" stringData: - ca.crt: "{{ .Values.drocfg_ca }}" + DRO_TOKEN: "{{ .Values.drocfg_registration_key }}" type: Opaque --- kind: Secret apiVersion: v1 metadata: - name: "{{ .Values.mas_aibroker_dro_token_secret }}" + name: "{{ .Values.mas_aibroker_dro_cacert_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "145" + argocd.argoproj.io/sync-wave: "144" stringData: - DRO_TOKEN: "{{ .Values.drocfg_registration_key }}" -type: Opaque \ No newline at end of file + ca.crt: "{{ .Values.drocfg_ca }}" +type: Opaque + diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml similarity index 94% rename from instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-sls-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml index 013a59db0..a249aebe5 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/10-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.tenantNamespace }}----sls-secret" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "313" + argocd.argoproj.io/sync-wave: "301" labels: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml deleted file mode 100644 index 8c0fec8da..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-copy-secret.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# need to copy both the secret and create them here. ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: km-s3-secret - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "302" - {{- if eq .Values.mas_aibroker_storage_provider "aws" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" - {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - {{- end }} - {{- if eq .Values.mas_aibroker_storage_ssl "false" }} - serving.kserve.io/s3-usehttps: "0" - {{- else }} - serving.kserve.io/s3-usehttps: "1" - {{- end }} - {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} - serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" - {{- end }} -stringData: - AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" - AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" - S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" - S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" - S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" - S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" - ---- - -kind: Secret -apiVersion: v1 -metadata: - name: ibm-entitlement - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "303" -type: kubernetes.io/dockerconfigjson -stringData: - .dockerconfigjson: "{{ .Values.artifactory_token}}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml similarity index 92% rename from instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml index 8cd402c74..d25a5c637 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/14-aibroker-rsl-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml @@ -15,7 +15,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "317" + argocd.argoproj.io/sync-wave: "302" stringData: rsl_org_id: "{{ .Values.rsl_org_id }}" rsl_url: "{{ .Values.rsl_url }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-dro-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml similarity index 92% rename from instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-dro-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml index 2d97789d1..09f1504f8 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/11-aibroker-dro-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "314" + argocd.argoproj.io/sync-wave: "303" type: Opaque stringData: DRO_TOKEN: "{{ .Values.drocfg_registration_key }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml similarity index 95% rename from instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml index 8eacac1b6..210634907 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/13-aibroker-s3-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "316" + argocd.argoproj.io/sync-wave: "304" type: Opaque stringData: ACCESS-KEY: "{{ .Values.mas_aibroker_storage_accesskey }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml deleted file mode 100644 index b02b4a312..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-service-account.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: km-s3-sa - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "305" -secrets: - - name: km-s3-secret \ No newline at end of file diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml deleted file mode 100644 index 8839587ce..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-kserve-huggingfaceserver.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -apiVersion: serving.kserve.io/v1alpha1 -kind: ServingRuntime -metadata: - name: kserve-huggingfaceserver - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "306" -spec: - annotations: - prometheus.kserve.io/port: "8080" - prometheus.kserve.io/path: "/metrics" - supportedModelFormats: - - name: huggingface - version: "1" - autoSelect: true - priority: 1 - protocolVersions: - - v2 - - v1 - containers: - - name: kserve-container - image: kserve/huggingfaceserver:latest - args: - - '--model_name={{".Name"}}' - env: - - name: HUGGINGFACE_HUB_CACHE - value: /tmp/huggingface/hub - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "1" - memory: 2Gi diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-wx.yaml similarity index 93% rename from instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-wx.yaml index a2a1a207b..28b74c246 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/15-aibroker-wx.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/05-aibroker-wx.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "317" + argocd.argoproj.io/sync-wave: "305" type: Opaque stringData: wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" @@ -33,7 +33,7 @@ metadata: {{- end }} {{- end }} annotations: - argocd.argoproj.io/sync-wave: "318" + argocd.argoproj.io/sync-wave: "306" type: Opaque stringData: wx_apikey: "{{ .Values.mas_aibroker_watsonxai_apikey }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml deleted file mode 100644 index a66399a71..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-kserve-lgbserver.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -apiVersion: serving.kserve.io/v1alpha1 -kind: ServingRuntime -metadata: - name: kserve-lgbserver - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "307" -spec: - annotations: - prometheus.kserve.io/port: "8080" - prometheus.kserve.io/path: "/metrics" - supportedModelFormats: - - name: lightgbm - version: "3" - autoSelect: true - priority: 1 - protocolVersions: - - v1 - - v2 - containers: - - name: kserve-container - image: kserve/lgbserver:latest - args: - - '--model_name={{".Name"}}' - - --model_dir=/mnt/models - - --http_port=8080 - - --nthread=1 - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "1" - memory: 2Gi diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml similarity index 98% rename from instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml index 9f9714e80..7ad592692 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/17-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml @@ -5,7 +5,7 @@ metadata: name: "{{ .Values.tenantNamespace }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "320" + argocd.argoproj.io/sync-wave: "307" labels: mas.ibm.com/applicationId: "aibroker" mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml similarity index 86% rename from instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml rename to instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml index 16e078dfa..e4c8882c2 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/16-aibroker-ingress-allow-isvc.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml @@ -5,7 +5,7 @@ metadata: name: allow-to-isvc namespace: "{{ .Values.tenantNamespace }}" annotations: - argocd.argoproj.io/sync-wave: "321" + argocd.argoproj.io/sync-wave: "308" spec: podSelector: matchLabels: diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml deleted file mode 100644 index b99b21f1b..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-kserve-sklearnserver.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -apiVersion: serving.kserve.io/v1alpha1 -kind: ServingRuntime -metadata: - name: kserve-sklearnserver - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "308" -spec: - annotations: - prometheus.kserve.io/port: "8080" - prometheus.kserve.io/path: "/metrics" - supportedModelFormats: - - name: sklearn - version: "1" - autoSelect: true - priority: 1 - protocolVersions: - - v1 - - v2 - containers: - - name: kserve-container - image: kserve/sklearnserver:latest - args: - - '--model_name={{".Name"}}' - - --model_dir=/mnt/models - - --http_port=8080 - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "1" - memory: 2Gi diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml deleted file mode 100644 index 94a4113e3..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-kserve-xgbserver.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -apiVersion: serving.kserve.io/v1alpha1 -kind: ServingRuntime -metadata: - name: kserve-xgbserver - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "309" -spec: - annotations: - prometheus.kserve.io/port: "8080" - prometheus.kserve.io/path: "/metrics" - supportedModelFormats: - - name: xgboost - version: "1" - autoSelect: true - priority: 1 - protocolVersions: - - v1 - - v2 - containers: - - name: kserve-container - image: kserve/xgbserver:latest - args: - - '--model_name={{".Name"}}' - - --model_dir=/mnt/models - - --http_port=8080 - - --nthread=1 - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "1" - memory: 2Gi diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml deleted file mode 100644 index a469795a8..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/09-aibroker-rbac.yaml +++ /dev/null @@ -1,121 +0,0 @@ ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-controller-role - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "310" -rules: - - verbs: - - list - apiGroups: - - '' - resources: - - pods - - configmaps - - secrets - - verbs: - - delete - apiGroups: - - '' - resources: - - pods - - verbs: - - list - apiGroups: - - metrics.k8s.io - resources: - - nodes - - pods - - verbs: - - list - apiGroups: - - apps - resources: - - deployments - - verbs: - - list - - create - - delete - apiGroups: - - batch - resources: - - jobs - - cronjobs - - verbs: - - create - - list - - delete - - get - - patch - apiGroups: - - serving.kserve.io - resources: - - inferenceservices - - verbs: - - create - - delete - apiGroups: - - '' - resources: - - persistentvolumeclaims - - ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-controller-binding - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "311" -subjects: - - kind: ServiceAccount - name: km-controller - namespace: "{{ .Values.aibroker_namespace }}" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: km-controller-role ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-role - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "312" -rules: - - verbs: - - list - - watch - apiGroups: - - '' - resources: - - events - - pods - - verbs: - - list - - watch - apiGroups: - - batch - resources: - - cronjobs - - jobs ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: km-watcher-binding - namespace: "{{ .Values.tenantNamespace }}" - annotations: - argocd.argoproj.io/sync-wave: "313" -subjects: - - kind: ServiceAccount - name: km-watcher - namespace: "{{ .Values.aibroker_namespace }}" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: km-watcher-role diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml deleted file mode 100644 index 452136938..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/12-aibroker-apikey.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: "{{ .Values.tenantNamespace }}----apikey-secret" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "315" -type: Opaque -data: - AIBROKER_APIKEY: {{ randAlphaNum 32 | b64enc | quote }} \ No newline at end of file From b19d42c2f1ca9637f6c833df1f62646d402e6565 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 23 Jun 2025 18:15:20 +0530 Subject: [PATCH 410/491] update ca ansible to gitops --- .../113-ibm-aibroker/templates/06-aibroker-dro.yaml | 10 +++++++++- .../113-ibm-aibroker/templates/07-aibroker-jdbc.yaml | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 87b1f52e8..824e08464 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -19,6 +19,14 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "144" stringData: - ca.crt: "{{ .Values.drocfg_ca }}" + ca.crt: >- + {{ .Values.drocfg_ca + | replace "BEGIN CERTIFICATE" "BEGIN_CERTIFICATE" + | replace "END CERTIFICATE" "END_CERTIFICATE" + | regexReplaceAll "\\s+" "\n" + | replace "BEGIN_CERTIFICATE" "BEGIN CERTIFICATE" + | replace "END_CERTIFICATE" "END CERTIFICATE" + }} + type: Opaque diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index 5a1a41a73..5f5177a4c 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -11,5 +11,12 @@ stringData: password: "{{ .Values.jdbccfg_password }}" url: "{{ .Values.jdbccfg_url }}" sslenabled: "{{ .Values.jdbccfg_sslenabled }}" - certificate: "{{ .Values.jdbccfg_ca }}" + certificate: >- + {{ .Values.jdbccfg_ca + | replace "BEGIN CERTIFICATE" "BEGIN_CERTIFICATE" + | replace "END CERTIFICATE" "END_CERTIFICATE" + | regexReplaceAll "\\s+" "\n" + | replace "BEGIN_CERTIFICATE" "BEGIN CERTIFICATE" + | replace "END_CERTIFICATE" "END CERTIFICATE" + }} type: Opaque \ No newline at end of file From 6160b725534a9a5721563cbcb85bfad5c6d218cc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Mon, 23 Jun 2025 18:26:17 +0530 Subject: [PATCH 411/491] Revert "update ca ansible to gitops" This reverts commit b19d42c2f1ca9637f6c833df1f62646d402e6565. --- .../113-ibm-aibroker/templates/06-aibroker-dro.yaml | 10 +--------- .../113-ibm-aibroker/templates/07-aibroker-jdbc.yaml | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 824e08464..87b1f52e8 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -19,14 +19,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "144" stringData: - ca.crt: >- - {{ .Values.drocfg_ca - | replace "BEGIN CERTIFICATE" "BEGIN_CERTIFICATE" - | replace "END CERTIFICATE" "END_CERTIFICATE" - | regexReplaceAll "\\s+" "\n" - | replace "BEGIN_CERTIFICATE" "BEGIN CERTIFICATE" - | replace "END_CERTIFICATE" "END CERTIFICATE" - }} - + ca.crt: "{{ .Values.drocfg_ca }}" type: Opaque diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index 5f5177a4c..5a1a41a73 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -11,12 +11,5 @@ stringData: password: "{{ .Values.jdbccfg_password }}" url: "{{ .Values.jdbccfg_url }}" sslenabled: "{{ .Values.jdbccfg_sslenabled }}" - certificate: >- - {{ .Values.jdbccfg_ca - | replace "BEGIN CERTIFICATE" "BEGIN_CERTIFICATE" - | replace "END CERTIFICATE" "END_CERTIFICATE" - | regexReplaceAll "\\s+" "\n" - | replace "BEGIN_CERTIFICATE" "BEGIN CERTIFICATE" - | replace "END_CERTIFICATE" "END CERTIFICATE" - }} + certificate: "{{ .Values.jdbccfg_ca }}" type: Opaque \ No newline at end of file From f8bbd7aff87b3b660b3262fb0e1820e66176d07e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 24 Jun 2025 14:39:10 +0530 Subject: [PATCH 412/491] Update 100-ibm-aibroker-tenant-app.yaml --- .../templates/100-ibm-aibroker-tenant-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index c3ce6f0ee..8aca33095 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -68,7 +68,7 @@ spec: slscfg_registration_key: "{{ .Values.ibm_aibroker_tenant.slscfg_registration_key }}" slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" - # slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" From 4b392782d91d691032098e73424163f41edb8b7e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 24 Jun 2025 15:12:45 +0530 Subject: [PATCH 413/491] update slacfg_ca to slscfg_ca_tenant --- .../templates/06-aibroker-workspace.yaml | 2 +- .../templates/100-ibm-aibroker-tenant-app.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml index 7ad592692..dfbce62f6 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml @@ -28,7 +28,7 @@ spec: sls: url: "{{ .Values.slscfg_url }}" secretName: "{{ .Values.tenantNamespace }}----sls-secret" - ca: "{{ .Values.slscfg_ca }}" + ca: "{{ .Values.slscfg_ca_tenant }}" # rsl added new in ansible ##review what is value of gitops-envs rsl: url: "{{ .Values.rsl_url }}" diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index 8aca33095..09ece7924 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -69,6 +69,7 @@ spec: slscfg_url: "{{ .Values.ibm_aibroker_tenant.slscfg_url }}" # slscfg_clientId: "{{ .Values.ibm_aibroker_tenant.slscfg_clientId }}" slscfg_ca: "{{ .Values.ibm_aibroker_tenant.slscfg_ca }}" + slscfg_ca_tenant: "{{ .Values.ibm_aibroker_tenant.slscfg_ca_tenant }}" # slscfg_tls: "{{ .Values.ibm_aibroker_tenant.slscfg_tls }}" # slscfg_key: "{{ .Values.ibm_aibroker_tenant.slscfg_key }}" From 98273fd1ab1ad6eded41ad18c30f0d1216d55634 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 24 Jun 2025 15:49:45 +0530 Subject: [PATCH 414/491] Update 07-kmodel-controller.yaml --- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 2bd159db9..177433204 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -18,7 +18,7 @@ data: PIPELINE_STEP_IMAGE_PREFIX: '' PIPELINE_DEFAULT_STEP_TAG: "{{ .Values.mas_aibroker_pipeline_steps_tag }}" CONNECTOR_DEFAULT_TAG: "{{ .Values.mas_aibroker_connector_tag }}" - DEFAULT_TENANTS: "{{ .Values.tenantNamespace }}" + DEFAULT_TENANTS: "{{ .Values.mas_aibroker_provision_tenant }}" PLATFORM: openshift PVC_STORAGE_CLASS_NAME: "{{ .Values.primary_storage_class }}" LOG_FORMAT: "json" From 5f6b9f634e57d2f91f962e9366b8a47b49518ddc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 25 Jun 2025 13:10:43 +0530 Subject: [PATCH 415/491] Update 00-aibroker-tenent-namespace.yaml --- .../00-aibroker-tenent-namespace.yaml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index fb4217836..c64dd9d4e 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -3,6 +3,51 @@ apiVersion: v1 kind: Namespace metadata: name: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "289" + +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: km-s3-secret + namespace: "{{ .Values.tenantNamespace }}" + annotations: + argocd.argoproj.io/sync-wave: "299" + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + {{- end }} + {{- if eq .Values.mas_aibroker_storage_ssl "false" }} + serving.kserve.io/s3-usehttps: "0" + {{- else }} + serving.kserve.io/s3-usehttps: "1" + {{- end }} + {{- if and (eq .Values.mas_aibroker_storage_provider "minio") (not .Values.mas_aibroker_storage_region | empty) }} + serving.kserve.io/s3-region: "{{ .Values.mas_aibroker_storage_region }}" + {{- end }} +stringData: + AWS_ACCESS_KEY_ID: "{{ .Values.mas_aibroker_storage_accesskey}}" + AWS_SECRET_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" + S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" + S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + +--- + +kind: Secret +apiVersion: v1 +metadata: + name: ibm-entitlement + namespace: "{{ .Values.tenantNamespace }}" annotations: argocd.argoproj.io/sync-wave: "300" +type: kubernetes.io/dockerconfigjson +stringData: + .dockerconfigjson: "{{ .Values.artifactory_token}}" From 7ba5df9e587c5dca37d305661840089178cd95ac Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 25 Jun 2025 14:49:12 +0530 Subject: [PATCH 416/491] Update 050-ibm-kmodels-app.yaml --- .../templates/050-ibm-kmodels-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml index a3be66164..6b3e1bbd8 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/050-ibm-kmodels-app.yaml @@ -48,7 +48,7 @@ spec: pullSecretName: "{{ .Values.ibm_kmodel.pullSecretName }}" docker_server: "{{ .Values.ibm_kmodel.docker_server }}" tenantNamespace: "{{ .Values.ibm_kmodel.tenantNamespace }}" - # mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" + mas_aibroker_provision_tenant: "{{ .Values.ibm_kmodel.mas_aibroker_provision_tenant }}" primary_storage_class: "{{ .Values.ibm_kmodel.primary_storage_class }}" mas_aibroker_storage_templates_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_templates_bucket }}" mas_aibroker_storage_tenants_bucket: "{{ .Values.ibm_kmodel.mas_aibroker_storage_tenants_bucket }}" From db0fc2482455b331295861185132e43337e7c859 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 25 Jun 2025 18:51:31 +0530 Subject: [PATCH 417/491] Update values.yaml --- instance-applications/115-ibm-aibroker-tenant/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/values.yaml b/instance-applications/115-ibm-aibroker-tenant/values.yaml index cfdc7e5c0..0f67d4b87 100644 --- a/instance-applications/115-ibm-aibroker-tenant/values.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/values.yaml @@ -46,7 +46,7 @@ mas_aibroker_watsonxai_project_id: MAS_AIBROKER_WATSONXAI_PROJECT_ID mas_aibroker_sls_subscription_id: "001" # S3 -mas_aibroker_storage_provider: "aws" +mas_aibroker_storage_provider: "minio" mas_aibroker_storage_ssl: "true" # following are the variable need to injected via environment variable mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" From 4c64189b60f1b5b9c8575700cce25998a73bedcc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 25 Jun 2025 20:11:59 +0530 Subject: [PATCH 418/491] Update 04-aibroker-s3-secret.yaml --- .../templates/04-aibroker-s3-secret.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml index 210634907..59038f04a 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml @@ -16,10 +16,10 @@ type: Opaque stringData: ACCESS-KEY: "{{ .Values.mas_aibroker_storage_accesskey }}" SECRET-KEY: "{{ .Values.mas_aibroker_storage_secretkey }}" - {{- if eq .Values.mas_aibroker_storage_provider "aws" }} - URL: "{{ .Values.mas_aibroker_storage_host }}" - {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + #{{- if eq .Values.mas_aibroker_storage_provider "aws" }} + #URL: "{{ .Values.mas_aibroker_storage_host }}" + #{{- else if eq .Values.mas_aibroker_storage_provider "minio" }} URL: "http://{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - {{- end }} + #{{- end }} REGION: "{{ .Values.mas_aibroker_storage_region }}" # BUCKET-NAME: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" \ No newline at end of file From a2b4d6d9ecb2174a2b941954a9fcca8c0a6c4d0d Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Wed, 25 Jun 2025 21:35:54 +0530 Subject: [PATCH 419/491] fix condition --- .../templates/04-aibroker-s3-secret.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml index 59038f04a..c178a9c01 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/04-aibroker-s3-secret.yaml @@ -16,10 +16,9 @@ type: Opaque stringData: ACCESS-KEY: "{{ .Values.mas_aibroker_storage_accesskey }}" SECRET-KEY: "{{ .Values.mas_aibroker_storage_secretkey }}" - #{{- if eq .Values.mas_aibroker_storage_provider "aws" }} - #URL: "{{ .Values.mas_aibroker_storage_host }}" - #{{- else if eq .Values.mas_aibroker_storage_provider "minio" }} + {{- if eq .Values.mas_aibroker_storage_provider "aws" }} + URL: "{{ .Values.mas_aibroker_storage_host }}" + {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} URL: "http://{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - #{{- end }} + {{- end }} REGION: "{{ .Values.mas_aibroker_storage_region }}" - # BUCKET-NAME: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" \ No newline at end of file From 7e523756340b96972616a7c6b51df417f4e0ad85 Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Thu, 26 Jun 2025 01:07:06 +0530 Subject: [PATCH 420/491] test.test debug --- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index 1581c164b..eaa56969a 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -10,7 +10,8 @@ metadata: {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" + #serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 2c57f8917dbc05d8d978ca7ba3e1c0c1b214687b Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Thu, 26 Jun 2025 01:15:30 +0530 Subject: [PATCH 421/491] test.test --- .../templates/00-aibroker-tenent-namespace.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index c64dd9d4e..d548ede4c 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -18,7 +18,8 @@ metadata: {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + #serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 96d10ebfadb3c7d65cb03c0a1b9f47f69e36af09 Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Thu, 26 Jun 2025 01:21:25 +0530 Subject: [PATCH 422/491] correct value in 115 --- .../templates/00-aibroker-tenent-namespace.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index d548ede4c..a71aec664 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -18,8 +18,8 @@ metadata: {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - #serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + #serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 493667c56a570e1b0b6e4ab354e6e850896c26a0 Mon Sep 17 00:00:00 2001 From: sksingh11-ibm Date: Thu, 26 Jun 2025 01:21:55 +0530 Subject: [PATCH 423/491] correct value in km --- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index eaa56969a..a8aa6ca0c 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -10,8 +10,8 @@ metadata: {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" - #serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" + #serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" + serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 8de3b522e0be0676fde5f11a8a9943b073ee2a66 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 26 Jun 2025 10:19:04 +0530 Subject: [PATCH 424/491] remove test code --- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 1 - .../templates/00-aibroker-tenent-namespace.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index a8aa6ca0c..1581c164b 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -10,7 +10,6 @@ metadata: {{- if eq .Values.mas_aibroker_storage_provider "aws" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} - #serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index a71aec664..c64dd9d4e 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -19,7 +19,6 @@ metadata: serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}" {{- else if eq .Values.mas_aibroker_storage_provider "minio" }} serving.kserve.io/s3-endpoint: "{{ .Values.mas_aibroker_storage_host }}:{{ .Values.mas_aibroker_storage_port }}" - #serving.kserve.io/s3-endpoint: "test.test:{{ .Values.mas_aibroker_storage_port }}" {{- end }} {{- if eq .Values.mas_aibroker_storage_ssl "false" }} serving.kserve.io/s3-usehttps: "0" From 1e36cac3576af85cb899fb39e057525512897d89 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 16:03:31 +0530 Subject: [PATCH 425/491] encoded format dro --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- .../templates/040-ibm-aibroker-app.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 1463b509c..86870d9c3 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" + ca: "{{ .Values.drocfg_ca_tenant}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index f9e9b87c3..d4457584d 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -69,6 +69,7 @@ spec: mas_aibroker_dro_cacert_secret: "{{ .Values.ibm_aibroker.mas_aibroker_dro_cacert_secret }}" drocfg_ca: "{{ .Values.ibm_aibroker.drocfg_ca }}" + drocfg_ca_tenant: "{{ .Values.ibm_aibroker.drocfg_ca_tenant }}" drocfg_registration_key: "{{ .Values.ibm_aibroker.drocfg_registration_key }}" drocfg_url: "{{ .Values.ibm_aibroker.drocfg_url }}" mas_aibroker_db2_jdbc_secret: "{{ .Values.ibm_aibroker.mas_aibroker_db2_jdbc_secret }}" From 99e6db5ac9772f99b4d017feb7674456b3bd563a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 16:22:41 +0530 Subject: [PATCH 426/491] Update 06-aibroker-dro.yaml --- .../113-ibm-aibroker/templates/06-aibroker-dro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 87b1f52e8..0f11dd92b 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -19,6 +19,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "144" stringData: - ca.crt: "{{ .Values.drocfg_ca }}" + ca.crt: "{{ .Values.drocfg_ca_tenant }}" type: Opaque From 9a6cc40f9083e8dd2f77ff0b2dd2c16c9cac7fa1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 16:22:55 +0530 Subject: [PATCH 427/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 86870d9c3..1463b509c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca_tenant}}" + ca: "{{ .Values.drocfg_ca}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From 0434a57bc1c8120520462df04a31e3aff5f94cc2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 16:24:39 +0530 Subject: [PATCH 428/491] Revert "Update 06-aibroker-dro.yaml" This reverts commit 99e6db5ac9772f99b4d017feb7674456b3bd563a. --- .../113-ibm-aibroker/templates/06-aibroker-dro.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 0f11dd92b..87b1f52e8 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -19,6 +19,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "144" stringData: - ca.crt: "{{ .Values.drocfg_ca_tenant }}" + ca.crt: "{{ .Values.drocfg_ca }}" type: Opaque From 010f2eafa7c19e047f2f656b05880a17346c3361 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 16:28:29 +0530 Subject: [PATCH 429/491] Revert "Update 09-aibroker-app.yaml" This reverts commit 9a6cc40f9083e8dd2f77ff0b2dd2c16c9cac7fa1. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 1463b509c..86870d9c3 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca}}" + ca: "{{ .Values.drocfg_ca_tenant}}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From ccaf9b869634277aa1130fb9dade9a12e0fa04c0 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Thu, 26 Jun 2025 17:41:44 +0530 Subject: [PATCH 430/491] fix indent --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 86870d9c3..50aa45ff8 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -20,7 +20,7 @@ spec: dro: url: "{{ .Values.drocfg_url }}" dro_token_secret: "{{ .Values.drocfg_registration_key }}" - ca: "{{ .Values.drocfg_ca_tenant}}" + ca: "{{ .Values.drocfg_ca_tenant }}" jdbc: url: "{{ .Values.jdbccfg_url }}" credentials_secret: "{{ .Values.mas_aibroker_db2_jdbc_secret }}" From 4387e8ef22a292437c51c65fa3302d170dea4c40 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 26 Jun 2025 18:23:55 +0530 Subject: [PATCH 431/491] Update 02-kmodel-secret.yaml --- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index 1581c164b..77215ff87 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -28,5 +28,5 @@ stringData: S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" - #S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" - S3_SSL: "false" + S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" + From 8eb24cf46519793b3465a6271a01d49c9746be2e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 27 Jun 2025 12:48:10 +0530 Subject: [PATCH 432/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 50aa45ff8..185186897 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -31,11 +31,6 @@ spec: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" - - ## remove below as per ansible ##review - # pipeline_bucket: "{{ .Values.mas_aibroker_storage_pipelines_bucket }}" - # tenants_bucket: "{{ .Values.mas_aibroker_storage_tenants_bucket }}" - # templates_bucket: "{{ .Values.mas_aibroker_storage_templates_bucket }}" mariadb: host: "{{ .Values.mas_aibroker_db_host }}" port: "{{ .Values.mas_aibroker_db_port }}" From 59545427cf90db7e584afab6ef7f4173e5d307b8 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 27 Jun 2025 12:57:01 +0530 Subject: [PATCH 433/491] test commit --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 185186897..125f1085c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -36,7 +36,7 @@ spec: port: "{{ .Values.mas_aibroker_db_port }}" credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" database_name: "{{ .Values.mas_aibroker_db_secret_name }}" - # Optional shared S3 config. Tenant-level config takes precedence over this ##review + # Optional shared S3 config. Tenant-level config takes precedence over this s3: bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" region: "{{ .Values.mas_aibroker_s3_region }}" From fb43ddd1f7f36a95bad3ac9c3b2113685aade960 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 27 Jun 2025 14:43:28 +0530 Subject: [PATCH 434/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 125f1085c..ae82d9b15 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -41,4 +41,5 @@ spec: bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" region: "{{ .Values.mas_aibroker_s3_region }}" endpointUrl: "{{ .Values.mas_aibroker_s3_endpoint_url }}" - environment_type: "{{ .Values.environment_type }}" \ No newline at end of file + environment_type: "{{ .Values.environment_type }}" + use_aws_db2: true \ No newline at end of file From f8d1d7d9c8bfe2de2c0793fab91b1888420c9a65 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 27 Jun 2025 14:54:21 +0530 Subject: [PATCH 435/491] Update 07-aibroker-jdbc.yaml --- .../113-ibm-aibroker/templates/07-aibroker-jdbc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index 5a1a41a73..6ef1c3696 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -12,4 +12,5 @@ stringData: url: "{{ .Values.jdbccfg_url }}" sslenabled: "{{ .Values.jdbccfg_sslenabled }}" certificate: "{{ .Values.jdbccfg_ca }}" + ##### type: Opaque \ No newline at end of file From bdb41ea7dcddd6ce387fc8f48f35b335ead41227 Mon Sep 17 00:00:00 2001 From: Sunil Kumar Singh Date: Fri, 27 Jun 2025 19:42:07 +0530 Subject: [PATCH 436/491] remove coments --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index ae82d9b15..b46cd8439 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -7,7 +7,6 @@ metadata: labels: mas.ibm.com/applicationId: aibroker mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" - # kubernates instance id added in ##review app.kubernetes.io/instance: "{{ .Values.mas_instance_id }}" annotations: argocd.argoproj.io/sync-wave: "149" From dcc64136900ff3c55b24f5c22f23a0cde912b753 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 16:11:15 +0530 Subject: [PATCH 437/491] stringData to data --- .../templates/00-aibroker-tenent-namespace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index c64dd9d4e..f52cf4072 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -48,6 +48,6 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "300" type: kubernetes.io/dockerconfigjson -stringData: +data: .dockerconfigjson: "{{ .Values.artifactory_token}}" From cbf8a1c16e3c4a1db5699e408b5859ff55a612d7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 16:35:10 +0530 Subject: [PATCH 438/491] Update 00-aibroker-tenent-namespace.yaml --- .../templates/00-aibroker-tenent-namespace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index f52cf4072..c00ed23bc 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -49,5 +49,5 @@ metadata: argocd.argoproj.io/sync-wave: "300" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "{{ .Values.artifactory_token}}" + .dockerconfigjson: "eyJhdXRocyI6eyAiZG9ja2VyLW5hLXB1YmxpYy5hcnRpZmFjdG9yeS5zd2ctZGV2b3BzLmNvbS93aW90cC1kb2NrZXItbG9jYWwiOnsidXNlcm5hbWUiOiJZOUJCRk04NjZAbm9tYWlsLnJlbGF5LmlibS5jb20iLCJwYXNzd29yZCI6ImNtVm1kR3R1T2pBeE9qRTNOVGd3T0RnM016TTZObEpoVVRreWFreE9jWEpJYUV4Uk1sTmxlRVpTUWxKQlVXUjEiLCJhdXRoIjoiV1RsQ1FrWk5PRFkyUUc1dmJXRnBiQzV5Wld4aGVTNXBZbTB1WTI5dE9tTnRWbTFrUjNSMVQycEJlRTlxUlROT1ZHZDNUMFJuTTAxNlRUWk9iRXBvVlZScmVXRnJlRTlqV0VwSllVVjRVazFzVG14bFJWcFRVV3hLUWxWWFVqRT0ifSwgImNwLmljci5pby9jcCI6eyJ1c2VybmFtZSI6ImNwIiwicGFzc3dvcmQiOiJleUpoYkdjaU9pSklVekkxTmlKOS5leUpwYzNNaU9pSkpRazBnVFdGeWEyVjBjR3hoWTJVaUxDSnBZWFFpT2pFMU9EVXpPRGN3TmpVc0ltcDBhU0k2SW1KaFpUZ3laR0prTkRJNU16Um1OalZpWWprelptSTNNMlF6TlRCak1tSTBJbjAuQmxaNG1nTnlnSmFKY2ZpODQ4VmprdU9GMElDZkpocndOOFNzZS03TmFNRSIsImF1dGgiOiJZM0E2WlhsS2FHSkhZMmxQYVVwSlZYcEpNVTVwU2prdVpYbEtjR016VFdsUGFVcEtVV3N3WjFSWFJubGhNbFl3WTBkNGFGa3lWV2xNUTBwd1dWaFJhVTlxUlRGUFJGVjZUMFJqZDA1cVZYTkpiWEF3WVZOSk5rbHRTbWhhVkdkNVdrZEthMDVFU1RWTmVsSnRUbXBXYVZscWEzcGFiVWt6VFRKUmVrNVVRbXBOYlVrd1NXNHdMa0pzV2pSdFowNTVaMHBoU21ObWFUZzBPRlpxYTNWUFJqQkpRMlpLYUhKM1RqaFRjMlV0TjA1aFRVVT0ifX19" From 5aa14eb3667b19254778cd81e1977f9c4fe74bce Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 16:37:15 +0530 Subject: [PATCH 439/491] Revert "Update 00-aibroker-tenent-namespace.yaml" This reverts commit cbf8a1c16e3c4a1db5699e408b5859ff55a612d7. --- .../templates/00-aibroker-tenent-namespace.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml index c00ed23bc..f52cf4072 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/00-aibroker-tenent-namespace.yaml @@ -49,5 +49,5 @@ metadata: argocd.argoproj.io/sync-wave: "300" type: kubernetes.io/dockerconfigjson data: - .dockerconfigjson: "eyJhdXRocyI6eyAiZG9ja2VyLW5hLXB1YmxpYy5hcnRpZmFjdG9yeS5zd2ctZGV2b3BzLmNvbS93aW90cC1kb2NrZXItbG9jYWwiOnsidXNlcm5hbWUiOiJZOUJCRk04NjZAbm9tYWlsLnJlbGF5LmlibS5jb20iLCJwYXNzd29yZCI6ImNtVm1kR3R1T2pBeE9qRTNOVGd3T0RnM016TTZObEpoVVRreWFreE9jWEpJYUV4Uk1sTmxlRVpTUWxKQlVXUjEiLCJhdXRoIjoiV1RsQ1FrWk5PRFkyUUc1dmJXRnBiQzV5Wld4aGVTNXBZbTB1WTI5dE9tTnRWbTFrUjNSMVQycEJlRTlxUlROT1ZHZDNUMFJuTTAxNlRUWk9iRXBvVlZScmVXRnJlRTlqV0VwSllVVjRVazFzVG14bFJWcFRVV3hLUWxWWFVqRT0ifSwgImNwLmljci5pby9jcCI6eyJ1c2VybmFtZSI6ImNwIiwicGFzc3dvcmQiOiJleUpoYkdjaU9pSklVekkxTmlKOS5leUpwYzNNaU9pSkpRazBnVFdGeWEyVjBjR3hoWTJVaUxDSnBZWFFpT2pFMU9EVXpPRGN3TmpVc0ltcDBhU0k2SW1KaFpUZ3laR0prTkRJNU16Um1OalZpWWprelptSTNNMlF6TlRCak1tSTBJbjAuQmxaNG1nTnlnSmFKY2ZpODQ4VmprdU9GMElDZkpocndOOFNzZS03TmFNRSIsImF1dGgiOiJZM0E2WlhsS2FHSkhZMmxQYVVwSlZYcEpNVTVwU2prdVpYbEtjR016VFdsUGFVcEtVV3N3WjFSWFJubGhNbFl3WTBkNGFGa3lWV2xNUTBwd1dWaFJhVTlxUlRGUFJGVjZUMFJqZDA1cVZYTkpiWEF3WVZOSk5rbHRTbWhhVkdkNVdrZEthMDVFU1RWTmVsSnRUbXBXYVZscWEzcGFiVWt6VFRKUmVrNVVRbXBOYlVrd1NXNHdMa0pzV2pSdFowNTVaMHBoU21ObWFUZzBPRlpxYTNWUFJqQkpRMlpLYUhKM1RqaFRjMlV0TjA1aFRVVT0ifX19" + .dockerconfigjson: "{{ .Values.artifactory_token}}" From e1c2dcb0386666caad849a9643d8f29c915dbac3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 16:39:27 +0530 Subject: [PATCH 440/491] Update 08-aibroker-operator-subscription.yaml --- .../templates/08-aibroker-operator-subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml index 02b72e9da..381fb5867 100644 --- a/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml +++ b/instance-applications/113-ibm-aibroker/templates/08-aibroker-operator-subscription.yaml @@ -7,7 +7,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "146" type: kubernetes.io/dockerconfigjson -stringData: +data: .dockerconfigjson: "{{ .Values.artifactory_token}}" --- From c5df3f83c6c06349b367973393895855f1dac6e1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 19:09:24 +0530 Subject: [PATCH 441/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index b46cd8439..c86329455 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -36,6 +36,7 @@ spec: credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" database_name: "{{ .Values.mas_aibroker_db_secret_name }}" # Optional shared S3 config. Tenant-level config takes precedence over this + # s3: bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" region: "{{ .Values.mas_aibroker_s3_region }}" From 83f4bdf7eaeee7e45cdca99e93e736c29a715808 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 19:14:46 +0530 Subject: [PATCH 442/491] Revert "Update 09-aibroker-app.yaml" This reverts commit c5df3f83c6c06349b367973393895855f1dac6e1. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index c86329455..b46cd8439 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -36,7 +36,6 @@ spec: credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" database_name: "{{ .Values.mas_aibroker_db_secret_name }}" # Optional shared S3 config. Tenant-level config takes precedence over this - # s3: bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" region: "{{ .Values.mas_aibroker_s3_region }}" From 895d0a506cdc23888b9e531afb1eab061f925791 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 19:22:45 +0530 Subject: [PATCH 443/491] Reapply "Update 09-aibroker-app.yaml" This reverts commit 83f4bdf7eaeee7e45cdca99e93e736c29a715808. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index b46cd8439..c86329455 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -36,6 +36,7 @@ spec: credentials_secret: "{{ .Values.mas_aibroker_mariadb_secret }}" database_name: "{{ .Values.mas_aibroker_db_secret_name }}" # Optional shared S3 config. Tenant-level config takes precedence over this + # s3: bucketPrefix: "{{ .Values.mas_aibroker_s3_bucket_prefix }}" region: "{{ .Values.mas_aibroker_s3_region }}" From f37f2014667aca65bb81dadac8b56b63a8fd3cb8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 1 Jul 2025 22:26:25 +0530 Subject: [PATCH 444/491] mas_aibroker_storage_port passed as blank when we use minio --- .../114-ibm-kmodels/templates/02-kmodel-secret.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml index 77215ff87..19481a32a 100644 --- a/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml +++ b/instance-applications/114-ibm-kmodels/templates/02-kmodel-secret.yaml @@ -26,7 +26,11 @@ stringData: S3_ACCESS_KEY: "{{ .Values.mas_aibroker_storage_accesskey}}" S3_SECRET_KEY: "{{ .Values.mas_aibroker_storage_secretkey}}" S3_HOST: "{{ .Values.mas_aibroker_storage_host}}" + {{- if eq .Values.mas_aibroker_storage_provider "minio" }} S3_PORT: "{{ .Values.mas_aibroker_storage_port}}" + {{- else }} + S3_PORT: "" + {{- end }} S3_REGION: "{{ .Values.mas_aibroker_storage_region}}" S3_SSL: "{{ .Values.mas_aibroker_storage_ssl}}" From 0f342c7f47b8e4da04b8fa435601402643cd8731 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 2 Jul 2025 00:01:55 +0530 Subject: [PATCH 445/491] Update 07-aibroker-ingress-allow-isvc.yaml --- .../templates/07-aibroker-ingress-allow-isvc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml index e4c8882c2..f7ead9788 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml @@ -6,6 +6,7 @@ metadata: namespace: "{{ .Values.tenantNamespace }}" annotations: argocd.argoproj.io/sync-wave: "308" + # spec: podSelector: matchLabels: From 6f2ee674996308b35eff8ce8b76aabe13946f3b9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 2 Jul 2025 11:04:23 +0530 Subject: [PATCH 446/491] Revert "Update 07-aibroker-ingress-allow-isvc.yaml" This reverts commit 0f342c7f47b8e4da04b8fa435601402643cd8731. --- .../templates/07-aibroker-ingress-allow-isvc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml index f7ead9788..e4c8882c2 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/07-aibroker-ingress-allow-isvc.yaml @@ -6,7 +6,6 @@ metadata: namespace: "{{ .Values.tenantNamespace }}" annotations: argocd.argoproj.io/sync-wave: "308" - # spec: podSelector: matchLabels: From f9f08a919402fb7df8619912cdd710449adcd40d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 2 Jul 2025 15:53:54 +0530 Subject: [PATCH 447/491] Update Chart.yaml --- .../000-ibm-operator-catalog/Chart.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster-applications/000-ibm-operator-catalog/Chart.yaml b/cluster-applications/000-ibm-operator-catalog/Chart.yaml index 345a3ef1b..4676983f7 100644 --- a/cluster-applications/000-ibm-operator-catalog/Chart.yaml +++ b/cluster-applications/000-ibm-operator-catalog/Chart.yaml @@ -4,8 +4,8 @@ description: IBM Maximo Operator Catalog type: application version: 1.0.0 -# dependencies: -# - name: junitreporter -# version: 1.0.0 -# repository: "file://../../sub-charts/junitreporter/" -# condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file From 1572bf6876c1c81996c128724be261d001978d8c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 3 Jul 2025 19:48:10 +0530 Subject: [PATCH 448/491] updated PR 324 remove comment and commended file change REDME for AIBROKER --- .../113-ibm-aibroker/README.md | 4 +- .../templates/07-aibroker-jdbc.yaml | 1 - .../templates/05-kmodel-ca_Certificate.yaml | 69 ------------------- .../templates/05-kmodel-store.yaml | 1 - .../templates/01-aibroker-sls-secret.yaml | 6 +- 5 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml diff --git a/instance-applications/113-ibm-aibroker/README.md b/instance-applications/113-ibm-aibroker/README.md index cd4553e8f..1c94d6fd6 100644 --- a/instance-applications/113-ibm-aibroker/README.md +++ b/instance-applications/113-ibm-aibroker/README.md @@ -1,3 +1,3 @@ -IBM Kmodels +IBM AIBROKER =============================================================================== -Deploy and configure kmodels storage with configurable version \ No newline at end of file +Deploy and configure AIBROKER with configurable version \ No newline at end of file diff --git a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml index 6ef1c3696..5a1a41a73 100644 --- a/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml +++ b/instance-applications/113-ibm-aibroker/templates/07-aibroker-jdbc.yaml @@ -12,5 +12,4 @@ stringData: url: "{{ .Values.jdbccfg_url }}" sslenabled: "{{ .Values.jdbccfg_sslenabled }}" certificate: "{{ .Values.jdbccfg_ca }}" - ##### type: Opaque \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml deleted file mode 100644 index 11bd71e65..000000000 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-ca_Certificate.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# --- -# apiVersion: v1 -# kind: Secret -# metadata: -# name: "kmodel-pkcs12-password" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "166" -# type: Opaque -# data: -# password: {{ .Values.ssh_secret_password | b64enc | quote }} - -# --- -# apiVersion: cert-manager.io/v1 -# kind: Issuer -# metadata: -# name: "kmodel-ca-issuer" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "167" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# selfSigned: {} - -# --- -# apiVersion: cert-manager.io/v1 -# kind: Certificate -# metadata: -# name: "kmodel-certificate" -# namespace: "{{ .Values.aibroker_namespace }}" -# annotations: -# argocd.argoproj.io/sync-wave: "168" -# {{- if .Values.custom_labels }} -# labels: -# {{ .Values.custom_labels | toYaml | indent 4 }} -# {{- end }} -# spec: -# secretName: "{{ .Values.ssh_secret_name }}" -# duration: "175200h0m0s" -# renewBefore: "2160h0m0s" -# keystores: -# pkcs12: -# create: true -# passwordSecretRef: -# key: password -# name: "kmodel-pkcs12-password" - -# issuerRef: -# name: "kmodel-ca-issuer" -# kind: Issuer -# isCA: true -# usages: -# - cert sign -# - digital signature -# - key encipherment -# - server auth -# commonName: "ca.kmodel" -# subject: -# countries: -# - GB -# streetAddresses: -# - London -# localities: -# - London -# organizationalUnits: -# - IBM Maximo Application Suite kmodel \ No newline at end of file diff --git a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml index 72c416a41..6efdbe42d 100644 --- a/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml +++ b/instance-applications/114-ibm-kmodels/templates/05-kmodel-store.yaml @@ -76,7 +76,6 @@ spec: containers: - name: store image: "{{ .Values.image_store }}" - #image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/aibroker/store:1.0.7" imagePullPolicy: Always securityContext: readOnlyRootFilesystem: false diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml index a249aebe5..23a6ee671 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml @@ -16,8 +16,4 @@ metadata: {{- end }} type: Opaque stringData: - # SLS_CLIENT_ID: "aibroker-88s55n4n7obrkn" - SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" - # aibroker-88s55n4n7obrkn-ca.crt: "{{ .Values.slscfg_ca }}" - # aibroker-88s55n4n7obrkn-tls.crt: "{{ .Values.slscfg_tls }}" - # aibroker-88s55n4n7obrkn-tls.key: "{{ .Values.slscfg_key }}" \ No newline at end of file + SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" \ No newline at end of file From 02e4466cc2a4601e1d15afacbbdb6e44132ea4f7 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Jul 2025 11:36:47 +0530 Subject: [PATCH 449/491] update cli_image_digest --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 4 +++- instance-applications/112-ibm-odh/templates/11-odh.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index b6b85db6d..4dbbc05ce 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,3 +1,5 @@ +{{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} + --- apiVersion: v1 kind: Namespace @@ -55,7 +57,7 @@ spec: serviceAccountName: installplan-approver containers: - name: installplanjob - image: quay.io/ibmmas/cli:latest + image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} imagePullPolicy: IfNotPresent resources: limits: diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 3c0acb63f..4adfc2d78 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,3 +1,5 @@ +{{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} + --- apiVersion: v1 kind: ServiceAccount @@ -83,7 +85,7 @@ spec: spec: containers: - name: run - image: quay.io/ibmmas/cli:latest + image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} imagePullPolicy: IfNotPresent resources: limits: From 060690382379d785cb5458ce00052cee00569b6c Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 8 Jul 2025 17:49:39 +0530 Subject: [PATCH 450/491] deleted sls in aibroker --- .../templates/03-aibroker-sls-tenant-details.yaml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml diff --git a/instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml b/instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml deleted file mode 100644 index 2db37a571..000000000 --- a/instance-applications/113-ibm-aibroker/templates/03-aibroker-sls-tenant-details.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -kind: Secret -apiVersion: v1 -metadata: - name: "{{ .Values.mas_aibroker_sls_registration_key_secret }}" - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "142" -stringData: - SLS_REGISTRATION_KEY: "{{ .Values.slscfg_registration_key }}" -type: Opaque \ No newline at end of file From 323dec756587190c223b890b812c44037eba07e8 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Jul 2025 10:25:18 +0530 Subject: [PATCH 451/491] job_name_prefix added --- .../templates/05-odh-operator-job.yaml | 57 +++++++++++++++++- .../112-ibm-odh/templates/11-odh.yaml | 58 ++++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 4dbbc05ce..a2db7f1e1 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -1,5 +1,58 @@ +{{- $_job_name_prefix := "installplanpatch" }} + +{{- /* +Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. +Included in $_job_hash (see below). +*/}} {{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} +{{- /* +A dict of values that influence the behaviour of the job in some way. +Any changes to values in this dict will trigger a rerun of the job. +Since jobs must be idemopotent, it's generally safe to pass in values here that are not +strictly necessary (i.e. including some values that don't actually influence job behaviour). +We may want to refine this further though for jobs that can take a long time to complete. +Included in $_job_hash (see below). +*/}} +{{- $_job_config_values := omit .Values "junitreporter" }} + +{{- /* +Increment this value whenever you make a change to an immutable field of the Job resource. +E.g. passing in a new environment variable. +Included in $_job_hash (see below). +*/}} +{{- $_job_version := "v3" }} + +{{- /* +10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest +This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an +immutable field of any existing Job resource. +*/}} +{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} + +{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}} + + +{{- /* +Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource. + +When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label +to identify old Job resources that should be pruned on behalf of ArgoCD. + +Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value +will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp") +Jobs will be automatically deleted. + +$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases +where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators +must be added to $_job_cleanup_group. + +By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators +are required here. + +*/}} +{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} + --- apiVersion: v1 kind: Namespace @@ -47,10 +100,12 @@ subjects: apiVersion: batch/v1 kind: Job metadata: - name: installplanpatch-{{ .Values.odh_operator_version }} + name: {{ $_job_name }}-{{ .Values.odh_operator_version }} namespace: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "127" + labels: + mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} spec: template: spec: diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 4adfc2d78..a44581543 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -1,5 +1,59 @@ +{{- $_job_name_prefix := "odh-sa-patch-job-v1" }} + +{{- /* +Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. +Included in $_job_hash (see below). +*/}} {{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} +{{- /* +A dict of values that influence the behaviour of the job in some way. +Any changes to values in this dict will trigger a rerun of the job. +Since jobs must be idemopotent, it's generally safe to pass in values here that are not +strictly necessary (i.e. including some values that don't actually influence job behaviour). +We may want to refine this further though for jobs that can take a long time to complete. +Included in $_job_hash (see below). +*/}} +{{- $_job_config_values := omit .Values "junitreporter" }} + +{{- /* +Increment this value whenever you make a change to an immutable field of the Job resource. +E.g. passing in a new environment variable. +Included in $_job_hash (see below). +*/}} +{{- $_job_version := "v3" }} + +{{- /* +10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest +This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an +immutable field of any existing Job resource. +*/}} +{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} + +{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}} + + +{{- /* +Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource. + +When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label +to identify old Job resources that should be pruned on behalf of ArgoCD. + +Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value +will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp") +Jobs will be automatically deleted. + +$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases +where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators +must be added to $_job_cleanup_group. + +By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators +are required here. + +*/}} +{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} + + --- apiVersion: v1 kind: ServiceAccount @@ -76,10 +130,12 @@ roleRef: apiVersion: batch/v1 kind: Job metadata: - name: odh-sa-patch-job-v1-{{ omit .Values "junitreporter" | toYaml | adler32sum }} + name: {{ $_job_name }}-{{ omit .Values "junitreporter" | toYaml | adler32sum }} namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "138" + labels: + mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} spec: template: spec: From abcd274f7b51053fb994db2dc281cd2527aef8b4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Jul 2025 11:06:14 +0530 Subject: [PATCH 452/491] MASSREMAT-163 route_type added in aibroker route_type. https://jsw.ibm.com/browse/MASSREMAT-163 --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 + .../templates/040-ibm-aibroker-app.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index c86329455..0cb1bcaa7 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -26,6 +26,7 @@ spec: ca: "{{ .Values.jdbccfg_ca }}" cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" + route_type: "{{ .Values.route_type }}" minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index d4457584d..612891728 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -91,6 +91,7 @@ spec: mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" mas_icr_cpopen: "{{ .Values.ibm_aibroker.mas_icr_cpopen }}" in_saas_env: "{{ .Values.ibm_aibroker.in_saas_env }}" + route_type: "{{ .Values.ibm_aibroker.route_type }}" cluster_domain: "{{ .Values.ibm_aibroker.cluster_domain }}" environment_type: "{{ .Values.ibm_aibroker.environment_type }}" mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker.mas_aibroker_s3_endpoint_url }}" From 750d22e8149fc20cea2ebde4649441345c3eb9eb Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Jul 2025 13:46:23 +0530 Subject: [PATCH 453/491] put updated comment --- root-applications/ibm-mas-cluster-root/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 8f0244b2c..31e327fa3 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -7,20 +7,20 @@ avp: values_varname: "HELM_VALUES" account: - id: fyre-sre-dev + id: inst1 region: - id: us-east-1 + id: region1 cluster: - id: sremat-test + id: cluster1 generator: repo_url: xxxx source: repo_url: "https://github.com/ibm-mas/gitops" - revision: "aibroker" + revision: "poc" # Customers will definitely need to customise this (our gitops-envs/mas-dev repos are private), # So deliberately not specifying defaults here; we want charts to refuse to render if these are not specified From ad79ed4fa0a1d647c04a61c4dd931a86797184ed Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Wed, 9 Jul 2025 13:54:36 +0530 Subject: [PATCH 454/491] update through ARGO --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index a2db7f1e1..874cd3715 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -57,7 +57,7 @@ are required here. apiVersion: v1 kind: Namespace metadata: - name: opendatahub + name: {{ .Values.odh_namespace }} annotations: argocd.argoproj.io/sync-wave: "122" --- From ebd0c17e3d37998e43a2061d92cb4156d82dc70d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 11:13:05 +0530 Subject: [PATCH 455/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 0cb1bcaa7..eed0cfaf4 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -27,6 +27,7 @@ spec: cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" route_type: "{{ .Values.route_type }}" + minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" From 5c267b91c679c5232beb72e3792bcff2200c8aea Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 14:15:56 +0530 Subject: [PATCH 456/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index eed0cfaf4..e7c5a0634 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -26,8 +26,9 @@ spec: ca: "{{ .Values.jdbccfg_ca }}" cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" - route_type: "{{ .Values.route_type }}" - + route_type: "https://s3.us-east-2.amazonaws.com" + #route_type: "{{ .Values.route_type }}" + minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" From 4a1f998e6fcb6621edf52505082cb6a412e9519e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 14:17:30 +0530 Subject: [PATCH 457/491] Revert "Update 09-aibroker-app.yaml" This reverts commit 5c267b91c679c5232beb72e3792bcff2200c8aea. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index e7c5a0634..eed0cfaf4 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -26,9 +26,8 @@ spec: ca: "{{ .Values.jdbccfg_ca }}" cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" - route_type: "https://s3.us-east-2.amazonaws.com" - #route_type: "{{ .Values.route_type }}" - + route_type: "{{ .Values.route_type }}" + minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" From 49b3b20184abdb9693fccb0dbcf51e76e909273e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 14:19:32 +0530 Subject: [PATCH 458/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 38989d25f..aad09a0a5 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -79,6 +79,6 @@ mas_icr_cpopen: "icr.io/cpopen" cluster_domain: "_cluster_dns.resources[0].spec.baseDomain" in_saas_env: "false" - +route_type: "route_type" #TENANT mas_aibroker_tenant_name: "aibroker-{{ mas_aibroker_tenant_name }}" \ No newline at end of file From e13cee147baf9a891764c255dcc1600e026e12a4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 14:25:35 +0530 Subject: [PATCH 459/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index a3c746b69..e8ac3cd4f 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -249,7 +249,7 @@ ibm_aibroker: cluster_domain: cluster_domain in_saas_env: "in_saas_env" - + route_type: "route_type" mas_aibroker_s3_endpoint_url: "mas_aibroker_s3_endpoint_url" mas_aibroker_s3_region: "mas_aibroker_s3_region" mas_aibroker_s3_bucket_prefix: "mas_aibroker_s3_bucket_prefix" From ddaa1a94ef7a0f2760dd123786de0a6dc09847ab Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 14:27:43 +0530 Subject: [PATCH 460/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index aad09a0a5..38989d25f 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -79,6 +79,6 @@ mas_icr_cpopen: "icr.io/cpopen" cluster_domain: "_cluster_dns.resources[0].spec.baseDomain" in_saas_env: "false" -route_type: "route_type" + #TENANT mas_aibroker_tenant_name: "aibroker-{{ mas_aibroker_tenant_name }}" \ No newline at end of file From ee408bf3d6898def2c0fa395332086aadef60945 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 16:57:05 +0530 Subject: [PATCH 461/491] update sha256 --- .../112-ibm-odh/templates/05-odh-operator-job.yaml | 2 +- instance-applications/112-ibm-odh/templates/11-odh.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml index 874cd3715..27e21b4f4 100644 --- a/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml +++ b/instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml @@ -4,7 +4,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} +{{- $_cli_image_digest := "sha256:934706a7173d45ea53c3d191afa6d75b4e41d25422e6a3685f1c57d1ddf49a00" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index a44581543..b0098b941 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -4,7 +4,7 @@ Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:b349bf3330e208dbe35a06101c6e31a44d78b24c4d0c5f5fa4ff10b471f9dd2a" }} +{{- $_cli_image_digest := "sha256:934706a7173d45ea53c3d191afa6d75b4e41d25422e6a3685f1c57d1ddf49a00" }} {{- /* A dict of values that influence the behaviour of the job in some way. From 98ef4c2c1284f3fe7994e275b9f62b4c4b8bf716 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 19:11:46 +0530 Subject: [PATCH 462/491] update mas to aibroker https://jsw.ibm.com/browse/MASSREMAT-167 --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 6 +++--- .../templates/040-ibm-aibroker-app.yaml | 2 +- .../ibm-aibroker-instance-root/values.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index eed0cfaf4..ed3a6596c 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,12 +2,12 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "{{ .Values.mas_instance_id }}" + name: "{{ .Values.aibroker_instance_id }}" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" - app.kubernetes.io/instance: "{{ .Values.mas_instance_id }}" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" + app.kubernetes.io/instance: "{{ .Values.aibroker_instance_id }}" annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 612891728..91aa3773d 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -35,7 +35,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | aibroker_namespace: "{{ .Values.ibm_aibroker.aibroker_namespace }}" - mas_instance_id: "{{ .Values.ibm_aibroker.mas_instance_id }}" + aibroker_instance_id: "{{ .Values.ibm_aibroker.aibroker_instance_id }}" mas_aibroker_minio_secret: "{{ .Values.ibm_aibroker.mas_aibroker_minio_secret }}" mas_aibroker_mariadb_secret: "{{ .Values.ibm_aibroker.mas_aibroker_mariadb_secret }}" diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index e8ac3cd4f..9afbc2daa 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -123,7 +123,7 @@ ibm_odh: ibm_kmodel: - mas_instance_id: "mas_instance_id" + aibroker_instance_id: "aibroker_instance_id" aibroker_internal_tls: "aibroker_internal_tls" aibroker_namespace: "mas-sremat-aibroker" @@ -168,8 +168,8 @@ ibm_kmodel: mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" ibm_aibroker: - mas_instance_id: "mas_instance_id" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + aibroker_instance_id: "aibroker_instance_id" + aibroker_namespace: 'mas-{{ aibroker_instance_id }}-aibroker' mas_aibroker_minio_secret: "mas_aibroker_minio_secret" # Minio mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" @@ -256,8 +256,8 @@ ibm_aibroker: environment_type: "environment_type" ibm_aibroker_tenant: - mas_instance_id: "MAS_INSTANCE_ID" - aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' + aibroker_instance_id: "aibroker_instance_id" + aibroker_namespace: 'mas-{{ aibroker_instance_id }}-aibroker' ibm_entitlement_key: "" openshift_namespace: "openshift-operators" # SAAS From 5562013fe0a6e321c907e18068bbec9389ec3334 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 19:18:39 +0530 Subject: [PATCH 463/491] update job in role --- .../112-ibm-odh/templates/11-odh.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index b0098b941..372bbfe6d 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -124,6 +124,21 @@ roleRef: name: odh-sa-knative-patch-role apiGroup: rbac.authorization.k8s.io +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: odh-sa-cluster-admin + annotations: + argocd.argoproj.io/sync-wave: "137" +subjects: + - kind: ServiceAccount + name: odh-sa + namespace: knative-serving +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io --- From 20aedc04d0e2ce666364ab3bcd21f13e80cbfa42 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 19:33:26 +0530 Subject: [PATCH 464/491] Update 11-odh.yaml --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 372bbfe6d..092528f91 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -201,4 +201,5 @@ spec: restartPolicy: Never serviceAccountName: odh-sa + automountServiceAccountToken: true backoffLimit: 3 From 24fe174c3a389a86a785eda31582525a737f3e51 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 20:13:07 +0530 Subject: [PATCH 465/491] Update 11-odh.yaml --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 092528f91..162beb0f2 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -202,4 +202,5 @@ spec: restartPolicy: Never serviceAccountName: odh-sa automountServiceAccountToken: true + dnsPolicy: ClusterFirst backoffLimit: 3 From 81b9d65ff16a23972798332a9157541dc5ab3ccd Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Thu, 10 Jul 2025 20:31:20 +0530 Subject: [PATCH 466/491] Update 11-odh.yaml --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 162beb0f2..d8e9987a5 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -149,8 +149,6 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "138" - labels: - mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} spec: template: spec: From 4ad3c5857d2a3719ae682b0834aa672c1a642fcc Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 11 Jul 2025 11:55:12 +0530 Subject: [PATCH 467/491] Revert "Update 11-odh.yaml" This reverts commit 81b9d65ff16a23972798332a9157541dc5ab3ccd. --- instance-applications/112-ibm-odh/templates/11-odh.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index d8e9987a5..162beb0f2 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -149,6 +149,8 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "138" + labels: + mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }} spec: template: spec: From a946700df6fb5d3105fa8d9f9158812a055c07af Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 16:44:14 +0530 Subject: [PATCH 468/491] update route_type and mas to aibroker --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- .../templates/01-aibroker-sls-secret.yaml | 2 +- .../templates/02-aibroker-rsl-secret.yaml | 2 +- .../templates/03-aibroker-dro-secret.yaml | 2 +- .../templates/06-aibroker-workspace.yaml | 4 ++-- .../templates/040-ibm-aibroker-app.yaml | 2 +- .../templates/100-ibm-aibroker-tenant-app.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index ed3a6596c..5bfbcbee3 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -26,7 +26,7 @@ spec: ca: "{{ .Values.jdbccfg_ca }}" cluster_domain: "{{ .Values.cluster_domain }}" in_saas_env: "{{ .Values.in_saas_env }}" - route_type: "{{ .Values.route_type }}" + is_external_route: "{{ .Values.is_external_route }}" minio: host: "{{ .Values.mas_aibroker_storage_host }}" diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml index 23a6ee671..7e1ee6818 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/01-aibroker-sls-secret.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "301" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" {{- if .Values.custom_labels }} {{- range $key, $val := .Values.custom_labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml index d25a5c637..0ba45edfa 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/02-aibroker-rsl-secret.yaml @@ -8,7 +8,7 @@ metadata: namespace: "{{ .Values.tenantNamespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" {{- if .Values.custom_labels }} {{- range $key, $value := .Values.custom_labels }} {{ $key | quote }}: {{ $value | quote }} diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml index 09f1504f8..9d5676e1d 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/03-aibroker-dro-secret.yaml @@ -6,7 +6,7 @@ metadata: namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" {{- if .Values.custom_labels }} {{- range $key, $val := .Values.custom_labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml index dfbce62f6..b4d6d1993 100644 --- a/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml +++ b/instance-applications/115-ibm-aibroker-tenant/templates/06-aibroker-workspace.yaml @@ -8,7 +8,7 @@ metadata: argocd.argoproj.io/sync-wave: "307" labels: mas.ibm.com/applicationId: "aibroker" - mas.ibm.com/instanceId: "{{ .Values.mas_instance_id }}" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" {{- if .Values.custom_labels }} {{- range $key, $val := .Values.custom_labels }} {{ $key | quote }}: {{ $val | quote }} @@ -41,7 +41,7 @@ spec: tenant: tenant_id: "{{ .Values.tenantNamespace }}" subscription_id: "{{ .Values.mas_aibroker_sls_subscription_id }}" - instance_id: "{{ .Values.mas_instance_id }}" + instance_id: "{{ .Values.aibroker_instance_id }}" entitlement: type: "{{ .Values.tenant_entitlement_type }}" startDate: "{{ .Values.tenant_entitlement_start_date }}" diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 91aa3773d..2ffbd96bc 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -91,7 +91,7 @@ spec: mas_icr_cp: "{{ .Values.ibm_aibroker.mas_icr_cp }}" mas_icr_cpopen: "{{ .Values.ibm_aibroker.mas_icr_cpopen }}" in_saas_env: "{{ .Values.ibm_aibroker.in_saas_env }}" - route_type: "{{ .Values.ibm_aibroker.route_type }}" + is_external_route: "{{ .Values.ibm_aibroker.is_external_route }}" cluster_domain: "{{ .Values.ibm_aibroker.cluster_domain }}" environment_type: "{{ .Values.ibm_aibroker.environment_type }}" mas_aibroker_s3_endpoint_url: "{{ .Values.ibm_aibroker.mas_aibroker_s3_endpoint_url }}" diff --git a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml index 09ece7924..ecc7ba095 100644 --- a/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml +++ b/root-applications/ibm-aibroker-tenant-root/templates/100-ibm-aibroker-tenant-app.yaml @@ -36,7 +36,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | tenant_id: "{{ .Values.ibm_aibroker_tenant.tenant_id }}" - mas_instance_id: "{{ .Values.ibm_aibroker_tenant.mas_instance_id }}" + aibroker_instance_id: "{{ .Values.ibm_aibroker_tenant.aibroker_instance_id }}" aibroker_namespace: "{{ .Values.ibm_aibroker_tenant.aibroker_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_aibroker_tenant.ibm_entitlement_key }}" From 90b775947fbf934f012ef2ca12a76ac4994aac35 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 16:45:00 +0530 Subject: [PATCH 469/491] MASSREMAT-169 create job --- .../templates/08-aibroker-cred-job.yaml | 235 ++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml new file mode 100644 index 000000000..4a8f36d23 --- /dev/null +++ b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml @@ -0,0 +1,235 @@ +{{- /* +Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash. +*/}} +{{- $_job_name_prefix := "mas_manage_ai_tenant" }} + +{{- /* +Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. +Included in $_job_hash (see below). +*/}} +{{- $_cli_image_digest := "sha256:834dffd4da534c01daea4e0a6d9db7d00a9ad9b18b054cc034985fcaceedeacd" }} + +{{- /* +A dict of values that influence the behaviour of the job in some way. +Any changes to values in this dict will trigger a rerun of the job. +Since jobs must be idemopotent, it's generally safe to pass in values here that are not +strictly necessary (i.e. including some values that don't actually influence job behaviour). +We may want to refine this further though for jobs that can take a long time to complete. +Included in $_job_hash (see below). +*/}} +{{- $_job_config_values := omit .Values "junitreporter" }} + +{{- /* +Increment this value whenever you make a change to an immutable field of the Job resource. +E.g. passing in a new environment variable. +Included in $_job_hash (see below). +*/}} +{{- $_job_version := "v3" }} + +{{- /* +10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest +This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an +immutable field of any existing Job resource. +*/}} +{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} + +{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}} + +{{- /* +Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource. + +When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label +to identify old Job resources that should be pruned on behalf of ArgoCD. + +Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value +will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp") +Jobs will be automatically deleted. + +$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases +where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators +must be added to $_job_cleanup_group. + +By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators +are required here. + +*/}} +{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} + + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: mas-manage-aiservice-job + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "309" + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: mas-manage-aiservice-job-role + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "310" +rules: + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list", "watch"] + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: mas-manage-aiservice-job-rolebinding + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "311" +subjects: + - kind: ServiceAccount + name: mas-manage-aiservice-job + namespace: "{{ .Values.aibroker_namespace }}" +roleRef: + kind: Role + name: mas-manage-aiservice-job-role + apiGroup: rbac.authorization.k8s.io + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ $_job_name }} + namespace: "{{ .Values.aibroker_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "312" + 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: + containers: + - name: mas-manage-aiservice-run + image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} + imagePullPolicy: IfNotPresent + + env: + - name: ACCOUNT_ID + value: "{{ .Values.account_id }}" + - name: CLUSTER_ID + value: "{{ .Values.cluster_id }}" + - name: AIBROKER_INSTANCE_ID + value: "{{ .Values.aibroker_instance_id }}" + + + - name: SECRETS_KEY_SEPERATOR + value: "/" + + # Aibroker + - name: AIBROKER_TENANT + value: "{{ .Values.tenantNamespace }}" + + #aws + - name: SM_AWS_REGION + value: "{{ .Values.sm_aws_region }}" + - name: SM_AWS_ACCESS_KEY_ID + value: "{{ .Values.aws_access_key_id }}" + - name: SM_AWS_SECRET_ACCESS_KEY + value: "{{ .Values.aws_secret_access_key }}" + + # Hard-coded for now: + - name: AVP_TYPE + value: "aws" + + command: + - /bin/sh + - -c + - | + + set -e + + + + export SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/suite_dns/sm_aws_access_key_id) + export SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/suite_dns/sm_aws_secret_access_key) + + SECRETS_KEY_SEPERATOR="/" + SECRET_NAME_AISERVICE=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${AIBROKER_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}aiservice + + echo "" + echo "================================================================================" + echo "Settings" + echo "================================================================================" + echo "Account Id .......................... ${COLOR_MAGENTA}${ACCOUNT_ID}" + echo "Cluster Id .......................... ${COLOR_MAGENTA}${CLUSTER_ID}" + echo "AIBROKER Instance Id ..................... ${COLOR_MAGENTA}${AIBROKER_INSTANCE_ID}" + echo "MAS Workspace ID .................... ${COLOR_MAGENTA}${MAS_WORKSPACE_ID}" + echo "SM_AWS_REGION ....................... ${COLOR_MAGENTA}${SM_AWS_REGION}" + echo "SM_AWS_ACCESS_KEY_ID ................ ${COLOR_MAGENTA}${SM_AWS_ACCESS_KEY_ID:0:4}" + echo "SM_AWS_SECRET_ACCESS_KEY ............ ${COLOR_MAGENTA}${SM_AWS_SECRET_ACCESS_KEY:0:4}" + + echo "" + echo "================================================================================" + + echo "" + echo "================================================================================" + echo "Retrieve AIBroker API Key for tenant: ${AIBROKER_TENANT}" + echo "================================================================================" + + export AIBROKER_APIKEY=$(oc get secret ${AIBROKER_TENANT}----apikey-secret -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ + -o jsonpath="{.data.AIBROKER_APIKEY}" | base64 --decode) + + if [ -z "$AIBROKER_APIKEY" ]; then + echo "Failed to retrieve AIBroker API Key" + exit 1 + fi + + echo "AIBROKER_APIKEY = ${AIBROKER_APIKEY:0:4}" + + echo "===============================================================================" + echo "Retrieve TLS Secrets" + echo "===============================================================================" + export CA_CERT=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ + -o jsonpath="{.data.ca\\.crt}" | base64 --decode) + echo "CA_CERT = ${CA_CERT:0:20}" + + export TLS_CERT=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ + -o jsonpath="{.data.tls\\.crt}" | base64 --decode) + echo "TLS_CERT = ${TLS_CERT:0:20}" + + export TLS_KEY=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ + -o jsonpath="{.data.tls\\.key}" | base64 --decode) + echo "TLS_KEY = ${TLS_KEY:0:20}" + echo "===============================================================================" + + + + source /mascli/functions/gitops_utils + sm_login + TAGS="[{\"Key\": \"source\", \"Value\": \"mas-ai-service\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]" + # Update secret in Secrets Manager + echo "===============================================================================" + sm_update_secret $SECRET_NAME_AISERVICE "{\"aibroker_tenant\":\"$AIBROKER_TENANT\", \"aibroker_apikey\":\"$AIBROKER_APIKEY\", \"cas_cert\":\"$CA_CERT\", \"tls_cert\":\"$TLS_CERT\", \"tls_key\":\"$TLS_KEY\"}" "${TAGS}" || exit $? + echo "===============================================================================" + + + restartPolicy: Never + + serviceAccountName: mas-manage-aiservice-job + volumes: + - name: "mas-manage-aiservice" + secret: + secretName: "mas-manage-aiservice" + defaultMode: 420 + optional: false + + backoffLimit: 4 From c2ce44153ba15a46c662da41beea6dba324d1ba9 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 19:13:46 +0530 Subject: [PATCH 470/491] Revert "MASSREMAT-169 create job" This reverts commit 90b775947fbf934f012ef2ca12a76ac4994aac35. --- .../templates/08-aibroker-cred-job.yaml | 235 ------------------ 1 file changed, 235 deletions(-) delete mode 100644 instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml diff --git a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml b/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml deleted file mode 100644 index 4a8f36d23..000000000 --- a/instance-applications/115-ibm-aibroker-tenant/templates/08-aibroker-cred-job.yaml +++ /dev/null @@ -1,235 +0,0 @@ -{{- /* -Meaningful prefix for the job resource name. Must be under 52 chars in length to leave room for the 11 chars reserved for '-' and $_job_hash. -*/}} -{{- $_job_name_prefix := "mas_manage_ai_tenant" }} - -{{- /* -Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. -Included in $_job_hash (see below). -*/}} -{{- $_cli_image_digest := "sha256:834dffd4da534c01daea4e0a6d9db7d00a9ad9b18b054cc034985fcaceedeacd" }} - -{{- /* -A dict of values that influence the behaviour of the job in some way. -Any changes to values in this dict will trigger a rerun of the job. -Since jobs must be idemopotent, it's generally safe to pass in values here that are not -strictly necessary (i.e. including some values that don't actually influence job behaviour). -We may want to refine this further though for jobs that can take a long time to complete. -Included in $_job_hash (see below). -*/}} -{{- $_job_config_values := omit .Values "junitreporter" }} - -{{- /* -Increment this value whenever you make a change to an immutable field of the Job resource. -E.g. passing in a new environment variable. -Included in $_job_hash (see below). -*/}} -{{- $_job_version := "v3" }} - -{{- /* -10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest -This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an -immutable field of any existing Job resource. -*/}} -{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }} - -{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}} - -{{- /* -Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource. - -When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label -to identify old Job resources that should be pruned on behalf of ArgoCD. - -Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value -will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp") -Jobs will be automatically deleted. - -$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases -where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators -must be added to $_job_cleanup_group. - -By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators -are required here. - -*/}} -{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }} - - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: mas-manage-aiservice-job - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "309" - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: mas-manage-aiservice-job-role - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "310" -rules: - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "list", "watch"] - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: mas-manage-aiservice-job-rolebinding - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "311" -subjects: - - kind: ServiceAccount - name: mas-manage-aiservice-job - namespace: "{{ .Values.aibroker_namespace }}" -roleRef: - kind: Role - name: mas-manage-aiservice-job-role - apiGroup: rbac.authorization.k8s.io - ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ $_job_name }} - namespace: "{{ .Values.aibroker_namespace }}" - annotations: - argocd.argoproj.io/sync-wave: "312" - 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: - containers: - - name: mas-manage-aiservice-run - image: quay.io/ibmmas/cli@{{ $_cli_image_digest }} - imagePullPolicy: IfNotPresent - - env: - - name: ACCOUNT_ID - value: "{{ .Values.account_id }}" - - name: CLUSTER_ID - value: "{{ .Values.cluster_id }}" - - name: AIBROKER_INSTANCE_ID - value: "{{ .Values.aibroker_instance_id }}" - - - - name: SECRETS_KEY_SEPERATOR - value: "/" - - # Aibroker - - name: AIBROKER_TENANT - value: "{{ .Values.tenantNamespace }}" - - #aws - - name: SM_AWS_REGION - value: "{{ .Values.sm_aws_region }}" - - name: SM_AWS_ACCESS_KEY_ID - value: "{{ .Values.aws_access_key_id }}" - - name: SM_AWS_SECRET_ACCESS_KEY - value: "{{ .Values.aws_secret_access_key }}" - - # Hard-coded for now: - - name: AVP_TYPE - value: "aws" - - command: - - /bin/sh - - -c - - | - - set -e - - - - export SM_AWS_ACCESS_KEY_ID=$(cat /etc/mas/creds/suite_dns/sm_aws_access_key_id) - export SM_AWS_SECRET_ACCESS_KEY=$(cat /etc/mas/creds/suite_dns/sm_aws_secret_access_key) - - SECRETS_KEY_SEPERATOR="/" - SECRET_NAME_AISERVICE=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${AIBROKER_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}aiservice - - echo "" - echo "================================================================================" - echo "Settings" - echo "================================================================================" - echo "Account Id .......................... ${COLOR_MAGENTA}${ACCOUNT_ID}" - echo "Cluster Id .......................... ${COLOR_MAGENTA}${CLUSTER_ID}" - echo "AIBROKER Instance Id ..................... ${COLOR_MAGENTA}${AIBROKER_INSTANCE_ID}" - echo "MAS Workspace ID .................... ${COLOR_MAGENTA}${MAS_WORKSPACE_ID}" - echo "SM_AWS_REGION ....................... ${COLOR_MAGENTA}${SM_AWS_REGION}" - echo "SM_AWS_ACCESS_KEY_ID ................ ${COLOR_MAGENTA}${SM_AWS_ACCESS_KEY_ID:0:4}" - echo "SM_AWS_SECRET_ACCESS_KEY ............ ${COLOR_MAGENTA}${SM_AWS_SECRET_ACCESS_KEY:0:4}" - - echo "" - echo "================================================================================" - - echo "" - echo "================================================================================" - echo "Retrieve AIBroker API Key for tenant: ${AIBROKER_TENANT}" - echo "================================================================================" - - export AIBROKER_APIKEY=$(oc get secret ${AIBROKER_TENANT}----apikey-secret -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ - -o jsonpath="{.data.AIBROKER_APIKEY}" | base64 --decode) - - if [ -z "$AIBROKER_APIKEY" ]; then - echo "Failed to retrieve AIBroker API Key" - exit 1 - fi - - echo "AIBROKER_APIKEY = ${AIBROKER_APIKEY:0:4}" - - echo "===============================================================================" - echo "Retrieve TLS Secrets" - echo "===============================================================================" - export CA_CERT=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ - -o jsonpath="{.data.ca\\.crt}" | base64 --decode) - echo "CA_CERT = ${CA_CERT:0:20}" - - export TLS_CERT=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ - -o jsonpath="{.data.tls\\.crt}" | base64 --decode) - echo "TLS_CERT = ${TLS_CERT:0:20}" - - export TLS_KEY=$(oc get secret ${AIBROKER_INSTANCE_ID}-public-aibroker-tls -n mas-${AIBROKER_INSTANCE_ID}-aibroker \ - -o jsonpath="{.data.tls\\.key}" | base64 --decode) - echo "TLS_KEY = ${TLS_KEY:0:20}" - echo "===============================================================================" - - - - source /mascli/functions/gitops_utils - sm_login - TAGS="[{\"Key\": \"source\", \"Value\": \"mas-ai-service\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]" - # Update secret in Secrets Manager - echo "===============================================================================" - sm_update_secret $SECRET_NAME_AISERVICE "{\"aibroker_tenant\":\"$AIBROKER_TENANT\", \"aibroker_apikey\":\"$AIBROKER_APIKEY\", \"cas_cert\":\"$CA_CERT\", \"tls_cert\":\"$TLS_CERT\", \"tls_key\":\"$TLS_KEY\"}" "${TAGS}" || exit $? - echo "===============================================================================" - - - restartPolicy: Never - - serviceAccountName: mas-manage-aiservice-job - volumes: - - name: "mas-manage-aiservice" - secret: - secretName: "mas-manage-aiservice" - defaultMode: 420 - optional: false - - backoffLimit: 4 From 2d4852f54e1155ebb4019f50952f0db2da4ecd5f Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 19:55:23 +0530 Subject: [PATCH 471/491] Update 11-odh.yaml --- .../112-ibm-odh/templates/11-odh.yaml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/instance-applications/112-ibm-odh/templates/11-odh.yaml b/instance-applications/112-ibm-odh/templates/11-odh.yaml index 162beb0f2..6c4f6b94a 100644 --- a/instance-applications/112-ibm-odh/templates/11-odh.yaml +++ b/instance-applications/112-ibm-odh/templates/11-odh.yaml @@ -124,23 +124,6 @@ roleRef: name: odh-sa-knative-patch-role apiGroup: rbac.authorization.k8s.io ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: odh-sa-cluster-admin - annotations: - argocd.argoproj.io/sync-wave: "137" -subjects: - - kind: ServiceAccount - name: odh-sa - namespace: knative-serving -roleRef: - kind: ClusterRole - name: cluster-admin - apiGroup: rbac.authorization.k8s.io - - --- apiVersion: batch/v1 kind: Job From 6b7b1e932c872c34e30e4206705dc7b05372d25d Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 22:29:47 +0530 Subject: [PATCH 472/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index 38989d25f..a5c966acc 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,6 +1,7 @@ --- mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' +aibroker_instance_id: "aibroker_instance_id" # Minio mas_aibroker_minio_secret: "{{ mas_app_id }}-miniocfg" From 325e0a2f3425958e2591ef87367cd7b712cbb640 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 22:35:43 +0530 Subject: [PATCH 473/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 5bfbcbee3..0c2af59ca 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,12 +2,12 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "{{ .Values.aibroker_instance_id }}" + name: "aibroker-inst-1" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" - app.kubernetes.io/instance: "{{ .Values.aibroker_instance_id }}" + mas.ibm.com/instanceId: "aibroker-inst-1" + app.kubernetes.io/instance: "aibroker-inst-1" annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true From 50ab38b14392af33880e66a10a474faa355cf33a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 22:54:23 +0530 Subject: [PATCH 474/491] Revert "Update 09-aibroker-app.yaml" This reverts commit 325e0a2f3425958e2591ef87367cd7b712cbb640. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 0c2af59ca..5bfbcbee3 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,12 +2,12 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "aibroker-inst-1" + name: "{{ .Values.aibroker_instance_id }}" namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "aibroker-inst-1" - app.kubernetes.io/instance: "aibroker-inst-1" + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" + app.kubernetes.io/instance: "{{ .Values.aibroker_instance_id }}" annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true From 46743979a27632e10072695e0c5c42e730632a62 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 23:29:47 +0530 Subject: [PATCH 475/491] Update values.yaml --- instance-applications/113-ibm-aibroker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/values.yaml b/instance-applications/113-ibm-aibroker/values.yaml index a5c966acc..543a0e723 100644 --- a/instance-applications/113-ibm-aibroker/values.yaml +++ b/instance-applications/113-ibm-aibroker/values.yaml @@ -1,7 +1,7 @@ --- mas_instance_id: "sremat" aibroker_namespace: 'mas-{{ mas_instance_id }}-aibroker' -aibroker_instance_id: "aibroker_instance_id" +aibroker_instance_id: "AIBROKER_INSTANCE_ID" # Minio mas_aibroker_minio_secret: "{{ mas_app_id }}-miniocfg" From 70548c6509ced7ade6cad144ae81734d325d093e Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 23:34:05 +0530 Subject: [PATCH 476/491] Update 09-aibroker-app.yaml --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 5bfbcbee3..c0bf71d1f 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,12 +2,12 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: "{{ .Values.aibroker_instance_id }}" - namespace: "{{ .Values.aibroker_namespace }}" + name: {{ .Values.aibroker_instance_id }} + namespace: {{ .Values.aibroker_namespace }} labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" - app.kubernetes.io/instance: "{{ .Values.aibroker_instance_id }}" + mas.ibm.com/instanceId: {{ .Values.aibroker_instance_id }} + app.kubernetes.io/instance: {{ .Values.aibroker_instance_id }} annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true From 22028a288f879e78be6bd72a1801ffd8bd965ebf Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 23:39:57 +0530 Subject: [PATCH 477/491] Revert "Update 09-aibroker-app.yaml" This reverts commit 70548c6509ced7ade6cad144ae81734d325d093e. --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index c0bf71d1f..5bfbcbee3 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -2,12 +2,12 @@ apiVersion: apps.mas.ibm.com/v1 kind: AiBrokerApp metadata: - name: {{ .Values.aibroker_instance_id }} - namespace: {{ .Values.aibroker_namespace }} + name: "{{ .Values.aibroker_instance_id }}" + namespace: "{{ .Values.aibroker_namespace }}" labels: mas.ibm.com/applicationId: aibroker - mas.ibm.com/instanceId: {{ .Values.aibroker_instance_id }} - app.kubernetes.io/instance: {{ .Values.aibroker_instance_id }} + mas.ibm.com/instanceId: "{{ .Values.aibroker_instance_id }}" + app.kubernetes.io/instance: "{{ .Values.aibroker_instance_id }}" annotations: argocd.argoproj.io/sync-wave: "149" argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true From 71fa19e9068842e855ce8be487b86eea03723350 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 23:43:02 +0530 Subject: [PATCH 478/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 9afbc2daa..3d0645d99 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -256,7 +256,7 @@ ibm_aibroker: environment_type: "environment_type" ibm_aibroker_tenant: - aibroker_instance_id: "aibroker_instance_id" + aibroker_instance_id: aibroker_instance_id aibroker_namespace: 'mas-{{ aibroker_instance_id }}-aibroker' ibm_entitlement_key: "" openshift_namespace: "openshift-operators" From 206bb7917636ff41bd334f7caea0717c0a2b0564 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Tue, 15 Jul 2025 23:44:18 +0530 Subject: [PATCH 479/491] Update values.yaml --- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 3d0645d99..028d9ff8a 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -168,7 +168,7 @@ ibm_kmodel: mas_icr_cp: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local" ibm_aibroker: - aibroker_instance_id: "aibroker_instance_id" + aibroker_instance_id: aibroker_instance_id aibroker_namespace: 'mas-{{ aibroker_instance_id }}-aibroker' mas_aibroker_minio_secret: "mas_aibroker_minio_secret" # Minio From 3f5c1151c78e02bee9baaa701f51899cdd4659e2 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 10:30:16 +0530 Subject: [PATCH 480/491] MASSREMAT-178 remove minio --- .../111-ibm-minio/Chart.yaml | 11 --- instance-applications/111-ibm-minio/README.md | 3 - .../111-ibm-minio/templates/02-minio-pvc.yaml | 16 ---- .../templates/03-minio-deployment.yaml | 37 ---------- .../templates/04-minio-service.yaml | 21 ------ .../templates/05-minio-route.yaml | 18 ----- .../111-ibm-minio/values.yaml | 8 -- .../templates/020-ibm-minio-app.yaml | 73 ------------------- .../099-aibroker-instance-appset.yaml | 5 -- 9 files changed, 192 deletions(-) delete mode 100644 instance-applications/111-ibm-minio/Chart.yaml delete mode 100644 instance-applications/111-ibm-minio/README.md delete mode 100644 instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/04-minio-service.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/05-minio-route.yaml delete mode 100644 instance-applications/111-ibm-minio/values.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/instance-applications/111-ibm-minio/Chart.yaml b/instance-applications/111-ibm-minio/Chart.yaml deleted file mode 100644 index 9dbbe5d53..000000000 --- a/instance-applications/111-ibm-minio/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: ibm-minio -description: IBM MINIO -type: application -version: 1.0.0 - -dependencies: -- name: junitreporter - version: 1.0.0 - repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/README.md b/instance-applications/111-ibm-minio/README.md deleted file mode 100644 index 626328773..000000000 --- a/instance-applications/111-ibm-minio/README.md +++ /dev/null @@ -1,3 +0,0 @@ -IBM minio -=============================================================================== -Deploy and configure minio storage with configurable version \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml deleted file mode 100644 index 98cea5a16..000000000 --- a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: minio-pvc - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "112" -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - storageClassName: {{ .Values.minio_storage_class }} - resources: - requests: - storage: {{ .Values.minio_storage_size }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml deleted file mode 100644 index 041c983e1..000000000 --- a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.minio_instance_name }} - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "113" -spec: - selector: - matchLabels: - app: {{ .Values.minio_instance_name }} - template: - metadata: - labels: - app: {{ .Values.minio_instance_name }} - spec: - volumes: - - name: storage - persistentVolumeClaim: - claimName: minio-pvc - containers: - - name: {{ .Values.minio_instance_name }} - image: {{ .Values.minio_image }} - command: - - /bin/bash - - -c - args: - - minio server /data --console-address :9090 - env: - - name: MINIO_ROOT_USER - value: {{ .Values.minio_root_user }} - - name: MINIO_ROOT_PASSWORD - value: {{ .Values.minio_root_password }} - volumeMounts: - - mountPath: /data - name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml deleted file mode 100644 index b8186336f..000000000 --- a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: minio-service - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "114" -spec: - type: ClusterIP - ports: - - name: api - port: 9000 - targetPort: 9000 - protocol: TCP - - name: console - port: 9090 - targetPort: 9090 - protocol: TCP - selector: - app: {{ .Values.minio_instance_name }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml deleted file mode 100644 index e7ddc8b8b..000000000 --- a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -kind: Route -apiVersion: route.openshift.io/v1 -metadata: - name: minio-route - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "115" -spec: - to: - kind: Service - name: minio-service - weight: 100 - port: - targetPort: 9090 - tls: - termination: edge - insecureEdgeTerminationPolicy: None \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml deleted file mode 100644 index 4f0508e40..000000000 --- a/instance-applications/111-ibm-minio/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -minio_namespace: "minio" -minio_instance_name: "minio" -minio_root_user: "minio" -minio_root_password: "" -minio_storage_class: "default" -minio_storage_size: "40Gi" -minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml deleted file mode 100644 index a41a21b41..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ /dev/null @@ -1,73 +0,0 @@ -{{- if not (empty .Values.ibm_minio) }} ---- -# IBM Maximo Minio -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "020" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_minio.minio_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/111-ibm-minio - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" - minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" - minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" - minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" - minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" - minio_image: "{{ .Values.ibm_minio.minio_image }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-minio-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: minioapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 80b7e67be..5f7d15547 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -29,11 +29,6 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-minio.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From 310cd860855ebd5985b130c3e6505c2eb1a98993 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 10:38:43 +0530 Subject: [PATCH 481/491] Revert "MASSREMAT-178" This reverts commit 3f5c1151c78e02bee9baaa701f51899cdd4659e2. --- .../111-ibm-minio/Chart.yaml | 11 +++ instance-applications/111-ibm-minio/README.md | 3 + .../111-ibm-minio/templates/02-minio-pvc.yaml | 16 ++++ .../templates/03-minio-deployment.yaml | 37 ++++++++++ .../templates/04-minio-service.yaml | 21 ++++++ .../templates/05-minio-route.yaml | 18 +++++ .../111-ibm-minio/values.yaml | 8 ++ .../templates/020-ibm-minio-app.yaml | 73 +++++++++++++++++++ .../099-aibroker-instance-appset.yaml | 5 ++ 9 files changed, 192 insertions(+) create mode 100644 instance-applications/111-ibm-minio/Chart.yaml create mode 100644 instance-applications/111-ibm-minio/README.md create mode 100644 instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml create mode 100644 instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml create mode 100644 instance-applications/111-ibm-minio/templates/04-minio-service.yaml create mode 100644 instance-applications/111-ibm-minio/templates/05-minio-route.yaml create mode 100644 instance-applications/111-ibm-minio/values.yaml create mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/instance-applications/111-ibm-minio/Chart.yaml b/instance-applications/111-ibm-minio/Chart.yaml new file mode 100644 index 000000000..9dbbe5d53 --- /dev/null +++ b/instance-applications/111-ibm-minio/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-minio +description: IBM MINIO +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/README.md b/instance-applications/111-ibm-minio/README.md new file mode 100644 index 000000000..626328773 --- /dev/null +++ b/instance-applications/111-ibm-minio/README.md @@ -0,0 +1,3 @@ +IBM minio +=============================================================================== +Deploy and configure minio storage with configurable version \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml new file mode 100644 index 000000000..98cea5a16 --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml @@ -0,0 +1,16 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: minio-pvc + namespace: {{ .Values.minio_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "112" +spec: + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + storageClassName: {{ .Values.minio_storage_class }} + resources: + requests: + storage: {{ .Values.minio_storage_size }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml new file mode 100644 index 000000000..041c983e1 --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml @@ -0,0 +1,37 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.minio_instance_name }} + namespace: {{ .Values.minio_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "113" +spec: + selector: + matchLabels: + app: {{ .Values.minio_instance_name }} + template: + metadata: + labels: + app: {{ .Values.minio_instance_name }} + spec: + volumes: + - name: storage + persistentVolumeClaim: + claimName: minio-pvc + containers: + - name: {{ .Values.minio_instance_name }} + image: {{ .Values.minio_image }} + command: + - /bin/bash + - -c + args: + - minio server /data --console-address :9090 + env: + - name: MINIO_ROOT_USER + value: {{ .Values.minio_root_user }} + - name: MINIO_ROOT_PASSWORD + value: {{ .Values.minio_root_password }} + volumeMounts: + - mountPath: /data + name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml new file mode 100644 index 000000000..b8186336f --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: minio-service + namespace: {{ .Values.minio_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "114" +spec: + type: ClusterIP + ports: + - name: api + port: 9000 + targetPort: 9000 + protocol: TCP + - name: console + port: 9090 + targetPort: 9090 + protocol: TCP + selector: + app: {{ .Values.minio_instance_name }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml new file mode 100644 index 000000000..e7ddc8b8b --- /dev/null +++ b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml @@ -0,0 +1,18 @@ +--- +kind: Route +apiVersion: route.openshift.io/v1 +metadata: + name: minio-route + namespace: {{ .Values.minio_namespace }} + annotations: + argocd.argoproj.io/sync-wave: "115" +spec: + to: + kind: Service + name: minio-service + weight: 100 + port: + targetPort: 9090 + tls: + termination: edge + insecureEdgeTerminationPolicy: None \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml new file mode 100644 index 000000000..4f0508e40 --- /dev/null +++ b/instance-applications/111-ibm-minio/values.yaml @@ -0,0 +1,8 @@ +--- +minio_namespace: "minio" +minio_instance_name: "minio" +minio_root_user: "minio" +minio_root_password: "" +minio_storage_class: "default" +minio_storage_size: "40Gi" +minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml new file mode 100644 index 000000000..a41a21b41 --- /dev/null +++ b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml @@ -0,0 +1,73 @@ +{{- if not (empty .Values.ibm_minio) }} +--- +# IBM Maximo Minio +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + cluster: '{{ .Values.cluster.id }}' + instance: '{{ .Values.instance.id }}' + annotations: + argocd.argoproj.io/sync-wave: "020" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: "{{ .Values.ibm_minio.minio_namespace }}" + source: + repoURL: "{{ .Values.source.repo_url }}" + path: instance-applications/111-ibm-minio + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" + minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" + minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" + minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" + minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" + minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" + minio_image: "{{ .Values.ibm_minio.minio_image }}" + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + junitreporter: + reporter_name: "ibm-minio-{{ .Values.instance.id }}" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + - name: ARGOCD_APP_NAME + value: minioapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + managedNamespaceMetadata: + labels: +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} +{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 5f7d15547..80b7e67be 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -29,6 +29,11 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-minio.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From c530f280d5af44576abfb717f6a7d3b95daca397 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 10:54:16 +0530 Subject: [PATCH 482/491] update secret name minio to storage --- .../113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml | 2 +- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- .../114-ibm-kmodels/templates/07-kmodel-controller.yaml | 4 ---- root-applications/ibm-aibroker-instance-root/values.yaml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml index 3f97868f8..5acd302d2 100644 --- a/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.mas_aibroker_minio_secret }}" + name: "{{ .Values.mas_aibroker_storage_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "140" diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 5bfbcbee3..08cf58b16 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -31,7 +31,7 @@ spec: minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" - credentials_secret: "{{ .Values.mas_aibroker_minio_secret }}" + credentials_secret: "{{ .Values.mas_aibroker_storage_secret }}" mariadb: host: "{{ .Values.mas_aibroker_db_host }}" port: "{{ .Values.mas_aibroker_db_port }}" diff --git a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml index 177433204..2218aa925 100644 --- a/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml +++ b/instance-applications/114-ibm-kmodels/templates/07-kmodel-controller.yaml @@ -38,9 +38,6 @@ metadata: argocd.argoproj.io/sync-wave: "179" spec: ports: - - name: http - port: 3000 - targetPort: http - name: https port: 8443 targetPort: https @@ -48,7 +45,6 @@ spec: app: km-controller type: ClusterIP - --- apiVersion: v1 kind: PersistentVolumeClaim diff --git a/root-applications/ibm-aibroker-instance-root/values.yaml b/root-applications/ibm-aibroker-instance-root/values.yaml index 028d9ff8a..59b5bef53 100644 --- a/root-applications/ibm-aibroker-instance-root/values.yaml +++ b/root-applications/ibm-aibroker-instance-root/values.yaml @@ -170,7 +170,7 @@ ibm_kmodel: ibm_aibroker: aibroker_instance_id: aibroker_instance_id aibroker_namespace: 'mas-{{ aibroker_instance_id }}-aibroker' - mas_aibroker_minio_secret: "mas_aibroker_minio_secret" + mas_aibroker_storage_secret: "mas_aibroker_storage_secret" # Minio mas_aibroker_storage_accesskey: "mas_aibroker_storage_accesskey" mas_aibroker_storage_secretkey: "mas_aibroker_storage_secretkey" From 9a479b249c83c8068bc5de6018be66d875e269b4 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 10:54:41 +0530 Subject: [PATCH 483/491] Reapply "MASSREMAT-178" This reverts commit 310cd860855ebd5985b130c3e6505c2eb1a98993. --- .../111-ibm-minio/Chart.yaml | 11 --- instance-applications/111-ibm-minio/README.md | 3 - .../111-ibm-minio/templates/02-minio-pvc.yaml | 16 ---- .../templates/03-minio-deployment.yaml | 37 ---------- .../templates/04-minio-service.yaml | 21 ------ .../templates/05-minio-route.yaml | 18 ----- .../111-ibm-minio/values.yaml | 8 -- .../templates/020-ibm-minio-app.yaml | 73 ------------------- .../099-aibroker-instance-appset.yaml | 5 -- 9 files changed, 192 deletions(-) delete mode 100644 instance-applications/111-ibm-minio/Chart.yaml delete mode 100644 instance-applications/111-ibm-minio/README.md delete mode 100644 instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/04-minio-service.yaml delete mode 100644 instance-applications/111-ibm-minio/templates/05-minio-route.yaml delete mode 100644 instance-applications/111-ibm-minio/values.yaml delete mode 100644 root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml diff --git a/instance-applications/111-ibm-minio/Chart.yaml b/instance-applications/111-ibm-minio/Chart.yaml deleted file mode 100644 index 9dbbe5d53..000000000 --- a/instance-applications/111-ibm-minio/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: ibm-minio -description: IBM MINIO -type: application -version: 1.0.0 - -dependencies: -- name: junitreporter - version: 1.0.0 - repository: "file://../../sub-charts/junitreporter/" - condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/README.md b/instance-applications/111-ibm-minio/README.md deleted file mode 100644 index 626328773..000000000 --- a/instance-applications/111-ibm-minio/README.md +++ /dev/null @@ -1,3 +0,0 @@ -IBM minio -=============================================================================== -Deploy and configure minio storage with configurable version \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml b/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml deleted file mode 100644 index 98cea5a16..000000000 --- a/instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: minio-pvc - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "112" -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - storageClassName: {{ .Values.minio_storage_class }} - resources: - requests: - storage: {{ .Values.minio_storage_size }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml b/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml deleted file mode 100644 index 041c983e1..000000000 --- a/instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.minio_instance_name }} - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "113" -spec: - selector: - matchLabels: - app: {{ .Values.minio_instance_name }} - template: - metadata: - labels: - app: {{ .Values.minio_instance_name }} - spec: - volumes: - - name: storage - persistentVolumeClaim: - claimName: minio-pvc - containers: - - name: {{ .Values.minio_instance_name }} - image: {{ .Values.minio_image }} - command: - - /bin/bash - - -c - args: - - minio server /data --console-address :9090 - env: - - name: MINIO_ROOT_USER - value: {{ .Values.minio_root_user }} - - name: MINIO_ROOT_PASSWORD - value: {{ .Values.minio_root_password }} - volumeMounts: - - mountPath: /data - name: storage \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml b/instance-applications/111-ibm-minio/templates/04-minio-service.yaml deleted file mode 100644 index b8186336f..000000000 --- a/instance-applications/111-ibm-minio/templates/04-minio-service.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: minio-service - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "114" -spec: - type: ClusterIP - ports: - - name: api - port: 9000 - targetPort: 9000 - protocol: TCP - - name: console - port: 9090 - targetPort: 9090 - protocol: TCP - selector: - app: {{ .Values.minio_instance_name }} \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml b/instance-applications/111-ibm-minio/templates/05-minio-route.yaml deleted file mode 100644 index e7ddc8b8b..000000000 --- a/instance-applications/111-ibm-minio/templates/05-minio-route.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -kind: Route -apiVersion: route.openshift.io/v1 -metadata: - name: minio-route - namespace: {{ .Values.minio_namespace }} - annotations: - argocd.argoproj.io/sync-wave: "115" -spec: - to: - kind: Service - name: minio-service - weight: 100 - port: - targetPort: 9090 - tls: - termination: edge - insecureEdgeTerminationPolicy: None \ No newline at end of file diff --git a/instance-applications/111-ibm-minio/values.yaml b/instance-applications/111-ibm-minio/values.yaml deleted file mode 100644 index 4f0508e40..000000000 --- a/instance-applications/111-ibm-minio/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -minio_namespace: "minio" -minio_instance_name: "minio" -minio_root_user: "minio" -minio_root_password: "" -minio_storage_class: "default" -minio_storage_size: "40Gi" -minio_image: "quay.io/minio/minio:latest" \ No newline at end of file diff --git a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml deleted file mode 100644 index a41a21b41..000000000 --- a/root-applications/ibm-aibroker-instance-root/templates/020-ibm-minio-app.yaml +++ /dev/null @@ -1,73 +0,0 @@ -{{- if not (empty .Values.ibm_minio) }} ---- -# IBM Maximo Minio -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: minio.{{ .Values.cluster.id }}.{{ .Values.instance.id }} - namespace: {{ .Values.argo.namespace }} - labels: - environment: '{{ .Values.account.id }}' - cluster: '{{ .Values.cluster.id }}' - instance: '{{ .Values.instance.id }}' - annotations: - argocd.argoproj.io/sync-wave: "020" - healthCheckTimeout: "1800" - {{- if and .Values.notifications .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} - notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} - {{- end }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: "{{ .Values.argo.projects.apps }}" - destination: - server: {{ .Values.cluster.url }} - namespace: "{{ .Values.ibm_minio.minio_namespace }}" - source: - repoURL: "{{ .Values.source.repo_url }}" - path: instance-applications/111-ibm-minio - targetRevision: "{{ .Values.source.revision }}" - plugin: - name: {{ .Values.avp.name }} - env: - - name: {{ .Values.avp.values_varname }} - value: | - minio_namespace: "{{ .Values.ibm_minio.minio_namespace }}" - minio_instance_name: "{{ .Values.ibm_minio.minio_instance_name }}" - minio_root_user: "{{ .Values.ibm_minio.minio_root_user }}" - minio_root_password: "{{ .Values.ibm_minio.minio_root_password }}" - minio_storage_class: "{{ .Values.ibm_minio.minio_storage_class }}" - minio_storage_size: "{{ .Values.ibm_minio.minio_storage_size }}" - minio_image: "{{ .Values.ibm_minio.minio_image }}" - {{- if .Values.custom_labels }} - custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} - {{- end }} - junitreporter: - reporter_name: "ibm-minio-{{ .Values.instance.id }}" - cluster_id: "{{ .Values.cluster.id }}" - devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" - devops_build_number: "{{ .Values.devops.build_number }}" - gitops_version: "{{ .Values.source.revision }}" - - name: ARGOCD_APP_NAME - value: minioapp - {{- if not (empty .Values.avp.secret) }} - - name: AVP_SECRET - value: {{ .Values.avp.secret }} - {{- end }} - syncPolicy: - automated: - {{- if .Values.auto_delete }} - prune: true - {{- end }} - selfHeal: true - retry: - limit: 20 - syncOptions: - - CreateNamespace=true - managedNamespaceMetadata: - labels: -{{- if .Values.custom_labels }} -{{ .Values.custom_labels | toYaml | indent 8 }} -{{- end }} -{{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml index 80b7e67be..5f7d15547 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aibroker-instance-appset.yaml @@ -29,11 +29,6 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-aibroker-instance-base.yaml" - - git: - repoURL: "{{ .Values.generator.repo_url }}" - revision: "{{ .Values.generator.revision }}" - files: - - path: "{{ .Values.account.id }}/{{ .Values.cluster.id }}/*/ibm-minio.yaml" - git: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" From f482854dbdde81d8bff926d6f49a6030994f0b29 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 11:10:13 +0530 Subject: [PATCH 484/491] update argo app minio to storage secret name --- ...broker-minio-secret.yaml => 01-aibroker-storage-secret.yaml} | 0 .../templates/040-ibm-aibroker-app.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename instance-applications/113-ibm-aibroker/templates/{01-aibroker-minio-secret.yaml => 01-aibroker-storage-secret.yaml} (100%) diff --git a/instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml similarity index 100% rename from instance-applications/113-ibm-aibroker/templates/01-aibroker-minio-secret.yaml rename to instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml diff --git a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml index 2ffbd96bc..7951919b1 100644 --- a/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml +++ b/root-applications/ibm-aibroker-instance-root/templates/040-ibm-aibroker-app.yaml @@ -37,7 +37,7 @@ spec: aibroker_namespace: "{{ .Values.ibm_aibroker.aibroker_namespace }}" aibroker_instance_id: "{{ .Values.ibm_aibroker.aibroker_instance_id }}" - mas_aibroker_minio_secret: "{{ .Values.ibm_aibroker.mas_aibroker_minio_secret }}" + mas_aibroker_storage_secret: "{{ .Values.ibm_aibroker.mas_aibroker_storage_secret }}" mas_aibroker_mariadb_secret: "{{ .Values.ibm_aibroker.mas_aibroker_mariadb_secret }}" mas_aibroker_db_user: "{{ .Values.ibm_aibroker.mas_aibroker_db_user }}" mas_aibroker_db_secret_value: "{{ .Values.ibm_aibroker.mas_aibroker_db_secret_value }}" From c4a83f9097641b69493adc7e781ee0b97c6f1d9b Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 11:13:17 +0530 Subject: [PATCH 485/491] Update 01-aibroker-storage-secret.yaml --- .../113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml index 5acd302d2..b44c58ceb 100644 --- a/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ .Values.mas_aibroker_storage_secret }}" + name: "storage_secret" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "140" From 38df35b07092aa15d1b0fb5daae2332b035c9374 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 11:14:11 +0530 Subject: [PATCH 486/491] Revert "Update 01-aibroker-storage-secret.yaml" This reverts commit c4a83f9097641b69493adc7e781ee0b97c6f1d9b. --- .../113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml b/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml index b44c58ceb..5acd302d2 100644 --- a/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/01-aibroker-storage-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "storage_secret" + name: "{{ .Values.mas_aibroker_storage_secret }}" namespace: "{{ .Values.aibroker_namespace }}" annotations: argocd.argoproj.io/sync-wave: "140" From a26250a3d036635ec4cf5add3b58783da6e7a9d3 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 11:22:53 +0530 Subject: [PATCH 487/491] update minio to storage --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 08cf58b16..3a1e1a437 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -28,7 +28,7 @@ spec: in_saas_env: "{{ .Values.in_saas_env }}" is_external_route: "{{ .Values.is_external_route }}" - minio: + storage: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" credentials_secret: "{{ .Values.mas_aibroker_storage_secret }}" From a97aa08d532c43e2f0ed6756af8b1aed0549d87a Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 15:22:07 +0530 Subject: [PATCH 488/491] update storage to minio --- .../113-ibm-aibroker/templates/09-aibroker-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml index 3a1e1a437..08cf58b16 100644 --- a/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml +++ b/instance-applications/113-ibm-aibroker/templates/09-aibroker-app.yaml @@ -28,7 +28,7 @@ spec: in_saas_env: "{{ .Values.in_saas_env }}" is_external_route: "{{ .Values.is_external_route }}" - storage: + minio: host: "{{ .Values.mas_aibroker_storage_host }}" port: "{{ .Values.mas_aibroker_storage_port }}" credentials_secret: "{{ .Values.mas_aibroker_storage_secret }}" From 0e72c6e773a51e53c817193a2031131d4340b0de Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 15:25:28 +0530 Subject: [PATCH 489/491] Revert "Merge branch 'gitops-argocd-review-demo' of https://github.com/ibm-mas/gitops into gitops-argocd-review-demo" This reverts commit bcb4dc6ff7c536b5de709bc021d357b5abf97f09, reversing changes made to a97aa08d532c43e2f0ed6756af8b1aed0549d87a. --- .../000-job-cleaner/templates/04-jobcleaner_CronJob.yaml | 2 +- .../templates/04-postsync-update-sm_Job.yaml | 2 +- .../020-ibm-dro/templates/08-postsync-update-sm_Job.yaml | 2 +- .../templates/postdelete-MarketplaceConfigs.yaml | 2 +- .../templates/postdelete-ProfileBundles.yaml | 2 +- .../055-instana-agent-operator/templates/08-CronJob.yaml | 2 +- .../060-custom-sa/templates/04-postsync-update-sm_Job.yaml | 2 +- .../200-cluster-promotion/templates/02-cluster-verify_Job.yaml | 2 +- .../templates/03-cluster-promoter_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml | 2 +- .../010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml | 2 +- .../templates/PostDelete-aws-docdb-remove-user_Job.yaml | 2 +- .../100-ibm-sls/templates/07-postsync-update-sm_Job.yaml | 2 +- .../101-ibm-sync-jobs-cp4d/templates/00-ibm-cp4d-presync.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 2 +- .../templates/04-ibm-cp4d_upg_cleanup.yaml | 2 +- .../110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml | 2 +- .../110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml | 2 +- .../110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml | 2 +- .../110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml | 2 +- .../templates/00-presync-await-crd_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml | 2 +- .../templates/07-postsync-setup-db2_Job.yaml | 2 +- .../120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml | 2 +- .../120-ibm-spark/templates/02-ibm-spark-control-plane.yaml | 2 +- .../120-ibm-spss/templates/02-ibm-spss-post-verify.yaml | 2 +- .../120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml | 2 +- .../templates/00-presync-create-db2-user_Job.yaml | 2 +- .../130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-db2-user_Job.yaml | 2 +- .../130-ibm-kafka-config/templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml | 2 +- .../130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml | 2 +- .../templates/06-postsync-configtool-oidc.yaml | 2 +- .../templates/postdelete-delete-cr.yaml | 2 +- .../templates/05-postsync-add-label_Job.yaml | 2 +- .../templates/00-presync-add-mvi-scc_Job.yaml | 2 +- .../templates/06-postsync-add-mvi-scc_Job.yaml | 2 +- .../templates/02-ibm-manage-update_Job.yaml | 2 +- .../templates/04-postsync-add-label_Job.yaml | 2 +- .../templates/04-postsync-manage-sanity.yaml | 2 +- .../templates/04-postsync-manage-verify.yaml | 2 +- .../templates/04-postsync-maximoit-sanity.yaml | 2 +- .../templates/04-postsync-maximoit-verify.yaml | 2 +- .../templates/04-postsync-mvi-sanity.yaml | 2 +- .../templates/04-postsync-mvi-verify.yaml | 2 +- .../templates/700-702-postsync-db2-manage.yaml | 2 +- .../templates/001-ibm-create-initial-users.yaml | 2 +- .../junitreporter/templates/00-presync-report-starter.yaml | 2 +- .../junitreporter/templates/10-postsync-report-starter.yaml | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml index c0bc4c3a5..3893c523b 100644 --- a/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml +++ b/cluster-applications/000-job-cleaner/templates/04-jobcleaner_CronJob.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- $ns := "job-cleaner" }} diff --git a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml index 95527f8f5..6c1060cdb 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/04-postsync-update-sm_Job.yaml @@ -17,7 +17,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml index 41cf2ff9d..5aec5b594 100644 --- a/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml +++ b/cluster-applications/020-ibm-dro/templates/08-postsync-update-sm_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml index 245a92501..e47ddd82d 100644 --- a/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml +++ b/cluster-applications/021-ibm-dro-cleanup/templates/postdelete-MarketplaceConfigs.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $job_name := "postdelete-delete-marketplaceconfigs-job" }} diff --git a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml index 0e302a19e..167fc8b72 100644 --- a/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml +++ b/cluster-applications/041-cis-compliance-cleanup/templates/postdelete-ProfileBundles.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $job_name := "postdelete-delete-profilebundles-job" }} diff --git a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml index c66b78f2b..ca1d80d18 100644 --- a/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml +++ b/cluster-applications/055-instana-agent-operator/templates/08-CronJob.yaml @@ -2,7 +2,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} --- diff --git a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml index b45a9499b..a205d61b8 100644 --- a/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml +++ b/cluster-applications/060-custom-sa/templates/04-postsync-update-sm_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml index ab174f286..34a59fae3 100644 --- a/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml +++ b/cluster-applications/200-cluster-promotion/templates/02-cluster-verify_Job.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml index b12142197..a236d04ca 100644 --- a/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml +++ b/cluster-applications/200-cluster-promotion/templates/03-cluster-promoter_Job.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml index 8fdcf6e4c..55b7f03d8 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/00-aws-docdb-add-user_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml index 8ce1c72e3..574703eb1 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_certs_Job.yaml @@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:834dffd4da534c01daea4e0a6d9db7d00a9ad9b18b054cc034985fcaceedeacd" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml index 7530ab617..863c856d0 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/01-ibm-mas_suite_dns_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:834dffd4da534c01daea4e0a6d9db7d00a9ad9b18b054cc034985fcaceedeacd" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml index 88c9b335c..1d9ae67d6 100644 --- a/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml +++ b/instance-applications/010-ibm-sync-jobs/templates/PostDelete-aws-docdb-remove-user_Job.yaml @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} # Deletes user "masinst_${MAS_INSTANCE_ID}" from docdb an deletes the acc/cluster/instance/mongo#password secret from AWS SM diff --git a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml index d17d15dfc..7482ba6db 100644 --- a/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml +++ b/instance-applications/100-ibm-sls/templates/07-postsync-update-sm_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/101-ibm-sync-jobs-cp4d/templates/00-ibm-cp4d-presync.yaml b/instance-applications/101-ibm-sync-jobs-cp4d/templates/00-ibm-cp4d-presync.yaml index d9c75a8d1..a0d55d203 100644 --- a/instance-applications/101-ibm-sync-jobs-cp4d/templates/00-ibm-cp4d-presync.yaml +++ b/instance-applications/101-ibm-sync-jobs-cp4d/templates/00-ibm-cp4d-presync.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index ab58c798f..265ee372a 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml index 4bd8398aa..0bbc274b3 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml index 49f09ba26..cd90a4cda 100644 --- a/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml +++ b/instance-applications/110-ibm-cp4d/templates/03-ibm-cp4d-mcs_patch_sa.yaml @@ -14,7 +14,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml index fa51f3717..65549492f 100644 --- a/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml +++ b/instance-applications/110-ibm-cp4d/templates/07-ibm-cp4d_patch_zenservice.yaml @@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml index 492fde560..0e8a35fdb 100644 --- a/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml +++ b/instance-applications/110-ibm-cp4d/templates/08-ibm-cp4d-post-verify.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index 870c94c49..6848393d8 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml index 70054684d..a9312adc0 100644 --- a/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/00-presync-await-crd_Job.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} --- # Service account that is authorized to read k8s secrets (needed by the job) diff --git a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml index 1ffc8366c..d85d82daa 100644 --- a/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/04-db2u-Backup_Cron.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} #apiVersion: batch/v1beta1 kind: CronJob diff --git a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml index df2bf8ab6..d4d2b29d9 100644 --- a/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/07-postsync-setup-db2_Job.yaml @@ -9,7 +9,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml index 8fb9123d1..d8f25611f 100644 --- a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml @@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml index f16d486e2..710d43d55 100644 --- a/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml +++ b/instance-applications/120-ibm-spark/templates/02-ibm-spark-control-plane.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml index af34cdd30..f718d966a 100644 --- a/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml +++ b/instance-applications/120-ibm-spss/templates/02-ibm-spss-post-verify.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml index c41a7d1ff..09b1e9449 100644 --- a/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml +++ b/instance-applications/120-ibm-wsl/templates/02-ibm-wsl-post-verify.yaml @@ -7,7 +7,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml index dd63cb193..841ba48ad 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-user_Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := printf "mas-%s-core" .Values.instance_id }} {{ $prefix := printf "pre-jdbc-usr-%s" .Values.mas_config_name }} diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml index fcaf02159..2d049351d 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml index 14430e733..63c2b2c28 100644 --- a/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml +++ b/instance-applications/130-ibm-jdbc-config/templates/postdelete-delete-db2-user_Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := printf "mas-%s-syncres" .Values.instance_id }} {{ $prefix := printf "post-jdbc-usr-%s" .Values.mas_config_name }} diff --git a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml index abb5c2775..ac634200e 100644 --- a/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-kafka-config/templates/postdelete-delete-cr.yaml @@ -18,7 +18,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} --- apiVersion: batch/v1 diff --git a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml index 77d84ae46..bd1742270 100644 --- a/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-bas-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml index 77d84ae46..bd1742270 100644 --- a/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-idp-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml index 64b90042b..2c746f714 100644 --- a/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-mongo-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml index 77d84ae46..bd1742270 100644 --- a/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-sls-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml index 77d84ae46..bd1742270 100644 --- a/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-mas-smtp-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml index 7b9e6ff32..e6d30b6f9 100644 --- a/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/05-postsync-add-label_Job.yaml @@ -8,7 +8,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml index bcba59d03..055ae843a 100644 --- a/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/06-postsync-configtool-oidc.yaml @@ -10,7 +10,7 @@ Meaningful prefix for the job resource name. Must be under 52 chars in length to Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml index 77d84ae46..bd1742270 100644 --- a/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml +++ b/instance-applications/130-ibm-objectstorage-config/templates/postdelete-delete-cr.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $cr_name := .Values.mas_config_name }} {{ $cr_kind := .Values.mas_config_kind }} diff --git a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml index 077c0f726..0f638da25 100644 --- a/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml +++ b/instance-applications/220-ibm-mas-workspace/templates/05-postsync-add-label_Job.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} --- # Permit outbound communication by the Job pods diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml index 9b2d20ff8..71a509388 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/00-presync-add-mvi-scc_Job.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml index 549aaa044..2ee0fa566 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/06-postsync-add-mvi-scc_Job.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml index bdb996566..b7eeaf9ba 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/02-ibm-manage-update_Job.yaml @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} {{ $prefix := printf "%s-manage-update" .Values.mas_workspace_id}} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml index 755334c82..9e90a4931 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-add-label_Job.yaml @@ -1,7 +1,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} {{ $job_label := "mas-app-route-patch" }} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml index 605efdc51..ba89d1400 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources # in the application. This type of test should only be run in a downstream environment such as a dev or staging env diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml index 1b376d71c..28ee02903 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources # in the application. This type of test is run on every environment and allows a layer of verification of the app diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml index d51467cb8..3171dca29 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-sanity.yaml @@ -5,7 +5,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} # A sanity test is one that can be disruptive i.e. it can create new users, call authenticated apis, creates resources # in the application. This type of test should only be run in a downstream environment such as a dev or staging env diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml index 33cf46dd9..5a17199e8 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-maximoit-verify.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} # A verify test is one that is non disruptive i.e. it won't create new users, i won't call authenticated apis, and it won't creates resources # in the application. This type of test is run on every environment and allows a layer of verification of the app diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml index bfd40b3e1..b7358f70c 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-sanity.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} {{ $np_name := "postsync-sanity-mvi-np" }} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml index 2ccc08146..c95c3407f 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-mvi-verify.yaml @@ -4,7 +4,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $ns := .Values.mas_app_namespace }} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml index 33d2dae60..2fe64cd73 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/700-702-postsync-db2-manage.yaml @@ -86,7 +86,7 @@ will take care of differentiating the jobs. Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. Included in $_job_hash (see below). */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml index a1ecc3393..3c0ba4a9b 100644 --- a/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml +++ b/instance-applications/600-ibm-post-sync-jobs/templates/001-ibm-create-initial-users.yaml @@ -11,7 +11,7 @@ Use the build/bin/set-cli-image-tag.sh script to update this value across all ch Included in $_job_hash (see below). 13.22.1-amd64 - includes mas-devops-create-initial-users script from https://github.com/ibm-mas/python-devops/pull/66 */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:3735885b3b9d46fcf6408c008768cc04faf2e28c1fa5f6da7c5f969931e2d3cd" }} {{- /* A dict of values that influence the behaviour of the job in some way. diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml index c6bd4a5ef..2365f966e 100644 --- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml +++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }} diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml index d18c0a0a4..22effdd9e 100644 --- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml +++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml @@ -3,7 +3,7 @@ {{- /* Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. */}} -{{- $_cli_image_digest := "sha256:c8e641b941a6f10cab9a8e3dec157120e85c9389d3b2d0ac4125b85e85e634a2" }} +{{- $_cli_image_digest := "sha256:b3ecce096368c967bbc6bac2f074473a65418462417b6e550ad4777427c3b06b" }} {{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }} From 09e076f509c5c290b1af20005de1be3d92b241e1 Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 16:01:53 +0530 Subject: [PATCH 490/491] Update 02-aibroker-mariadb-secret.yaml --- .../113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml index e44455a2b..7d698bfd6 100644 --- a/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml +++ b/instance-applications/113-ibm-aibroker/templates/02-aibroker-mariadb-secret.yaml @@ -9,4 +9,4 @@ metadata: stringData: username: "{{ .Values.mas_aibroker_db_user }}" password: "{{ .Values.mas_aibroker_db_secret_value }}" -type: Opaque \ No newline at end of file +type: Opaque From e30c583142b07b7457ee9f0ce6583a22b34bd4ca Mon Sep 17 00:00:00 2001 From: yogeshkumar Date: Fri, 18 Jul 2025 17:16:02 +0530 Subject: [PATCH 491/491] Update 06-aibroker-dro.yaml --- .../113-ibm-aibroker/templates/06-aibroker-dro.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml index 87b1f52e8..19bc09002 100644 --- a/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml +++ b/instance-applications/113-ibm-aibroker/templates/06-aibroker-dro.yaml @@ -22,3 +22,4 @@ stringData: ca.crt: "{{ .Values.drocfg_ca }}" type: Opaque +