[k8s-suppport] - Adding Kubernetes tests

Intersmash · Jul 5, 2023 · 7d22324 · 7d22324
1 parent ca27aa9
commit 7d22324
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 25 deletions.
diff --git a/.ci/openshift-ci/build-root/e2e-test.sh b/.ci/openshift-ci/build-root/e2e-test.sh
@@ -90,4 +90,4 @@ cat test.properties
 
 mkdir local-repo
 mvn clean install -Dmaven.repo.local=./local-repo -DskipTests
-mvn test -Dmaven.repo.local=./local-repo -pl testsuite/
+mvn test -Dmaven.repo.local=./local-repo -pl testsuite/ -Pts.openshift
diff --git a/.github/workflows/kubernetes-e2e.yml b/.github/workflows/kubernetes-e2e.yml
@@ -1,26 +1,78 @@
-name: Intersmash - Simple build workflow
+name: Kubernetes E2E Tests
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
   pull_request:
-    branches: [ "main" ]
+    paths-ignore:
+      - 'doc/**'
+      - 'ide-config/**'
+      - '**.md'
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ci-e2e-intersmash-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  simple-build:
-    if: '! github.event.pull_request.draft'
+  minikube:
+    name: K8S
     runs-on: ubuntu-latest
-
+    if: github.repository == 'Intersmash/intersmash'
+    strategy:
+      fail-fast: false
+      matrix:
+        kubernetes: [v1.25.0, v1.24.0]
     steps:
-      - name: Set up Maven
-        uses: stCarolas/[email protected]
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Minikube-Kubernetes
+        uses: manusa/[email protected]
+        with:
+          minikube version: v1.25.0
+          kubernetes version: ${{ matrix.kubernetes }}
+          github token: ${{ secrets.GITHUB_TOKEN }}
+          start args: '--force'
+      - name: Cache .m2 registry
+        uses: actions/cache@v3
         with:
-          maven-version: 3.8.7
-      - uses: actions/checkout@v3
+          path: ~/.m2/repository
+          key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
-      - name: Build with Maven
-        run: mvn -version ; mvn clean install -U -B -DskipTests
+      - name: Install and Run Integration Tests
+        run: |
+          set -x
+          # cat our ~/.kube/config contents
+          #
+          cat ~/.kube/config
+          #
+          # operator-sdk must be installed manually, see 
+          #
+          export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
+          export OS=$(uname | awk '{print tolower($0)}')
+          export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.28.0
+          curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH}
+          chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk
+          operator-sdk olm install
+          #
+          # set the Kubernetes hostname that will resolve to the minikube IP
+          #
+          export KUBERNETES_HOSTNAME=host.minikube.internal
+          #
+          # run...
+          #
+          mkdir local-repo
+          mvn clean install -Dmaven.repo.local=./local-repo -DskipTests
+          mvn test -Dmaven.repo.local=./local-repo -pl testsuite/ -Pts.k8s \
+          -Dintersmash.kubernetes.url=https://$( minikube ip):8443 \
+          -Dintersmash.kubernetes.hostname=$KUBERNETES_HOSTNAME \
+          -Dintersmash.kubernetes.namespace=test-k8s-1 \
+          -Dintersmash.olm.operators.catalog_source=community-operators \
+          -Dintersmash.olm.operators.namespace=olm \
+          -Dintersmash.hyperfoil.operators.catalog_source=operatorhubio-catalog
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -63,4 +63,33 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>ts.k8s</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <groups>ts.k8s</groups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>ts.openshift</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <groups>ts.k8s</groups>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java b/testsuite/src/main/java/org/jboss/intersmash/testsuite/k8s/KubernetesTest.java
@@ -1,11 +1,11 @@
 package org.jboss.intersmash.testsuite.k8s;
 
