[patch] refactor for new AI Service tenant operator

instance-applications/113-ibm-aiservice/values.yaml

@@ -26,10 +26,6 @@ mas_aiservice_storage_secretkey: "MAS_AISERVICE_STORAGE_SECRETKEY"
 mas_aiservice_storage_host: "true"
 mas_aiservice_storage_port: "true"
 
-# SLS
-mas_aiservice_sls_registration_key_secret: "sls-registration-key"
-
-
 mas_aiservice_db_host: "MAS_AISERVICE_DB_HOST"
 mas_aiservice_db_port: "MAS_AISERVICE_DB_PORT"
 mas_aiservice_db_secret_name: "MAS_AISERVICE_DB_SECRET_NAME"
@@ -39,8 +35,6 @@ mas_aiservice_storage_pipelines_bucket: "MAS_AISERVICE_STORAGE_PIPELINES_BUCKET"
 mas_aiservice_storage_tenants_bucket: "MAS_AISERVICE_STORAGE_TENANTS_BUCKET"
 mas_aiservice_storage_templates_bucket: "MAS_AISERVICE_STORAGE_TEMPLATES_BUCKET"
 
-slscfg_registration_key: "slscfg_registration_key"
-
 #  DRO
 mas_aiservice_dro_token_secret: "dro-token"
 mas_aiservice_dro_cacert_secret: "dro-certificates"

instance-applications/113-ibm-aiservice/templates/02-aiservice-sls-secret.yaml → instance-applications/115-ibm-aiservice-tenant/templates/02-aiservice-sls-secret.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "{{ .Values.aiservice_sls_registration_key_secret }}"
-  namespace: "{{ .Values.aiservice_namespace }}"
+  name: "{{ .Values.tenantNamespace }}----sls-secret"
+  namespace: "{{ .Values.tenantNamespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "141"
 type: Opaque

instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-workspace.yaml

@@ -3,7 +3,7 @@ apiVersion: aiservice.ibm.com/v1
 kind: AIServiceTenant
 metadata:
   name: "{{ .Values.tenantNamespace }}"
-  namespace: "{{ .Values.aiservice_namespace }}"
+  namespace: "{{ .Values.tenantNamespace }}"
   annotations:
     argocd.argoproj.io/sync-wave: "307"
     ansible.sdk.operatorframework.io/verbosity: "{{ .Values.aiservice_operator_log_level }}"
@@ -43,4 +43,4 @@ spec:
       entitlement:
           type: "{{ .Values.tenant_entitlement_type }}"
           startDate: "{{ .Values.tenant_entitlement_start_date }}"
-          endDate: "{{ .Values.tenant_entitlement_end_date }}"
+          endDate: "{{ .Values.tenant_entitlement_end_date }}"

instance-applications/115-ibm-aiservice-tenant/templates/09-aiservice-tenant-operator-subscription.yaml

@@ -0,0 +1,40 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ibm-entitlement
+  namespace: "{{ .Values.tenantNamespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "308"
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: "{{ .Values.artifactory_token}}"
+
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: "{{ .Values.tenantNamespace }}"
+  namespace: "{{ .Values.tenantNamespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "308"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  targetNamespaces:
+    - "{{ .Values.tenantNamespace }}"
+
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: ibm-aiservice-tenant
+  namespace: "{{ .Values.tenantNamespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "308"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  channel: "{{ .Values.aiservice_channel }}"
+  installPlanApproval: Automatic
+  name: ibm-aiservice-tenant
+  source: "{{ .Values.mas_catalog_source }}"
+  sourceNamespace: openshift-marketplace

root-applications/ibm-aiservice-instance-root/values.yaml

@@ -193,9 +193,6 @@ ibm_aiservice:
   mas_aiservice_storage_host: "true"
   mas_aiservice_storage_port: "true"
 
-  # SLS
-  mas_aiservice_sls_registration_key_secret: "sls-registration-key"
-
   mas_aiservice_db_host: "mas_aiservice_db_host"
   mas_aiservice_db_port: "mas_aiservice_db_port"
   mas_aiservice_db_secret_name: "mas_aiservice_db_secret_name"

root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml

@@ -25,7 +25,7 @@ spec:
   project: "{{ .Values.argo.projects.apps }}"
   destination:
     server: {{ .Values.cluster.url }}
-    namespace: "{{ .Values.ibm_aiservice_tenant.aiservice_namespace }}"
+    namespace: "{{ .Values.ibm_aiservice_tenant.tenantNamespace }}"
   source:
     repoURL: "{{ .Values.source.repo_url }}"
     path: instance-applications/115-ibm-aiservice-tenant
@@ -35,12 +35,17 @@ spec:
       env:
         - name: {{ .Values.avp.values_varname }}
           value: |
+            mas_catalog_source: "{{ .Values.ibm_aiservice_tenant.mas_catalog_source }}"
+
             tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}"
             aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}"
             aiservice_namespace: "{{ .Values.ibm_aiservice_tenant.aiservice_namespace }}"
+            aiservice_channel: "{{ .Values.ibm_aiservice_tenant.aiservice_channel }}"
+
             account_id: "{{ .Values.account.id }}"
             region_id: "{{ .Values.region.id }}"
             cluster_id: "{{ .Values.cluster.id }}"
+
             # SAAS
             aiservice_saas_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_saas_apikey }}"
             mas_aiservice_saas: "{{ .Values.ibm_aiservice_tenant.mas_aiservice_saas }}"

root-applications/ibm-aiservice-tenant-root/values.yaml

@@ -190,9 +190,6 @@ ibm_aiservice:
   mas_aiservice_storage_host: "true"
   mas_aiservice_storage_port: "true"
 
-  # SLS
-  mas_aiservice_sls_registration_key_secret: "sls-registration-key"
-
   mas_aiservice_db_host: "mas_aiservice_db_host"
   mas_aiservice_db_port: "mas_aiservice_db_port"
   mas_aiservice_db_secret_name: "mas_aiservice_db_secret_name"
@@ -300,7 +297,6 @@ ibm_aiservice_tenant:
   mas_aiservice_watsonxai_project_id: MAS_AISERVICE_WATSONXAI_PROJECT_ID 
 
   # SLS
-  #mas_aiservice_sls_registration_key_secret: "sls-registration-key"
   mas_aiservice_sls_subscription_id: "001"
 
   # S3