Merge pull request #79 from Ortec-Finance/fix-operator-on-cluster-reboot

adding annotations for sync waves to fix operators first bootup issue
Ortec-Finance · May 6, 2024 · 6d6534d · 6d6534d
1 parent 3d263c8
commit 6d6534d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.27.0
+Fixed Operator Sync waves
+
 ## v0.25.0
 Adding a Multi Cluster Controller Component. This Controller enables you to create Bridge Queues with ease using a `SailfishCluster` CRD.
 

diff --git a/k8s/cluster-config/operators/amq/subscription.yaml b/k8s/cluster-config/operators/amq/subscription.yaml
@@ -3,6 +3,8 @@ kind: Subscription
 metadata:
   name: amq-broker-rhel8
   namespace: openshift-operators
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
 spec:
   channel: 7.11.x
   installPlanApproval: Automatic

diff --git a/k8s/cluster-config/operators/keda/controller.yaml b/k8s/cluster-config/operators/keda/controller.yaml
@@ -4,7 +4,8 @@ metadata:
   name: keda
   namespace: openshift-keda
   annotations:
-    argocd.argoproj.io/sync-wave: "1"
+    argocd.argoproj.io/sync-wave: "3"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   metricsServer:
     logLevel: '0'

diff --git a/k8s/cluster-config/operators/keda/namespace.yaml b/k8s/cluster-config/operators/keda/namespace.yaml
@@ -3,6 +3,6 @@ kind: Namespace
 metadata:
   name: openshift-keda
   annotations:
-    argocd.argoproj.io/sync-wave: "-1"
+    argocd.argoproj.io/sync-wave: "0"
 spec: {}
 
diff --git a/k8s/cluster-config/operators/keda/operator-group.yaml b/k8s/cluster-config/operators/keda/operator-group.yaml
@@ -3,6 +3,8 @@ kind: OperatorGroup
 metadata:
   name: openshift-keda
   namespace: openshift-keda
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   targetNamespaces:
   - openshift-keda
diff --git a/k8s/cluster-config/operators/keda/subscription.yaml b/k8s/cluster-config/operators/keda/subscription.yaml
@@ -3,6 +3,8 @@ kind: Subscription
 metadata:
   name: openshift-custom-metrics-autoscaler-operator
   namespace: openshift-keda
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   channel: stable
   installPlanApproval: Automatic

diff --git a/k8s/cluster-config/operators/knative/controller.yaml b/k8s/cluster-config/operators/knative/controller.yaml
@@ -7,12 +7,13 @@ metadata:
   name: knative-serving
   namespace: knative-serving
   annotations:
-    argocd.argoproj.io/sync-wave: "1"
+    argocd.argoproj.io/sync-wave: "3"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   config:
     features:
       kubernetes.podspec-fieldref: enabled
   controller-custom-certs:
     name: ''
     type: ''
-  registry: {}
+  registry: {}
diff --git a/k8s/cluster-config/operators/knative/namespace.yaml b/k8s/cluster-config/operators/knative/namespace.yaml
@@ -2,11 +2,15 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-serverless
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
 spec: {}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: knative-serving
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
 spec: {}
 
diff --git a/k8s/cluster-config/operators/knative/operator-group.yaml b/k8s/cluster-config/operators/knative/operator-group.yaml
@@ -3,3 +3,5 @@ kind: OperatorGroup
 metadata:
   name: openshift-serverless
   namespace: openshift-serverless
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
diff --git a/k8s/cluster-config/operators/knative/subscription.yaml b/k8s/cluster-config/operators/knative/subscription.yaml
@@ -4,7 +4,7 @@ metadata:
   name: serverless-operator
   namespace: openshift-serverless
   annotations:
-    argocd.argoproj.io/sync-wave: "-1"
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   channel: stable
   installPlanApproval: Automatic