-import org.junit.jupiter.api.Tag;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Tag;
+
 /**
  * Mark test that runs against Kubernetes.
  * Used per class.

diff --git a/testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java b/testsuite/src/main/java/org/jboss/intersmash/testsuite/openshift/OpenShiftTest.java
@@ -1,11 +1,11 @@
 package org.jboss.intersmash.testsuite.openshift;
 
-import org.junit.jupiter.api.Tag;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Tag;
+
 /**
  * Mark test that runs against OpenShift.
  * Used per class.

diff --git a/...sh/testsuite/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisionerTest.java b/...sh/testsuite/provision/openshift/KeycloakRealmImportOpenShiftOperatorProvisionerTest.java
@@ -24,8 +24,8 @@
 
 import org.jboss.intersmash.testsuite.openshift.OpenShiftTest;
 import org.jboss.intersmash.testsuite.openshift.ProjectCreationCapable;
-import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication;
 import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication;
+import org.jboss.intersmash.tools.application.operator.KeycloakRealmImportOperatorApplication;
 import org.jboss.intersmash.tools.junit5.IntersmashExtension;
 import org.jboss.intersmash.tools.provision.openshift.KeycloakRealmImportOpenShiftOperatorProvisioner;
 import org.jboss.intersmash.tools.provision.openshift.PostgreSQLImageOpenShiftProvisioner;
@@ -51,6 +51,7 @@
 import org.keycloak.k8s.v2alpha1.keycloakspec.db.UsernameSecret;
 import org.slf4j.event.Level;
 
+import cz.xtf.core.config.OpenShiftConfig;
 import cz.xtf.core.openshift.OpenShiftWaiters;
 import cz.xtf.core.openshift.OpenShifts;
 import cz.xtf.core.waiting.SimpleWaiter;
@@ -105,7 +106,8 @@ public String getDbName() {
 	private static final PostgreSQLImageOpenShiftProvisioner POSTGRESQL_IMAGE_PROVISIONER = new PostgreSQLImageOpenShiftProvisioner(
 			pgSQLApplication);
 
-	private static KeycloakRealmImportOpenShiftOperatorProvisioner initializeOperatorProvisioner(final Keycloak keycloak, final String appName) {
+	private static KeycloakRealmImportOpenShiftOperatorProvisioner initializeOperatorProvisioner(final Keycloak keycloak,
+			final String appName) {
 		KeycloakRealmImportOpenShiftOperatorProvisioner operatorProvisioner = new KeycloakRealmImportOpenShiftOperatorProvisioner(
 				new KeycloakRealmImportOperatorApplication() {
 
@@ -130,9 +132,10 @@ public String getName() {
 	@BeforeAll
 	public static void createOperatorGroup() throws IOException {
 		matchLabels.put("app", "sso");
-		IntersmashExtension.operatorCleanup();
+		IntersmashExtension.operatorCleanup(false, true);
 		// create operator group - this should be done by InteropExtension
-		OpenShifts.adminBinary().execute("apply", "-f", OperatorGroup.SINGLE_NAMESPACE.save().getAbsolutePath());
+		OpenShifts.adminBinary().execute("apply", "-f",
+				new OperatorGroup(OpenShiftConfig.namespace()).save().getAbsolutePath());
 	}
 
 	@AfterAll

diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -30,14 +30,14 @@
 import org.jboss.intersmash.deployments.IntersmashSharedDeployments;
 import org.jboss.intersmash.testsuite.openshift.OpenShiftTest;
 import org.jboss.intersmash.tools.IntersmashConfig;
+import org.jboss.intersmash.tools.application.input.BinarySource;
+import org.jboss.intersmash.tools.application.input.BuildInput;
+import org.jboss.intersmash.tools.application.input.BuildInputBuilder;
 import org.jboss.intersmash.tools.application.openshift.BootableJarOpenShiftApplication;
-import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication;
 import org.jboss.intersmash.tools.application.openshift.MysqlImageOpenShiftApplication;
 import org.jboss.intersmash.tools.application.openshift.PostgreSQLImageOpenShiftApplication;
 import org.jboss.intersmash.tools.application.openshift.WildflyImageOpenShiftApplication;
-import org.jboss.intersmash.tools.application.input.BinarySource;
-import org.jboss.intersmash.tools.application.input.BuildInput;
-import org.jboss.intersmash.tools.application.input.BuildInputBuilder;
+import org.jboss.intersmash.tools.application.operator.KafkaOperatorApplication;
 import org.jboss.intersmash.tools.util.IntersmashToolsProvisionersProperties;
 
 import cz.xtf.builder.builders.SecretBuilder;

diff --git a/...nt/src/main/java/org/jboss/intersmash/tools/k8s/client/binary/KubernetesClientBinary.java b/...nt/src/main/java/org/jboss/intersmash/tools/k8s/client/binary/KubernetesClientBinary.java
@@ -83,6 +83,7 @@ public void apply(String namespace, List<String> sourcePaths) {
 	}
 
 	public void namespace(String projectName) {
+		// see https://kubernetes.io/docs/reference/kubectl/cheatsheet/#kubectl-context-and-configuration
 		this.execute("config", "set-context", "--current", String.format("--namespace=%s", projectName));
 	}