Masaib 2647

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

@@ -8,4 +8,9 @@ dependencies:
 - name: junitreporter
   version: 1.0.0
   repository: "file://../../sub-charts/junitreporter/"
-  condition: junitreporter.devops_mongo_uri != ""
+  condition: junitreporter.devops_mongo_uri != ""
+- name: aiservice
+  version: 1.0.0
+  repository: "file://../../sub-charts/aiservice/"
+  condition: aiservice.ibm-entitlement != ""
+

instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml

@@ -1,16 +1,4 @@
 {{- if .Values.cluster_admin_role }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: ibm-entitlement
-  namespace: "{{ .Values.aiservice_namespace }}"
-  annotations:
-    argocd.argoproj.io/sync-wave: "146"
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: "{{ .Values.artifactory_token}}"
-
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup

instance-applications/113-ibm-aiservice/templates/05-aiservice-subchart.yaml

@@ -0,0 +1,122 @@
+{{- if .Values.application_admin_role }}
+{{- $_job_name_prefix := "aiservice-subchart" }}
+{{- $_cli_image_digest := "sha256:887cc3059a04601241687711df0c03d662931e6719121eec0eb0490001b2c8b9" }}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+{{- $_job_version := "v1" }}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash ) }}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: aiservice-subchart-job
+  namespace: {{ .Values.aiservice_namespace }}
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: aiservice-subchart-job
+  namespace: "{{ .Values.aiservice_namespace }}"
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+rules:
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    verbs: ["get", "list", "patch", "delete"]
+  - apiGroups: [""]
+    resources: ["secrets", "configmaps", "serviceaccounts"]
+    verbs: ["get", "list", "patch", "delete"]
+  - apiGroups: ["operators.coreos.com"]
+    resources: ["subscriptions", "clusterserviceversions"]
+    verbs: ["get", "list"]
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: aiservice-subchart-job
+  namespace: "{{ .Values.aiservice_namespace }}"
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+subjects:
+  - kind: ServiceAccount
+    name: postsync-aiservice-migration
+    namespace: "{{ .Values.aiservice_namespace }}"
+roleRef:
+  kind: Role
+  name: postsync-aiservice-migration
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: aiservice-subchart-job
+  namespace: "{{ .Values.aiservice_namespace }}"
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+spec:
+  podSelector:
+    matchLabels:
+      app: sync-job
+  egress:
+    - {}
+  policyTypes:
+    - Egress
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $_job_name }}
+  namespace: {{ .Values.aiservice_namespace }}
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: sync-job
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 8 }}
+{{- end }}
+    spec:
+      serviceAccountName: aiservice-subchart-job
+      restartPolicy: OnFailure
+      containers:
+        - name: aiservice-subchart
+          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: SOURCE_NAMESPACE
+              value: "{{ .Values.aiservice_namespace }}"
+            - name: TARGET_NAMESPACE
+              value: "{{ .Values.tenantNamespace }}"
+            - name: ARTIFACTORY_TOKEN
+              value: "{{ .Values.artifactory_token }}"
+            - name: RELEASE_NAME
+              value: "{{ .Release.Name }}"
+
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -e
+
+              helm dependency update
+              echo $(pwd)
+              echo $(ls)
+              echo "Installing to $RELEASE_NAME token $ARTIFACTORY_TOKEN"
+              helm upgrade ibm-aiservice ./charts/aiservice --set .Values.aiservice.app_artifactory_token=$ARTIFACTORY_TOKEN
+
+              echo "All secrets copied successfully"
+{{- end }}

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

@@ -79,4 +79,8 @@ in_saas_env: "false"
 is_gitops_fvt_env: "false"
 
 #TENANT
-mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}"
+mas_aiservice_tenant_name: "aiservice-{{ mas_aiservice_tenant_name }}"
+
+#AIService Values
+aiservice:
+  app_artifactory_token:

instance-applications/115-ibm-aiservice-tenant/Chart.yaml

@@ -8,4 +8,7 @@ dependencies:
 - name: junitreporter
   version: 1.0.0
   repository: "file://../../sub-charts/junitreporter/"
-  condition: junitreporter.devops_mongo_uri != ""
+  condition: junitreporter.devops_mongo_uri != ""
+- name: aiservice
+  version: 1.0.0
+  repository: "file://../../sub-charts/aiservice/"

sub-charts/aiservice/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: aiservice
+description: |
+  Contains common shared resources for AIService.
+type: application
+version: 1.0.0

sub-charts/aiservice/README.md

@@ -0,0 +1,3 @@
+AIService
+===============================================================================
+Updates common AIService resources when they are changed.

sub-charts/aiservice/templates/00-presync-aiservice-ibm-entitlement.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ibm-entitlement
+  namespace: {{ .Values.aiservice_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "146"
+    token: {{ .Values.app_artifactory_token }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{.Values.app_artifactory_token }}

instance-applications/113-ibm-aiservice/templates/05-aiservice-km-s3-secret.yaml → sub-charts/aiservice/templates/01-presync-aiservice-km-s3-secret.yaml

@@ -1,11 +1,10 @@
-{{- if .Values.application_admin_role }}
 ---
 apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
   name: km-s3-secret
-  namespace: "{{ .Values.aiservice_namespace }}"
+  namespace: {{ .Values.aiservice_namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "147"
     serving.kserve.io/s3-endpoint: "{{ .Values.aiservice_s3_host }}:{{ .Values.aiservice_s3_port }}"
@@ -24,5 +23,3 @@ data:
   S3_PORT: {{ .Values.aiservice_s3_port | default "" | toString | b64enc | quote }}
   S3_REGION: {{ .Values.aiservice_s3_region | default "" | toString | b64enc | quote }}
   S3_SSL: {{ .Values.aiservice_s3_ssl | default true | toString | b64enc | quote }}
-
-{{- end }}

sub-charts/aiservice/values.yaml

@@ -0,0 +1,5 @@
+---
+ibm-entitlement:
+km-s3-secret:
+
+app_artifactory_token: