From 037f6feb102c0f4a820bfcacfc039c5ad9fb0ff6 Mon Sep 17 00:00:00 2001 From: Denilson Nastacio Date: Thu, 7 Apr 2022 16:55:24 -0400 Subject: [PATCH] chore: Adjust AIOps SA for sync jobs --- .../templates/0100-cp-shared-app.yaml | 1 + .../0100-cp-shared-operators-app.yaml | 3 +- config/argocd-cloudpaks/cp4aiops/Chart.yaml | 4 +- .../templates/000-aimgr-namespace.yaml} | 0 .../templates/000-emgr-namespace.yaml} | 0 .../templates/020-cloudpaks-aimgr-role.yaml | 40 +++++++++ .../templates/020-cloudpaks-default-role.yaml | 13 +++ .../templates/020-cloudpaks-emgr-role.yaml | 19 ++++ .../020-cloudpaks-ingress-roles.yaml | 26 ++++++ .../021-cloudpaks-aimgr-binding.yaml | 20 +++++ .../021-cloudpaks-default-binding.yaml} | 10 +-- .../templates/021-cloudpaks-emgr-binding.yaml | 20 +++++ .../021-cloudpaks-ingress-bindings.yaml | 34 +++++++ ...p4aiops-app.yaml => 100-cp4aiops-app.yaml} | 0 .../templates/110-cp4aiops-aimgr-app.yaml | 71 +++++++++++++++ .../templates/120-cp4aiops-emgr-app.yaml | 69 +++++++++++++++ .../cp4aiops-module-template-app.yaml | 88 ------------------- config/argocd-cloudpaks/cp4aiops/values.yaml | 1 + .../cp4aiops/install-aimgr/Chart.yaml | 2 +- .../000-presync-adjust-parameters.yaml | 2 +- .../resources/010-presync-patch-iaf.yaml | 32 +++++-- .../220-sync-check-ai-readiness.yaml | 2 +- .../resources/230-sync-certificates.yaml | 3 +- .../subscriptions/020-argocd-role.yaml | 13 +++ .../subscriptions/020-cp4aiops-role.yaml | 19 ---- ...ding.yaml => 021-argocd-role-binding.yaml} | 8 +- .../subscriptions/030-sync-prereqs.yaml | 2 +- .../110-sync-check-all-csvs.yaml | 2 +- .../cp4aiops/install-aimgr/values.yaml | 2 + .../cp4aiops/install-emgr/Chart.yaml | 2 +- .../000-presync-adjust-parameters.yaml | 4 +- .../resources/210-event-manager.yaml | 2 +- .../resources/220-sync-check-emgr-group.yaml | 4 +- ...gr-role.yaml => 020-argocd-emgr-role.yaml} | 8 +- .../021-argocd-role-binding.yaml | 17 ++++ .../subscriptions/030-sync-prereqs.yaml | 4 +- .../subscriptions/050-operator-group.yaml | 6 +- .../subscriptions/100-subscription.yaml | 4 +- .../110-sync-check-all-csvs.yaml | 4 +- .../cp4aiops/install-emgr/values.yaml | 4 +- tests/prebuild/yamllint-config.yaml | 9 +- 41 files changed, 417 insertions(+), 157 deletions(-) rename config/{cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/000-namespaces.yaml => argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml} (100%) rename config/{cloudpaks/cp4aiops/install-emgr/templates/subscriptions/000-namespaces.yaml => argocd-cloudpaks/cp4aiops/templates/000-emgr-namespace.yaml} (100%) create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-emgr-role.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml rename config/{cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-cp4aiops-role-binding.yaml => argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml} (54%) create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-emgr-binding.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml rename config/argocd-cloudpaks/cp4aiops/templates/{cp4aiops-app.yaml => 100-cp4aiops-app.yaml} (100%) create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/110-cp4aiops-aimgr-app.yaml create mode 100644 config/argocd-cloudpaks/cp4aiops/templates/120-cp4aiops-emgr-app.yaml delete mode 100644 config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-module-template-app.yaml create mode 100644 config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml delete mode 100644 config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-cp4aiops-role.yaml rename config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/{021-cp4aiops-role-binding.yaml => 021-argocd-role-binding.yaml} (61%) rename config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/{020-cp4aiops-emgr-role.yaml => 020-argocd-emgr-role.yaml} (51%) create mode 100644 config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-argocd-role-binding.yaml diff --git a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml index 4f59a287..088d9c05 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml +++ b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-app.yaml @@ -14,6 +14,7 @@ spec: ignoreDifferences: - group: argoproj.io jsonPointers: + - /spec/project - /spec/source/repoURL - /spec/source/targetRevision - /status diff --git a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml index 75cac122..d702ce5a 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml +++ b/config/argocd-cloudpaks/cp-shared/templates/0100-cp-shared-operators-app.yaml @@ -9,11 +9,12 @@ metadata: argocd.argoproj.io/sync-wave: "100" spec: destination: - namespace: {{.Values.argocd_app_namespace}} + namespace: "{{.Values.metadata.argocd_app_namespace}}" server: https://kubernetes.default.svc ignoreDifferences: - group: argoproj.io jsonPointers: + - /spec/project - /spec/source/repoURL - /spec/source/targetRevision - /status diff --git a/config/argocd-cloudpaks/cp4aiops/Chart.yaml b/config/argocd-cloudpaks/cp4aiops/Chart.yaml index 56a79e48..594b26d8 100644 --- a/config/argocd-cloudpaks/cp4aiops/Chart.yaml +++ b/config/argocd-cloudpaks/cp4aiops/Chart.yaml @@ -16,9 +16,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.1 +version: 0.4.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "0.6.0" +appVersion: "0.8.0" diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/000-namespaces.yaml b/config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml similarity index 100% rename from config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/000-namespaces.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/000-namespaces.yaml b/config/argocd-cloudpaks/cp4aiops/templates/000-emgr-namespace.yaml similarity index 100% rename from config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/000-namespaces.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/000-emgr-namespace.yaml diff --git a/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml new file mode 100644 index 00000000..a0af2dd6 --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml @@ -0,0 +1,40 @@ +{{- $aimgr := .Values.modules.aimgr }} +{{- if eq ( default false $aimgr ) true }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "20" + creationTimestamp: null + name: ibm-aiops-aimgr-role + namespace: "{{.Values.metadata.argocd_app_namespace}}" +rules: + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list", "create", "delete", "update", "patch"] + - apiGroups: [""] + resources: ["serviceaccounts"] + verbs: ["get", "list", "create", "update", "patch"] + - apiGroups: ["base.automation.ibm.com"] + resources: ["automationbases"] + verbs: ["get", "list"] + - apiGroups: ["core.automation.ibm.com"] + resources: ["automationuiconfigs"] + verbs: ["get", "list"] + - apiGroups: ["project.openshift.io"] + resources: ["projects"] + verbs: ["get"] + - apiGroups: ["operator.openshift.io"] + resources: ["ingresscontrollers"] + verbs: ["get"] + - apiGroups: ["route.openshift.io"] + resources: ["routes"] + verbs: ["get"] + - apiGroups: ["apps"] + resources: ["deployments"] + verbs: ["get", "list", "patch"] +{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml new file mode 100644 index 00000000..4359027d --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-default-role.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-role + namespace: default +rules: + - apiGroups: [""] + resources: ["namespaces"] + verbs: ["get", "patch"] diff --git a/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-emgr-role.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-emgr-role.yaml new file mode 100644 index 00000000..3e667fcf --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-emgr-role.yaml @@ -0,0 +1,19 @@ +{{- $emgr := .Values.modules.emgr }} +{{- if eq ( default false $emgr ) true }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "20" + creationTimestamp: null + name: ibm-aiops-emgr-role + namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" +rules: + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list", "create", "update", "patch", "delete"] + - apiGroups: ["cem.ibm.com"] + resources: ["cemformations"] + verbs: ["get"] +{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml new file mode 100644 index 00000000..b930d71a --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-ingress-roles.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-ingress-operator-role + namespace: openshift-ingress-operator +rules: + - apiGroups: ["operator.openshift.io"] + resources: ["ingresscontrollers"] + verbs: ["get"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-ingress-role + namespace: openshift-ingress +rules: + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get"] diff --git a/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml new file mode 100644 index 00000000..5c12c822 --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml @@ -0,0 +1,20 @@ +{{- $aimgr := .Values.modules.aimgr }} +{{- if eq ( default false $aimgr ) true }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-aimgr-binding + namespace: "{{.Values.metadata.argocd_app_namespace}}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ibm-aiops-aimgr-role +subjects: + - kind: ServiceAccount + name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" + namespace: "{{.Values.metadata.argocd_namespace}}" +{{- end }} diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-cp4aiops-role-binding.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml similarity index 54% rename from config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-cp4aiops-role-binding.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml index 360285ac..b657cfde 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-cp4aiops-role-binding.yaml +++ b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-default-binding.yaml @@ -5,13 +5,13 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "21" creationTimestamp: null - name: ibm-cp4aiops-emgr-role - namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + name: ibm-aiops-binding + namespace: default roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ibm-cp4aiops-emgr + name: ibm-aiops-role subjects: - kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops + name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" + namespace: "{{.Values.metadata.argocd_namespace}}" diff --git a/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-emgr-binding.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-emgr-binding.yaml new file mode 100644 index 00000000..f50e45a2 --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-emgr-binding.yaml @@ -0,0 +1,20 @@ +{{- $emgr := .Values.modules.emgr }} +{{- if eq ( default false $emgr ) true }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-emgr-binding + namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ibm-aiops-emgr-role +subjects: + - kind: ServiceAccount + name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" + namespace: "{{.Values.metadata.argocd_namespace}}" +{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml new file mode 100644 index 00000000..067e1a21 --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-ingress-bindings.yaml @@ -0,0 +1,34 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-ingress-operator-binding + namespace: openshift-ingress-operator +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ibm-aiops-ingress-operator-role +subjects: + - kind: ServiceAccount + name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" + namespace: "{{.Values.metadata.argocd_namespace}}" +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: ibm-aiops-ingress-binding + namespace: openshift-ingress +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ibm-aiops-ingress-role +subjects: + - kind: ServiceAccount + name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" + namespace: "{{.Values.metadata.argocd_namespace}}" diff --git a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/100-cp4aiops-app.yaml similarity index 100% rename from config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-app.yaml rename to config/argocd-cloudpaks/cp4aiops/templates/100-cp4aiops-app.yaml diff --git a/config/argocd-cloudpaks/cp4aiops/templates/110-cp4aiops-aimgr-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/110-cp4aiops-aimgr-app.yaml new file mode 100644 index 00000000..336153be --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/110-cp4aiops-aimgr-app.yaml @@ -0,0 +1,71 @@ +{{- $aimgr := .Values.modules.aimgr }} +{{- if eq ( default false $aimgr ) true }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + creationTimestamp: null + name: cp4aiops-aimgr + namespace: openshift-gitops + annotations: + argocd.argoproj.io/sync-wave: "110" +spec: + destination: + namespace: {{.Values.metadata.argocd_app_namespace}} + server: https://kubernetes.default.svc + ignoreDifferences: + - group: argoproj.io + jsonPointers: + - /spec/source/repoURL + - /spec/source/targetRevision + - /status + kind: Application + - group: noi.ibm.com + jsonPointers: + - /spec/clusterDomain + kind: noi + - group: v1 + jsonPointers: + - /metadata/labels + kind: Namespace + project: default + source: + helm: + parameters: + - name: argocd_app_name + value: ${ARGOCD_APP_NAME} + - name: argocd_app_namespace + value: ${ARGOCD_APP_NAMESPACE} + - name: automation_base_instance_name + value: {{.Values.automation_base_instance_name}} + - name: automation_ui_config_instance_name + value: {{.Values.metadata.automation_ui_config_instance_name}} + - name: metadata.argocd_app_namespace + value: {{.Values.metadata.argocd_app_namespace}} + - name: repoURL + value: ${ARGOCD_APP_SOURCE_REPO_URL} + - name: serviceaccount.argocd_application_controller + value: {{.Values.serviceaccount.argocd_application_controller}} + - name: storageclass.rwo + value: {{.Values.storageclass.rwo}} + - name: storageclass.rwx + value: {{.Values.storageclass.rwx}} + - name: targetRevision + value: ${ARGOCD_APP_SOURCE_TARGET_REVISION} + path: config/cloudpaks/cp4aiops/install-aimgr + repoURL: {{.Values.repoURL}} + targetRevision: {{.Values.targetRevision}} + syncPolicy: + automated: + prune: true + selfHeal: true +status: + health: {} + summary: {} + sync: + comparedTo: + destination: {} + source: + repoURL: "" + status: "" +{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/templates/120-cp4aiops-emgr-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/120-cp4aiops-emgr-app.yaml new file mode 100644 index 00000000..0e31dabe --- /dev/null +++ b/config/argocd-cloudpaks/cp4aiops/templates/120-cp4aiops-emgr-app.yaml @@ -0,0 +1,69 @@ +{{- $emgr := .Values.modules.emgr }} +{{- if eq ( default false $emgr ) true }} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + creationTimestamp: null + name: cp4aiops-emgr + namespace: openshift-gitops + annotations: + argocd.argoproj.io/sync-wave: "120" +spec: + destination: + namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + server: https://kubernetes.default.svc + ignoreDifferences: + - group: argoproj.io + jsonPointers: + - /spec/source/repoURL + - /spec/source/targetRevision + - /status + kind: Application + - group: noi.ibm.com + jsonPointers: + - /spec/clusterDomain + kind: noi + - group: v1 + jsonPointers: + - /metadata/labels + kind: Namespace + project: default + source: + helm: + parameters: + - name: argocd_app_name + value: ${ARGOCD_APP_NAME} + - name: argocd_app_namespace + value: ${ARGOCD_APP_NAMESPACE} + - name: cluster_domain + value: {{.Values.cluster_domain}} + - name: metadata.argocd_app_namespace + value: "{{.Values.metadata.argocd_app_namespace}}-emgr" + - name: repoURL + value: ${ARGOCD_APP_SOURCE_REPO_URL} + - name: serviceaccount.argocd_application_controller + value: {{.Values.serviceaccount.argocd_application_controller}} + - name: storageclass.rwo + value: {{.Values.storageclass.rwo}} + - name: storageclass.rwx + value: {{.Values.storageclass.rwx}} + - name: targetRevision + value: ${ARGOCD_APP_SOURCE_TARGET_REVISION} + path: config/cloudpaks/cp4aiops/install-emgr + repoURL: {{.Values.repoURL}} + targetRevision: {{.Values.targetRevision}} + syncPolicy: + automated: + prune: true + selfHeal: true +status: + health: {} + summary: {} + sync: + comparedTo: + destination: {} + source: + repoURL: "" + status: "" +{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-module-template-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-module-template-app.yaml deleted file mode 100644 index a2f860b8..00000000 --- a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-module-template-app.yaml +++ /dev/null @@ -1,88 +0,0 @@ -{{- $argocd_app_namespace := .Values.metadata.argocd_app_namespace -}} -{{- $argocd_serviceaccount := .Values.serviceaccount.argocd_application_controller -}} -{{- $cluster_domain := .Values.cluster_domain -}} -{{- $operators_namespace := .Values.metadata.operators_namespace -}} -{{- $automation_base_instance_name := .Values.automation_base_instance_name -}} -{{- $automation_ui_config_instance_name := .Values.metadata.automation_ui_config_instance_name -}} -{{- $repoUrl := .Values.repoURL -}} -{{- $storage_class_rwo := .Values.storageclass.rwo -}} -{{- $storage_class_rwx := .Values.storageclass.rwx -}} -{{- $targetRevision := .Values.targetRevision -}} -{{- range $module_name, $module_enabled := .Values.modules }} -{{- if eq ( default false $module_enabled ) true }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - creationTimestamp: null - name: cp4aiops-{{ $module_name }} - namespace: openshift-gitops - annotations: -{{- if eq $module_name "aimgr" }} - argocd.argoproj.io/sync-wave: "100" -{{- else }} - argocd.argoproj.io/sync-wave: "110" -{{- end }} -spec: - destination: - namespace: {{ $argocd_app_namespace }} - server: https://kubernetes.default.svc - ignoreDifferences: - - group: argoproj.io - jsonPointers: - - /spec/source/repoURL - - /spec/source/targetRevision - - /status - kind: Application - - group: noi.ibm.com - jsonPointers: - - /spec/clusterDomain - kind: noi - - group: v1 - jsonPointers: - - /metadata/labels - kind: Namespace - project: default - source: - helm: - parameters: - - name: argocd_app_name - value: ${ARGOCD_APP_NAME} - - name: argocd_app_namespace - value: ${ARGOCD_APP_NAMESPACE} - - name: automation_base_instance_name - value: {{ $automation_base_instance_name }} - - name: automation_ui_config_instance_name - value: {{ $automation_ui_config_instance_name }} - - name: cluster_domain - value: {{ $cluster_domain }} - - name: metadata.argocd_app_namespace - value: {{ $argocd_app_namespace }} - - name: repoURL - value: ${ARGOCD_APP_SOURCE_REPO_URL} - - name: serviceaccount.argocd_application_controller - value: {{ $argocd_serviceaccount }} - - name: storageclass.rwo - value: {{ $storage_class_rwo }} - - name: storageclass.rwx - value: {{ $storage_class_rwx }} - - name: targetRevision - value: ${ARGOCD_APP_SOURCE_TARGET_REVISION} - path: config/cloudpaks/cp4aiops/install-{{ $module_name }} - repoURL: {{ $repoUrl }} - targetRevision: {{ $targetRevision }} - syncPolicy: - automated: - prune: true - selfHeal: true -status: - health: {} - summary: {} - sync: - comparedTo: - destination: {} - source: - repoURL: "" - status: "" -{{- end }} -{{- end }} diff --git a/config/argocd-cloudpaks/cp4aiops/values.yaml b/config/argocd-cloudpaks/cp4aiops/values.yaml index 1544de0c..5432936b 100644 --- a/config/argocd-cloudpaks/cp4aiops/values.yaml +++ b/config/argocd-cloudpaks/cp4aiops/values.yaml @@ -6,6 +6,7 @@ automation_ui_config_instance_name: "" cluster_domain: "" serviceaccount: argocd_application_controller: openshift-gitops-argocd-application-controller + ibm_cloudpaks_installer: ibm-cloudpaks-installer metadata: argocd_app_namespace: ibm-cloudpaks argocd_namespace: openshift-gitops diff --git a/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml b/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml index 9be16130..d74ee6be 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml index d7503189..fab2c23e 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/000-presync-adjust-parameters.yaml @@ -105,5 +105,5 @@ spec: exit ${result} restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 2 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/010-presync-patch-iaf.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/010-presync-patch-iaf.yaml index f9f32b00..332d8746 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/010-presync-patch-iaf.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/010-presync-patch-iaf.yaml @@ -33,19 +33,33 @@ spec: set -eo pipefail set -x - automation_base_instance_name="$(oc get AutomationBase --namespace "${TARGET_NAMESPACE}" -o jsonpath='{.items[].metadata.name}')" \ - && reuse_iaf_ab=1 \ - || reuse_iaf_ab=0 + result=0 + + automation_base_instance_name="" + automation_base_class=$(oc api-resources --api-group=base.automation.ibm.com -o name | wc -l) \ + || result=1 + + if [ ${result} -eq 0 ] && [ ! "${automation_base_class}" == "0" ]; then + automation_base_instance_name="$(oc get AutomationBase.base.automation.ibm.com \ + --namespace "${TARGET_NAMESPACE}" \ + -o jsonpath='{.items[].metadata.name}' \ + --ignore-not-found=false)" \ + || result=1 + fi storage_class_rwx="$(oc get configmap argocd-cp4aiops-config \ - --namespace "${ARGOCD_NAMESPACE}" -o jsonpath='{.data.storageclass\.rwx}')" + --namespace "${ARGOCD_NAMESPACE}" \ + -o jsonpath='{.data.storageclass\.rwx}' \ + --ignore-not-found=false)" \ + || result=1 - result=0 - if [ "${reuse_iaf_ab}" -eq 0 ]; then + if [ -z "${automation_base_instance_name}" ]; then echo "INFO: Did not find an existing instance of AutomationBase in the namespace." else echo "INFO: Found an existing instance of AutomationBase in the namespace." - abase_params=$(oc get AutomationBase "${automation_base_instance_name}" --namespace ${TARGET_NAMESPACE} -o jsonpath='{.spec}') + abase_params=$(oc get AutomationBase.base.automation.ibm.com "${automation_base_instance_name}" --namespace ${TARGET_NAMESPACE} -o jsonpath='{.spec}' --ignore-not-found=false) \ + || result=1 + if [[ ! ${abase_params} == *aiops* ]]; then echo "INFO: Patching it with AIOps requirements." app_patch=/tmp/patch.json @@ -80,7 +94,7 @@ spec: ] EOF - oc patch AutomationBase "${automation_base_instance_name}" \ + oc patch AutomationBase.base.automation.ibm.com "${automation_base_instance_name}" \ --namespace "${TARGET_NAMESPACE}" \ --output yaml \ --patch-file "${app_patch}" \ @@ -92,5 +106,5 @@ spec: exit ${result} restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 2 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/220-sync-check-ai-readiness.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/220-sync-check-ai-readiness.yaml index e87d73e5..66116bea 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/220-sync-check-ai-readiness.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/220-sync-check-ai-readiness.yaml @@ -79,5 +79,5 @@ spec: exit "${result}" restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-sync-certificates.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-sync-certificates.yaml index 57c3ef1a..62822049 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-sync-certificates.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/resources/230-sync-certificates.yaml @@ -80,6 +80,7 @@ spec: && echo "INFO: AutomationUIConfig patched." \ || { echo "ERROR: AutomationUIConfig could not be patched." \" + result=1 } fi fi @@ -87,5 +88,5 @@ spec: exit ${result} restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 2 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml new file mode 100644 index 00000000..57cd1f70 --- /dev/null +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-argocd-role.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: argocd-cp4aiops-role + namespace: "{{.Values.metadata.argocd_app_namespace}}" +rules: + - apiGroups: ["orchestrator.aiops.ibm.com"] + resources: ["installations"] + verbs: ["get", "create", "update", "patch", "delete"] diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-cp4aiops-role.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-cp4aiops-role.yaml deleted file mode 100644 index 96c564d5..00000000 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/020-cp4aiops-role.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - annotations: - argocd.argoproj.io/sync-wave: "20" - creationTimestamp: null - name: ibm-cp4aiops - namespace: "{{.Values.metadata.argocd_app_namespace}}" -rules: - - apiGroups: [""] - resources: ["secrets", "serviceaccounts"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["orchestrator.aiops.ibm.com"] - resources: ["installations"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["core.automation.ibm.com"] - resources: ["automationuiconfigs"] - verbs: ["get", "list", "create", "update", "patch", "delete"] diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-cp4aiops-role-binding.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml similarity index 61% rename from config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-cp4aiops-role-binding.yaml rename to config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml index 6e4e9cbf..ce968196 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-cp4aiops-role-binding.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/021-argocd-role-binding.yaml @@ -5,13 +5,13 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "21" creationTimestamp: null - name: ibm-cp4aiops-role + name: argocd-cp4aiops-aimgr-binding namespace: "{{.Values.metadata.argocd_app_namespace}}" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ibm-cp4aiops + name: argocd-cp4aiops-role subjects: - kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops + name: "{{.Values.serviceaccount.argocd_application_controller}}" + namespace: "{{.Values.metadata.argocd_namespace}}" diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml index 58e67550..79589423 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/030-sync-prereqs.yaml @@ -86,5 +86,5 @@ spec: exit ${result} restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml index f5b9bc50..d9220804 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml @@ -61,5 +61,5 @@ spec: fi restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/values.yaml b/config/cloudpaks/cp4aiops/install-aimgr/values.yaml index 5ca04014..897adc3e 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/values.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/values.yaml @@ -3,8 +3,10 @@ automation_base_instance_name: "" automation_ui_config_instance_name: "" serviceaccount: argocd_application_controller: openshift-gitops-argocd-application-controller + ibm_cloudpaks_installer: ibm-cloudpaks-installer metadata: argocd_app_namespace: ibm-cloudpaks + argocd_namespace: openshift-gitops post_install_wait: 2h storageclass: rwo: ocs-storagecluster-ceph-rbd diff --git a/config/cloudpaks/cp4aiops/install-emgr/Chart.yaml b/config/cloudpaks/cp4aiops/install-emgr/Chart.yaml index e2354739..a137dfea 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/Chart.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/000-presync-adjust-parameters.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/000-presync-adjust-parameters.yaml index 62d50a3d..bb3127a7 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/000-presync-adjust-parameters.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/000-presync-adjust-parameters.yaml @@ -24,7 +24,7 @@ spec: - name: ARGOCD_NAMESPACE value: "openshift-gitops" - name: TARGET_NAMESPACE - value: "{{.Values.metadata.argocd_app_namespace}}-emgr" + value: "{{.Values.metadata.argocd_app_namespace}}" command: - /bin/sh - -c @@ -83,5 +83,5 @@ spec: exit ${result} restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 2 diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/210-event-manager.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/210-event-manager.yaml index 5cab3d77..b1caaf3d 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/210-event-manager.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/210-event-manager.yaml @@ -7,7 +7,7 @@ metadata: argocd.argoproj.io/sync-wave: "210" creationTimestamp: null name: evtmanager - namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + namespace: "{{.Values.metadata.argocd_app_namespace}}" spec: license: accept: true diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/220-sync-check-emgr-group.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/220-sync-check-emgr-group.yaml index 0126759c..4ec24e59 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/resources/220-sync-check-emgr-group.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/resources/220-sync-check-emgr-group.yaml @@ -24,7 +24,7 @@ spec: cpu: "300m" env: - name: TARGET_NAMESPACE - value: "{{.Values.metadata.argocd_app_namespace}}-emgr" + value: "{{.Values.metadata.argocd_app_namespace}}" command: - /bin/sh - -c @@ -59,5 +59,5 @@ spec: exit "${result}" restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-cp4aiops-emgr-role.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-argocd-emgr-role.yaml similarity index 51% rename from config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-cp4aiops-emgr-role.yaml rename to config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-argocd-emgr-role.yaml index 10e00d08..34602184 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-cp4aiops-emgr-role.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/020-argocd-emgr-role.yaml @@ -5,12 +5,12 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "20" creationTimestamp: null - name: ibm-cp4aiops-emgr - namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + name: argocd-cp4aiops-emgr-role + namespace: "{{.Values.metadata.argocd_app_namespace}}" rules: - apiGroups: [""] resources: ["secrets"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + verbs: ["get", "create", "update", "patch", "delete"] - apiGroups: ["noi.ibm.com"] resources: ["nois"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + verbs: ["get", "create", "update", "patch", "delete"] diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-argocd-role-binding.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-argocd-role-binding.yaml new file mode 100644 index 00000000..e82dd79e --- /dev/null +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/021-argocd-role-binding.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + annotations: + argocd.argoproj.io/sync-wave: "21" + creationTimestamp: null + name: argocd-cp4aiops-emgr-binding + namespace: "{{.Values.metadata.argocd_app_namespace}}" +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: argocd-cp4aiops-emgr-role +subjects: + - kind: ServiceAccount + name: "{{.Values.serviceaccount.argocd_application_controller}}" + namespace: "{{.Values.metadata.argocd_namespace}}" diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/030-sync-prereqs.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/030-sync-prereqs.yaml index fec0c0f7..9b04f720 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/030-sync-prereqs.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/030-sync-prereqs.yaml @@ -27,7 +27,7 @@ spec: - name: IBM_ENTITLEMENT_SECRET value: ibm-entitlement-key - name: TARGET_NAMESPACE - value: "{{.Values.metadata.argocd_app_namespace}}-emgr" + value: "{{.Values.metadata.argocd_app_namespace}}" command: - /bin/sh - -c @@ -61,5 +61,5 @@ spec: } restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/050-operator-group.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/050-operator-group.yaml index 9c64e400..7e5a25da 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/050-operator-group.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/050-operator-group.yaml @@ -2,10 +2,10 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: "{{.Values.metadata.argocd_app_namespace}}-emgr-operator-group" - namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + name: "{{.Values.metadata.argocd_app_namespace}}-operator-group" + namespace: "{{.Values.metadata.argocd_app_namespace}}" annotations: argocd.argoproj.io/sync-wave: "50" spec: targetNamespaces: - - "{{.Values.metadata.argocd_app_namespace}}-emgr" + - "{{.Values.metadata.argocd_app_namespace}}" diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/100-subscription.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/100-subscription.yaml index 2fdb4673..b7cd11d6 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/100-subscription.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/100-subscription.yaml @@ -5,9 +5,9 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "100" labels: - operators.coreos.com/noi.{{.Values.metadata.argocd_app_namespace}}-emgr: '' + operators.coreos.com/noi.{{.Values.metadata.argocd_app_namespace}}: '' name: noi - namespace: "{{.Values.metadata.argocd_app_namespace}}-emgr" + namespace: "{{.Values.metadata.argocd_app_namespace}}" spec: channel: v1.5 installPlanApproval: Automatic diff --git a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/110-sync-check-all-csvs.yaml b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/110-sync-check-all-csvs.yaml index edafaa9c..dbc26caa 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/110-sync-check-all-csvs.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/templates/subscriptions/110-sync-check-all-csvs.yaml @@ -24,7 +24,7 @@ spec: cpu: "300m" env: - name: TARGET_NAMESPACE - value: "{{.Values.metadata.argocd_app_namespace}}-emgr" + value: "{{.Values.metadata.argocd_app_namespace}}" command: - /bin/sh - -c @@ -61,5 +61,5 @@ spec: fi restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}} + serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} backoffLimit: 1 diff --git a/config/cloudpaks/cp4aiops/install-emgr/values.yaml b/config/cloudpaks/cp4aiops/install-emgr/values.yaml index ccaf5058..cdfce15a 100644 --- a/config/cloudpaks/cp4aiops/install-emgr/values.yaml +++ b/config/cloudpaks/cp4aiops/install-emgr/values.yaml @@ -1,11 +1,11 @@ --- -automation_base_instance_name: "" -automation_ui_config_instance_name: "" cluster_domain: "to_be_set_by_presync_job" serviceaccount: argocd_application_controller: openshift-gitops-argocd-application-controller + ibm_cloudpaks_installer: ibm-cloudpaks-installer metadata: argocd_app_namespace: ibm-cloudpaks + argocd_namespace: openshift-gitops post_install_wait: 2h storageclass: rwo: ocs-storagecluster-ceph-rbd diff --git a/tests/prebuild/yamllint-config.yaml b/tests/prebuild/yamllint-config.yaml index daf47b60..9a0e2d74 100644 --- a/tests/prebuild/yamllint-config.yaml +++ b/tests/prebuild/yamllint-config.yaml @@ -1,12 +1,17 @@ --- ignore: | - config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-module-template-app.yaml + config/argocd-cloudpaks/cp4aiops/templates/000-aimgr-namespace.yaml + config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-aimgr-role.yaml + config/argocd-cloudpaks/cp4aiops/templates/020-cloudpaks-emgr-role.yaml + config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-aimgr-binding.yaml + config/argocd-cloudpaks/cp4aiops/templates/021-cloudpaks-emgr-binding.yaml + config/argocd-cloudpaks/cp4aiops/templates/110-cp4aiops-aimgr-app.yaml + config/argocd-cloudpaks/cp4aiops/templates/120-cp4aiops-emgr-app.yaml config/argocd-cloudpaks/cp4d/templates/cp4d-module-template-app.yaml config/argocd-cloudpaks/cp4i/templates/cp4i-client-app.yaml config/cloudpaks/cp4a/operators/templates/01-namespaces/individual.yaml config/cloudpaks/cp4a/operators/templates/07-operators/100-operator-group.yaml config/cloudpaks/cp4aiops/install-aimgr/templates/resources/200-ai-manager.yaml - config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/000-namespaces.yaml config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/050-operator-group.yaml config/cloudpaks/cp4d/install-platform/templates/prereqs/000-app-namespace.yaml config/cloudpaks/cp4d/install-platform/templates/prereqs/000-operators-namespace.yaml