test ocp 4.9 compatibility (#5)

* test ocp 4.9 compatibility * Use rancher to test k8s versions * Tested versions
trustification · Jul 8, 2024 · 1c9bb5d · 1c9bb5d
1 parent 1078f0f
commit 1c9bb5d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        kubernetes_version: [ v1.25.3, v1.26.3, v1.27.5, v1.28.1 ]
+        kubernetes_version: [ v1.23.17-k3s1, v1.24.17-k3s1, v1.25.16-k3s4, v1.26.15-k3s1, v1.27.15-k3s2, v1.28.11-k3s2 ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -25,16 +25,8 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'maven'
-      - name: Setup Minikube-Kubernetes
-        # check version in https://github.com/manusa/actions-setup-minikube/releases
-        uses: manusa/[email protected]
-        with:
-          # check version in https://github.com/kubernetes/minikube/releases
-          minikube version: 'v1.32.0'
-          start args: '--addons=ingress'
-          kubernetes version: ${{ matrix.kubernetes_version }}
-          github token: ${{ secrets.GITHUB_TOKEN }}
-          driver: 'docker'
       - name: Test
+        env:
+          KUBERNETES_VERSION: ${{ matrix.kubernetes_version }}
         run: |
           mvn verify
diff --git a/bundle.Containerfile b/bundle.Containerfile
@@ -18,7 +18,7 @@ source "$HOME/.sdkman/bin/sdkman-init.sh" && \
 sdk install java && \
 sdk install groovy && \
 groovy scripts/enrichCSV.groovy /code/target/bundle/trustify-operator/manifests/trustify-operator.clusterserviceversion.yaml && \
-echo '  com.redhat.openshift.versions: "v4.9"' >> /code/target/bundle/trustify-operator/metadata/annotations.yaml
+echo '  com.redhat.openshift.versions: "v4.10"' >> /code/target/bundle/trustify-operator/metadata/annotations.yaml
 
 FROM scratch
 # Core bundle labels.

diff --git a/src/main/java/org/trustify/operator/TrustiCSVMetadata.java b/src/main/java/org/trustify/operator/TrustiCSVMetadata.java
@@ -97,7 +97,7 @@
                 }]
                 """
         ),
-        minKubeVersion = "1.16.0"
+        minKubeVersion = "1.23.0"
 )
 public class TrustiCSVMetadata implements SharedCSVMetadata {
 }
diff --git a/src/test/java/org/trustify/operator/controllers/setup/K3sResource.java b/src/test/java/org/trustify/operator/controllers/setup/K3sResource.java
@@ -5,9 +5,10 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Map;
+import java.util.Optional;
 
 public class K3sResource implements QuarkusTestResourceLifecycleManager {
-    static K3sContainer k3sContainer = new K3sContainer(DockerImageName.parse("rancher/k3s:latest"));
+    static K3sContainer k3sContainer = new K3sContainer(DockerImageName.parse("rancher/k3s:" + Optional.ofNullable(System.getenv("KUBERNETES_VERSION")).orElse("latest")));
 
     @Override
     public Map<String, String> start() {