Use 'eus' channels in non-prod

https://issues.redhat.com/browse/SDCICD-1365
openshift · Aug 20, 2024 · 2eaab49 · 2eaab49
1 parent c35c381
commit 2eaab49
Show file tree

Hide file tree

Showing 12 changed files with 420 additions and 0 deletions.
diff --git a/deploy/osd-channel-patch/stable-4.12-nonprod/01-patch.clusterversion.yaml b/deploy/osd-channel-patch/stable-4.12-nonprod/01-patch.clusterversion.yaml
@@ -0,0 +1,6 @@
+apiVersion: config.openshift.io/v1
+kind: ClusterVersion
+name: version
+applyMode: AlwaysApply
+patch: '{"spec":{"channel":"eus-4.12"}}'
+patchType: merge
diff --git a/deploy/osd-channel-patch/stable-4.12-nonprod/config.yaml b/deploy/osd-channel-patch/stable-4.12-nonprod/config.yaml
@@ -0,0 +1,13 @@
+deploymentMode: "SelectorSyncSet"
+selectorSyncSet:
+  matchExpressions:
+  - key: hive.openshift.io/version-major-minor
+    operator: In
+    values: ["4.12"]
+  - key: api.openshift.com/channel-group
+    operator: NotIn
+    values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: NotIn
+    values:
+      - "production"
diff --git a/deploy/osd-channel-patch/stable-4.12/config.yaml b/deploy/osd-channel-patch/stable-4.12/config.yaml
@@ -7,3 +7,7 @@ selectorSyncSet:
   - key: api.openshift.com/channel-group
     operator: NotIn
     values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: In
+    values:
+      - "production"
diff --git a/deploy/osd-channel-patch/stable-4.14-nonprod/01-patch.clusterversion.yaml b/deploy/osd-channel-patch/stable-4.14-nonprod/01-patch.clusterversion.yaml
@@ -0,0 +1,6 @@
+apiVersion: config.openshift.io/v1
+kind: ClusterVersion
+name: version
+applyMode: AlwaysApply
+patch: '{"spec":{"channel":"eus-4.14"}}'
+patchType: merge
diff --git a/deploy/osd-channel-patch/stable-4.14-nonprod/config.yaml b/deploy/osd-channel-patch/stable-4.14-nonprod/config.yaml
@@ -0,0 +1,13 @@
+deploymentMode: "SelectorSyncSet"
+selectorSyncSet:
+  matchExpressions:
+  - key: hive.openshift.io/version-major-minor
+    operator: In
+    values: ["4.14"]
+  - key: api.openshift.com/channel-group
+    operator: NotIn
+    values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: NotIn
+    values:
+      - "production"
diff --git a/deploy/osd-channel-patch/stable-4.14/config.yaml b/deploy/osd-channel-patch/stable-4.14/config.yaml
@@ -7,3 +7,7 @@ selectorSyncSet:
   - key: api.openshift.com/channel-group
     operator: NotIn
     values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: In
+    values:
+      - "production"
diff --git a/deploy/osd-channel-patch/stable-4.16-nonprod/01-patch.clusterversion.yaml b/deploy/osd-channel-patch/stable-4.16-nonprod/01-patch.clusterversion.yaml
@@ -0,0 +1,6 @@
+apiVersion: config.openshift.io/v1
+kind: ClusterVersion
+name: version
+applyMode: AlwaysApply
+patch: '{"spec":{"channel":"eus-4.16"}}'
+patchType: merge
diff --git a/deploy/osd-channel-patch/stable-4.16-nonprod/config.yaml b/deploy/osd-channel-patch/stable-4.16-nonprod/config.yaml
@@ -0,0 +1,13 @@
+deploymentMode: "SelectorSyncSet"
+selectorSyncSet:
+  matchExpressions:
+  - key: hive.openshift.io/version-major-minor
+    operator: In
+    values: ["4.16"]
+  - key: api.openshift.com/channel-group
+    operator: NotIn
+    values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: NotIn
+    values:
+      - "production"
diff --git a/deploy/osd-channel-patch/stable-4.16/config.yaml b/deploy/osd-channel-patch/stable-4.16/config.yaml
@@ -7,3 +7,7 @@ selectorSyncSet:
   - key: api.openshift.com/channel-group
     operator: NotIn
     values: ["nightly","candidate","fast"]
+  - key: api.openshift.com/environment
+    operator: In
+    values:
+      - "production"
diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl
@@ -27538,6 +27538,10 @@ objects:
         - nightly
         - candidate
         - fast
+      - key: api.openshift.com/environment
+        operator: In
+        values:
+        - production
     resourceApplyMode: Sync
     patches:
     - apiVersion: config.openshift.io/v1
