Correct template keys according to implementation (#240)

Should bring them close to CronJobs/Deployments
appuio · May 2, 2023 · 4979aaf · 4979aaf
1 parent 054aba5
commit 4979aaf
Showing 1 changed file with 39 additions and 36 deletions.
diff --git a/docs/modules/ROOT/pages/references/architecture/upgrade_controller.adoc b/docs/modules/ROOT/pages/references/architecture/upgrade_controller.adoc
@@ -215,12 +215,13 @@ metadata:
   name: version
 spec:
   template: <1>
-    capabilities:
-      baselineCapabilitySet: v4.11
-    channel: stable-4.11
-    clusterID: bc75be34-e92d-4745-bb9d-8ec39e877854
-    desiredUpdate: {} <2>
-    upstream: https://api.openshift.com/api/upgrades_info/v1/graph
+    spec:
+      capabilities:
+        baselineCapabilitySet: v4.11
+      channel: stable-4.11
+      clusterID: bc75be34-e92d-4745-bb9d-8ec39e877854
+      desiredUpdate: {} <2>
+      upstream: https://api.openshift.com/api/upgrades_info/v1/graph
 ----
 <1> Template for the `ClusterVersion/version` object.
 <2> The `desiredUpdate` is ignored and set by the `UpgradeJob` controller.
@@ -245,36 +246,38 @@ spec:
   pinVersionWindow: "4h" <2>
   maxUpgradeStartDelay: "1h" <3>
   jobTemplate:
-    upgradeTimeout: "2h" <4>
-    preUpgradeHealthChecks: <5>
-      timeout: "30m"
-      checkCriticalAlerts: true
-      checkDegradedOperators: true
-      excludeAlerts:
-      - alertname: "KubePodCrashLooping"
-      excludeNamespaces:
-      - openshift-console
-      excludeOperators:
-      - openshift-monitoring
-      customQueries:
-      - query: "up{job=~"^argocd-.+$",namespace="syn"} != 1"
-    postUpgradeHealthChecks: <6>
-      timeout: "30m"
-      checkCriticalAlerts: true
-      checkDegradedOperators: true
-      excludeAlerts:
-      - alertname: "KubePodCrashLooping"
-      excludeNamespaces:
-      - openshift-console
-      excludeOperators:
-      - openshift-monitoring
-      customQueries:
-      - query: "up{job=~"^argocd-.+$",namespace="syn"} != 1"
-    webhooks: <7>
-      - url: "https://example.com/webhook"
-        annotations:
-          cluster_id: "bar"
-          tenant_id: "foo"
+    spec:
+      config:
+        upgradeTimeout: "2h" <4>
+        preUpgradeHealthChecks: <5>
+          timeout: "30m"
+          checkCriticalAlerts: true
+          checkDegradedOperators: true
+          excludeAlerts:
+          - alertname: "KubePodCrashLooping"
+          excludeNamespaces:
+          - openshift-console
+          excludeOperators:
+          - openshift-monitoring
+          customQueries:
+          - query: "up{job=~"^argocd-.+$",namespace="syn"} != 1"
+        postUpgradeHealthChecks: <6>
+          timeout: "30m"
+          checkCriticalAlerts: true
+          checkDegradedOperators: true
+          excludeAlerts:
+          - alertname: "KubePodCrashLooping"
+          excludeNamespaces:
+          - openshift-console
+          excludeOperators:
+          - openshift-monitoring
+          customQueries:
+          - query: "up{job=~"^argocd-.+$",namespace="syn"} != 1"
+        webhooks: <7>
+          - url: "https://example.com/webhook"
+            annotations:
+              cluster_id: "bar"
+              tenant_id: "foo"
   webhooks: <7>
     - url: "https://example.com/webhook"
       annotations: