FAR: Remove OCP 4.12, 4.13 lanes and adding 4.18 lane (#58825)

* Remove OCP 4.12, 4.13 lanes and adding 4.18 lane 4.12 EUS ends at January 17, 2026, and 4.13 Maintenance ends at November 17, 2024 * Run make update Apply changes from /config to /jobs
openshift · Dec 9, 2024 · ed41092 · ed41092
1 parent 306fd27
commit ed41092
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 485 deletions.
diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.12.yaml
diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.14.yaml
@@ -42,6 +42,7 @@ tests:
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
       OPERATOR_NAMESPACE: far-install
+      OPERATOR_RELEASED_VERSION: 0.4.0
     test:
     - as: e2e-install-operator-last-version
       cli: latest
@@ -53,9 +54,10 @@ tests:
         oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
         # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
-        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run
+        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v"$OPERATOR_RELEASED_VERSION" make bundle-run
       env:
       - name: OPERATOR_NAMESPACE
+      - name: OPERATOR_RELEASED_VERSION
       from: src
       resources:
         requests:

diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.15.yaml
@@ -42,6 +42,7 @@ tests:
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
       OPERATOR_NAMESPACE: far-install
+      OPERATOR_RELEASED_VERSION: 0.4.0
     test:
     - as: e2e-install-operator-last-version
       cli: latest
@@ -53,9 +54,10 @@ tests:
         oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
         # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
-        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run
+        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v"$OPERATOR_RELEASED_VERSION" make bundle-run
       env:
       - name: OPERATOR_NAMESPACE
+      - name: OPERATOR_RELEASED_VERSION
       from: src
       resources:
         requests:

diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.16.yaml
@@ -42,6 +42,7 @@ tests:
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
       OPERATOR_NAMESPACE: far-install
+      OPERATOR_RELEASED_VERSION: 0.4.0
     test:
     - as: e2e-install-operator-last-version
       cli: latest
@@ -53,9 +54,10 @@ tests:
         oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
         # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
-        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run
+        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v"$OPERATOR_RELEASED_VERSION" make bundle-run
       env:
       - name: OPERATOR_NAMESPACE
+      - name: OPERATOR_RELEASED_VERSION
       from: src
       resources:
         requests:

diff --git a/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.17.yaml b/.../config/medik8s/fence-agents-remediation/medik8s-fence-agents-remediation-main__4.17.yaml
@@ -42,6 +42,7 @@ tests:
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
       OPERATOR_NAMESPACE: far-install
+      OPERATOR_RELEASED_VERSION: 0.4.0
     test:
     - as: e2e-install-operator-last-version
       cli: latest
@@ -53,9 +54,10 @@ tests:
         oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
         # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
-        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run
+        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v"$OPERATOR_RELEASED_VERSION" make bundle-run
       env:
       - name: OPERATOR_NAMESPACE
+      - name: OPERATOR_RELEASED_VERSION
       from: src
       resources:
         requests:

diff --git a/...-fence-agents-remediation-main__4.13.yaml → ...-fence-agents-remediation-main__4.18.yaml b/...-fence-agents-remediation-main__4.13.yaml → ...-fence-agents-remediation-main__4.18.yaml
@@ -23,7 +23,7 @@ releases:
     candidate:
       product: ocp
       stream: ci
-      version: "4.13"
+      version: "4.18"
 resources:
   '*':
     requests:
@@ -42,6 +42,7 @@ tests:
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
       OPERATOR_NAMESPACE: far-install
+      OPERATOR_RELEASED_VERSION: 0.4.0
     test:
     - as: e2e-install-operator-last-version
       cli: latest
@@ -53,9 +54,10 @@ tests:
         oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
 
         # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
-        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v0.3.0 make bundle-run
+        BUNDLE_IMG=quay.io/medik8s/fence-agents-remediation-operator-bundle:v"$OPERATOR_RELEASED_VERSION" make bundle-run
       env:
       - name: OPERATOR_NAMESPACE
+      - name: OPERATOR_RELEASED_VERSION
       from: src
       resources:
         requests:
@@ -90,4 +92,4 @@ zz_generated_metadata:
   branch: main
   org: medik8s
   repo: fence-agents-remediation
-  variant: "4.13"
+  variant: "4.18"