Refactor build ... (#103)

- split dev/test kustomize for faster builds
- scrape prometheus only once
- removed compose

.github/workflows/ci.yaml

@@ -53,7 +53,6 @@ jobs:
           distribution: temurin
           java-version: 17
           cache: maven
-      - run: mvn -B -ntp dependency:go-offline
       - run: mvn -B -ntp checkstyle:check
 
   verify:
@@ -70,5 +69,7 @@ jobs:
           distribution: temurin
           java-version: 17
           cache: maven
-      - run: mvn -B -ntp dependency:go-offline
-      - run: mvn -B -ntp verify -Dimage.tag.test=${{ matrix.image }} -Dcheckstyle.skip
+      - run: mvn -B -ntp verify -Dimage.tag.test=${{ matrix.image }} -Dcheckstyle.skip -Dk3s.skipRm
+      - name: Run kubectl logs -l app.kubernetes.io/name=keycloak
+        run: export KUBECONFIG=/home/runner/.kube/k3s-maven-plugin/mount/kubeconfig.yaml && kubectl logs -l app.kubernetes.io/name=keycloak --tail -1
+        if: ${{ failure() }}

README.md

@@ -59,8 +59,6 @@ Tags:
 
 ## Develop and testing
 
-### k3s
-
 Start k3s: `mvn pre-integration-test`
 
 Open <http://help.127.0.0.1.nip.io:8080> or use `kubectl`:
@@ -69,9 +67,3 @@ Open <http://help.127.0.0.1.nip.io:8080> or use `kubectl`:
 export KUBECONFIG=~/.kube/k3s-maven-plugin/mount/kubeconfig.yaml
 kubectl get all --all-namespaces
 ```
-
-### docker-compose
-
-Start compose: `docker-compose -f src/test/compose/docker-compose.yaml up`
-
-Open <http://keycloak.127.0.0.1.nip.io:8080>.

pom.xml

@@ -463,17 +463,14 @@
 					</execution>
 				</executions>
 				<configuration>
-					<command>kubectl apply -k .</command>
+					<command>kubectl apply -k test</command>
 					<manifests>${project.build.directory}/k3s</manifests>
 					<portBindings>
 						<portBinding>8080:8080</portBinding>
 					</portBindings>
 					<ctrImages>
-						<ctrImage>${image.dashboard}</ctrImage>
-						<ctrImage>${image.grafana}</ctrImage>
 						<ctrImage>${image.mailhog}</ctrImage>
 						<ctrImage>${image.postgresql}</ctrImage>
-						<ctrImage>${image.prometheus}</ctrImage>
 						<ctrImage>${image.traefik}</ctrImage>
 					</ctrImages>
 					<dockerImages>
@@ -577,4 +574,26 @@
 
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<activation>
+				<property>
+					<name>!env.CI</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>io.kokuwa.maven</groupId>
+						<artifactId>k3s-maven-plugin</artifactId>
+						<configuration>
+							<command>kubectl apply -k dev</command>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

src/test/java/io/kokuwa/keycloak/K3sIT.java

@@ -46,6 +46,7 @@ void metrics(Keycloak keycloak, Kubernetes kubernetes, OpenIDConnect oidc, Prome
 		// expect only one keycloak to get metrics from
 
 		kubernetes.scaleKeycloak(1);
+		prometheus.scrap();
 
 		// get state before test
 
@@ -72,6 +73,7 @@ void metrics(Keycloak keycloak, Kubernetes kubernetes, OpenIDConnect oidc, Prome
 
 		// check metrics count
 
+		prometheus.scrap();
 		assertAll("metrics",
 				() -> assertEquals(loginSuccessGrayc + 3, prometheus.logins(kokuwa), "kokuwa loginSuccess"),
 				() -> assertEquals(loginFailedGrayc + 2, prometheus.loginErrors(kokuwa), "kokuwa loginFailed"),

src/test/java/io/kokuwa/keycloak/keycloak/Prometheus.java

@@ -1,5 +1,6 @@
 package io.kokuwa.keycloak.keycloak;
 
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -15,14 +16,15 @@
  */
 public class Prometheus {
 
+	private final Set<PrometheusMetric> state = new HashSet<>();
 	private final PrometheusClient client;
 
 	public Prometheus(PrometheusClient client) {
 		this.client = client;
 	}
 
 	public int logins(RealmRepresentation realm) {
-		return scrap().stream()
+		return state.stream()
 				.filter(metric -> Objects.equals(metric.name(), "keycloak_event_user_total"))
 				.filter(metric -> Objects.equals(metric.tags().get("realm"), realm.getRealm()))
 				.filter(metric -> Objects.equals(metric.tags().get("type"), "LOGIN"))
@@ -31,17 +33,19 @@ public int logins(RealmRepresentation realm) {
 	}
 
 	public int loginErrors(RealmRepresentation realm) {
-		return scrap().stream()
+		return state.stream()
 				.filter(metric -> Objects.equals(metric.name(), "keycloak_event_user_total"))
 				.filter(metric -> Objects.equals(metric.tags().get("realm"), realm.getRealm()))
 				.filter(metric -> Objects.equals(metric.tags().get("type"), "LOGIN_ERROR"))
 				.mapToInt(metric -> metric.value().intValue())
 				.sum();
 	}
 
-	private Set<PrometheusMetric> scrap() {
-		return Stream.of(client.scrap().split("[\\r\\n]+"))
+	public void scrap() {
+		state.clear();
+		Stream.of(client.scrap().split("[\\r\\n]+"))
 				.filter(line -> !line.startsWith("#"))
+				.filter(line -> line.startsWith("keycloak"))
 				.map(line -> {
 					var name = line.substring(0, line.contains("{") ? line.indexOf("{") : line.lastIndexOf(" "));
 					var tags = line.contains("{")
@@ -53,6 +57,6 @@ private Set<PrometheusMetric> scrap() {
 					var value = Double.parseDouble(line.substring(line.lastIndexOf(" ")));
 					return new PrometheusMetric(name, tags, value);
 				})
-				.collect(Collectors.toSet());
+				.forEach(state::add);
 	}
 }

src/test/k3s/dev/kustomization.yaml

@@ -0,0 +1,34 @@
+resources:
+  - ../test
+
+patches:
+
+  # enable user deployments
+  - target:
+      kind: Deployment
+      name: help
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 1
+  - target:
+      kind: Deployment
+      name: kubernetes-dashboard
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 1
+  - target:
+      kind: Deployment
+      name: grafana
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 1
+  - target:
+      kind: Deployment
+      name: prometheus
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 1

src/test/k3s/dashboard/deployment.yaml → src/test/k3s/test/dashboard/deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: kubernetes-dashboard
 spec:
+  replicas: 0
   selector:
     matchLabels:
       app.kubernetes.io/name: kubernetes-dashboard
@@ -14,7 +15,7 @@ spec:
       containers:
         - name: dashboard
           image: ${image.dashboard}
-          imagePullPolicy: Never
+          imagePullPolicy: IfNotPresent
           args:
             - --namespace=default
             - --disable-settings-authorizer=true

src/test/k3s/grafana/deployment.yaml → src/test/k3s/test/grafana/deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: grafana
 spec:
+  replicas: 0
   selector:
     matchLabels:
       app.kubernetes.io/name: grafana
@@ -18,7 +19,7 @@ spec:
       initContainers:
         - name: postgresql
           image: ${image.postgresql}
-          imagePullPolicy: Never
+          imagePullPolicy: IfNotPresent
           command: [sh, -c, until psql; do sleep 2; done]
           env:
             - name: PGHOST

src/test/k3s/help/deployment.yaml → src/test/k3s/test/help/deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: help
 spec:
+  replicas: 0
   selector:
     matchLabels:
       app.kubernetes.io/name: help

src/test/k3s/prometheus/deployment.yaml → src/test/k3s/test/prometheus/deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: prometheus
 spec:
+  replicas: 0
   strategy:
     type: Recreate
   selector:
@@ -16,7 +17,7 @@ spec:
       containers:
         - name: prometheus
           image: ${image.prometheus}
-          imagePullPolicy: Never
+          imagePullPolicy: IfNotPresent
           args:
             - --storage.tsdb.path=/data
             - --config.file=/etc/config/prometheus.yaml