@@ -27546,6 +27550,41 @@ objects:
       applyMode: AlwaysApply
       patch: '{"spec":{"channel":"stable-4.12"}}'
       patchType: merge
+- apiVersion: hive.openshift.io/v1
+  kind: SelectorSyncSet
+  metadata:
+    labels:
+      managed.openshift.io/gitHash: ${IMAGE_TAG}
+      managed.openshift.io/gitRepoName: ${REPO_NAME}
+      managed.openshift.io/osd: 'true'
+    name: osd-channel-patch-stable-4.12-nonprod
+  spec:
+    clusterDeploymentSelector:
+      matchLabels:
+        api.openshift.com/managed: 'true'
+      matchExpressions:
+      - key: hive.openshift.io/version-major-minor
+        operator: In
+        values:
+        - '4.12'
+      - key: api.openshift.com/channel-group
+        operator: NotIn
+        values:
+        - nightly
+        - candidate
+        - fast
+      - key: api.openshift.com/environment
+        operator: NotIn
+        values:
+        - production
+    resourceApplyMode: Sync
+    patches:
+    - apiVersion: config.openshift.io/v1
+      kind: ClusterVersion
+      name: version
+      applyMode: AlwaysApply
+      patch: '{"spec":{"channel":"eus-4.12"}}'
+      patchType: merge
 - apiVersion: hive.openshift.io/v1
   kind: SelectorSyncSet
   metadata:
@@ -27600,6 +27639,10 @@ objects:
         - nightly
         - candidate
         - fast
+      - key: api.openshift.com/environment
+        operator: In
+        values:
+        - production
     resourceApplyMode: Sync
     patches:
     - apiVersion: config.openshift.io/v1
@@ -27608,6 +27651,41 @@ objects:
       applyMode: AlwaysApply
       patch: '{"spec":{"channel":"stable-4.14"}}'
       patchType: merge
+- apiVersion: hive.openshift.io/v1
+  kind: SelectorSyncSet
+  metadata:
+    labels:
+      managed.openshift.io/gitHash: ${IMAGE_TAG}
+      managed.openshift.io/gitRepoName: ${REPO_NAME}
+      managed.openshift.io/osd: 'true'
+    name: osd-channel-patch-stable-4.14-nonprod
+  spec:
+    clusterDeploymentSelector:
+      matchLabels:
+        api.openshift.com/managed: 'true'
+      matchExpressions:
+      - key: hive.openshift.io/version-major-minor
+        operator: In
+        values:
+        - '4.14'
+      - key: api.openshift.com/channel-group
+        operator: NotIn
+        values:
+        - nightly
+        - candidate
+        - fast
+      - key: api.openshift.com/environment
+        operator: NotIn
+        values:
+        - production
+    resourceApplyMode: Sync
+    patches:
+    - apiVersion: config.openshift.io/v1
+      kind: ClusterVersion
+      name: version
+      applyMode: AlwaysApply
+      patch: '{"spec":{"channel":"eus-4.14"}}'
+      patchType: merge
 - apiVersion: hive.openshift.io/v1
   kind: SelectorSyncSet
   metadata:
@@ -27662,6 +27740,10 @@ objects:
         - nightly
         - candidate
         - fast
+      - key: api.openshift.com/environment
+        operator: In
+        values:
+        - production
     resourceApplyMode: Sync
     patches:
     - apiVersion: config.openshift.io/v1
@@ -27670,6 +27752,41 @@ objects:
       applyMode: AlwaysApply
       patch: '{"spec":{"channel":"stable-4.16"}}'
       patchType: merge
+- apiVersion: hive.openshift.io/v1
+  kind: SelectorSyncSet
+  metadata:
+    labels:
+      managed.openshift.io/gitHash: ${IMAGE_TAG}
+      managed.openshift.io/gitRepoName: ${REPO_NAME}
+      managed.openshift.io/osd: 'true'
+    name: osd-channel-patch-stable-4.16-nonprod
+  spec:
+    clusterDeploymentSelector:
+      matchLabels:
+        api.openshift.com/managed: 'true'
+      matchExpressions:
+      - key: hive.openshift.io/version-major-minor
+        operator: In
+        values:
+        - '4.16'
+      - key: api.openshift.com/channel-group
+        operator: NotIn
+        values:
+        - nightly
+        - candidate
+        - fast
+      - key: api.openshift.com/environment
+        operator: NotIn
+        values:
+        - production
+    resourceApplyMode: Sync
+    patches:
+    - apiVersion: config.openshift.io/v1
+      kind: ClusterVersion
+      name: version
+      applyMode: AlwaysApply
+      patch: '{"spec":{"channel":"eus-4.16"}}'
+      patchType: merge
 - apiVersion: hive.openshift.io/v1
   kind: SelectorSyncSet
   metadata: