Merge pull request #61 from rh-mobb/foster/acm-stuff

added acm spoke hub clusters

Author: foster-rh

charts/letsencrypt-clusterissuer/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: letsencrypt-clusterissuer
 description: Installs cert-manager operator and creates a Let's Encrypt ACME ClusterIssuer with DNS-01 Route 53 solver (uses IRSA, no static credentials)
-version: 1.0.5
+version: 1.0.6
 type: application
 home: https://rh-mobb.github.io/validated-pattern-helm-charts/
 icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg

charts/letsencrypt-clusterissuer/templates/restart-certmanager-job.yaml

@@ -19,9 +19,9 @@ metadata:
     argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
 rules:
-  - apiGroups: ["apps"]
-    resources: ["deployments"]
-    verbs: ["get", "patch"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["list", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -63,8 +63,10 @@ spec:
             - /bin/sh
             - -c
             - |
-              echo "Restarting cert-manager deployment to pick up IRSA annotation..."
-              oc rollout restart deployment/cert-manager -n cert-manager
-              oc rollout status deployment/cert-manager -n cert-manager --timeout=120s
-              echo "cert-manager restarted successfully"
+              echo "Deleting all cert-manager pods to pick up IRSA annotation..."
+              oc delete pods --all -n cert-manager
+              echo "Waiting for pods to come back..."
+              sleep 30
+              oc get pods -n cert-manager
+              echo "cert-manager pods restarted successfully"
 {{- end }}

charts/servicemesh-operator-ambient/Chart.yaml

@@ -3,7 +3,7 @@ name: servicemesh-operator-ambient
 description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
 icon: https://raw.githubusercontent.com/openshift/console/master/frontend/public/imgs/logos/openshift.svg
 type: application
-version: 1.3.1
+version: 1.3.2
 appVersion: "3.0"
 dependencies:
   - name: helper-status-checker

charts/servicemesh-operator-ambient/templates/operatorgroup.yaml

@@ -5,8 +5,7 @@ metadata:
   name: {{ .Values.operatorGroup.name | default .Values.subscription.name }}
   namespace: {{ .Values.namespace }}
   annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-weight: "-1"
+    argocd.argoproj.io/sync-wave: "-1"
 spec:
   {{- if .Values.operatorGroup.targetNamespaces }}
   targetNamespaces:

charts/servicemesh-operator-ambient/templates/subscription.yaml

@@ -4,8 +4,7 @@ metadata:
   name: {{ .Values.subscription.name }}
   namespace: {{ .Values.namespace }}
   annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-weight: "0"
+    argocd.argoproj.io/sync-wave: "0"
 spec:
   channel: {{ .Values.subscription.channel }}
   installPlanApproval: {{ .Values.subscription.installPlanApproval }}