Introducing Orchestrator Software Templates Chart + Infra changes

Author: elai-shalev

charts/orchestrator-software-templates-infra/Chart.yaml

@@ -10,7 +10,7 @@ kubeVersion: ">= 1.25.0-0"
 type: application
 sources:
   - https://github.com/redhat-developer/rhdh-software-templates-infrastructure
-version: 0.2.0
+version: 0.2.2
 maintainers:
   - name: Red Hat Developer Hub Team
     url: https://github.com/redhat-developer/rhdh-chart

charts/orchestrator-software-templates-infra/README.md

@@ -1,7 +1,7 @@
 
 # Orchestrator Software Templates Infra Chart for OpenShift (Community Version)
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart to install Openshift GitOps and Openshift Pipelines, which are required operators for installing the Orchestrator Software Templates to be available on RHDH.
@@ -119,7 +119,7 @@ The command removes all the Kubernetes components associated with the chart and
 | openshiftGitops.initialApps | Initial applications to deploy | list | `[]` |
 | openshiftGitops.initialRepositories | Initial repositories configuration | list | `[]` |
 | openshiftGitops.name | name of instances | string | `"argocd"` |
-| openshiftGitops.namespaces | namespace of rhdh instance, will be used to install openshift-gitops. | list | `["rhdh"]` |
+| openshiftGitops.namespaces | namespace of rhdh instance, will be used to install openshift-gitops. | list | `["orchestrator-gitops"]` |
 | openshiftGitops.repositoryCredentials | Repository credential templates | list | `[]` |
 | openshiftGitops.secrets | Secrets for Git access or other repository credentials | list | `[]` |
 | openshiftGitops.subscription | subscription config | object | `{"namespace":"openshift-operators","spec":{"channel":"latest","disableDefaultArgoCD":true,"installPlanApproval":"Automatic","name":"openshift-gitops-operator","source":"redhat-operators","sourceNamespace":"openshift-marketplace"}}` |

charts/orchestrator-software-templates-infra/templates/NOTES.txt

@@ -46,5 +46,5 @@ oc wait --for=condition=Ready pod --all -n openshift-pipelines --timeout=120s
 Run the following command to validate that the openshift-gitops namespace and all pods within it are operational:
 
 oc wait --for=jsonpath='{.status.phase}'=Active namespace/openshift-gitops --timeout=80s && \
-oc wait --for=condition=Ready pod --all -n {{ .Release.Namespace }} --timeout=120s
+oc wait --for=condition=Ready pod --all -n orchestrator-gitops --timeout=120s
 {{- end }}

charts/orchestrator-software-templates-infra/templates/catalogsource.yaml

@@ -1,6 +1,6 @@
-{{- $pipelinesEnabled := .Values.openshiftPipelines.enabled }}
-{{- $gitopsEnabled := .Values.openshiftGitops.enabled }}
-{{- $shouldCreate := or $pipelinesEnabled $gitopsEnabled }}
+{{- $pipelinesUsesOperatorHub := and .Values.openshiftPipelines.enabled (eq .Values.openshiftPipelines.subscription.spec.source "operatorhubio-catalog") }}
+{{- $gitopsUsesOperatorHub := and .Values.openshiftGitops.enabled (eq .Values.openshiftGitops.subscription.spec.source "operatorhubio-catalog") }}
+{{- $shouldCreate := or $pipelinesUsesOperatorHub $gitopsUsesOperatorHub }}
 
 
 {{- if $shouldCreate }}
@@ -11,6 +11,10 @@ kind: CatalogSource
 metadata:
   name: operatorhubio-catalog
   namespace: olm
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-weight": "-8"
+    "helm.sh/hook-delete-policy": before-hook-creation
 spec:
   sourceType: grpc
   image: quay.io/operator-framework/upstream-community-operators:latest

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrole.yaml

@@ -8,6 +8,10 @@ metadata:
     app.kubernetes.io/name: {{ .Values.openshiftGitops.namespaces | first }}-argocd-application-controller
     app.kubernetes.io/part-of: {{ .Values.openshiftGitops.namespaces | first }}
   name: {{ .Values.openshiftGitops.namespaces | first }}-argocd-application-controller
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation
 rules:
   - apiGroups: [""]
     resources: ["pods"]

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrolebinding.yaml

@@ -9,7 +9,9 @@ metadata:
     app.kubernetes.io/name: {{ $ns }}-argocd-application-controller
     app.kubernetes.io/part-of: {{ $.Values.openshiftGitops.namespaces | first }}
   annotations:
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation
   name: {{ $ns }}-argocd-application-controller
 roleRef:
   apiGroup: rbac.authorization.k8s.io

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-cr.yaml

@@ -1,5 +1,6 @@
 {{- if and .Values.openshiftGitops.namespaces (.Capabilities.APIVersions.Has "argoproj.io/v1beta1/ArgoCD") }}
 {{- range $ns := .Values.openshiftGitops.namespaces }}
+{{- if ne $ns "openshift-gitops" }}
 ---
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
@@ -8,10 +9,14 @@ metadata:
   labels:
     app: {{ $.Values.openshiftGitops.name }}
   namespace: {{ $ns }}
+  annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "1"
 spec:
   applicationInstanceLabelKey: rht-gitops.com/{{ $ns }}
   {{- if $.Values.openshiftGitops.argocd_cr }}
   {{- $.Values.openshiftGitops.argocd_cr | toYaml | trim | nindent 2 }}
   {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-credential-template.yaml

@@ -7,6 +7,10 @@ kind: Secret
 metadata:
   name: {{ $cred.name }}
   namespace: {{ $ns }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "1"
+    "helm.sh/hook-delete-policy": before-hook-creation
   labels:
     argocd.argoproj.io/secret-type: repo-creds
 stringData:

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-initial-apps.yaml

@@ -7,6 +7,9 @@ kind: Application
 metadata:
   name: {{ $app.name }}
   namespace: {{ $ns }}
+  annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "2"
 spec:
   destination:
     namespace: {{ $ns }}

charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-initial-repositories.yaml

@@ -9,6 +9,9 @@ metadata:
   namespace: {{ $ns }}
   labels:
     argocd.argoproj.io/secret-type: repository
+  annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "2"
 stringData:
   type: {{ $repo.type }}
   url: {{ $repo.url }}