From 67887179d12b9adb9ae809b24668d82b8a40a3de Mon Sep 17 00:00:00 2001 From: csviri Date: Wed, 6 Jul 2022 10:58:05 +0200 Subject: [PATCH 1/7] feat: update fabric8 client to v6 RC1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0f394d4..abe6f93a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ https://sonarcloud.io 5.8.2 - 5.12.2 + 6.0.0-RC1 1.7.32 2.17.1 4.1.0 From ff2dfc359671131a7bed65bc891fe34a579be3b9 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 2 Sep 2022 12:53:00 +0200 Subject: [PATCH 2/7] client to v 6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abe6f93a..e96976ca 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ https://sonarcloud.io 5.8.2 - 6.0.0-RC1 + 6.1.1 1.7.32 2.17.1 4.1.0 From fcc2508f249e973d6f45f3c2cf1bc6715f1ec9b3 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 2 Sep 2022 13:06:09 +0200 Subject: [PATCH 3/7] remove dekorate dependencies --- pom.xml | 1 + samples/commons/pom.xml | 1 - samples/spring-boot/pom.xml | 16 ---------------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index e96976ca..31b2754e 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 3.3.1 3.0.1 3.2.1 + 2.7.3 diff --git a/samples/commons/pom.xml b/samples/commons/pom.xml index 3d70ff7b..e06ad7a5 100644 --- a/samples/commons/pom.xml +++ b/samples/commons/pom.xml @@ -14,7 +14,6 @@ 11 - 2.6.6 diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 3bec0ace..aa60c907 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -15,7 +15,6 @@ 11 - 2.6.6 2.11.1 @@ -40,21 +39,6 @@ org.springframework.boot spring-boot-starter-webflux - - io.dekorate - kubernetes-spring-starter - ${dekorate.version} - - - io.dekorate - certmanager-annotations - ${dekorate.version} - - - io.dekorate - jib-annotations - ${dekorate.version} - org.springframework.boot spring-boot-starter-test From 32ad2c42be6bacdb7baa58286b3fc976880aa205 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 2 Sep 2022 13:22:58 +0200 Subject: [PATCH 4/7] dekorate put back --- samples/spring-boot/pom.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index aa60c907..b7e45c43 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -15,7 +15,7 @@ 11 - 2.11.1 + 2.11.2 @@ -39,6 +39,21 @@ org.springframework.boot spring-boot-starter-webflux + + io.dekorate + kubernetes-spring-starter + ${dekorate.version} + + + io.dekorate + certmanager-annotations + ${dekorate.version} + + + io.dekorate + jib-annotations + ${dekorate.version} + org.springframework.boot spring-boot-starter-test From f63b0cd09f74fd93c78e989f7a83eaae5b9f3705 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 5 Sep 2022 13:57:47 +0200 Subject: [PATCH 5/7] dekorate temp removal --- .github/workflows/pr.yml | 2 +- samples/spring-boot/k8s/kubernetes.yml | 131 +++++++++++++++++++++++++ samples/spring-boot/pom.xml | 15 --- 3 files changed, 132 insertions(+), 16 deletions(-) create mode 100644 samples/spring-boot/k8s/kubernetes.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 65369bf2..0ca7d715 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -72,7 +72,7 @@ jobs: ./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests # Install manifests - kubectl apply -f target/classes/META-INF/dekorate/kubernetes.yml + kubectl apply -f k8s/kubernetes.yml # Wait until the service is started kubectl wait --for=condition=available --timeout=600s deployment/spring-boot-sample diff --git a/samples/spring-boot/k8s/kubernetes.yml b/samples/spring-boot/k8s/kubernetes.yml new file mode 100644 index 00000000..4ecf6399 --- /dev/null +++ b/samples/spring-boot/k8s/kubernetes.yml @@ -0,0 +1,131 @@ +# Generated by dekorate - replace with generate if dekorate supports v6.1.1 fabric8 client +--- +apiVersion: v1 +kind: Secret +metadata: + name: pkcs12-pass +data: + password: c3VwZXJzZWNyZXQ= +type: Opaque +--- +apiVersion: v1 +kind: Service +metadata: + annotations: + app.dekorate.io/vcs-url: <> + labels: + app.kubernetes.io/name: spring-boot-sample + app.kubernetes.io/version: 0.2.1-SNAPSHOT + name: spring-boot-sample +spec: + ports: + - name: http + port: 443 + targetPort: 443 + selector: + app.kubernetes.io/name: spring-boot-sample + app.kubernetes.io/version: 0.2.1-SNAPSHOT + type: ClusterIP +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + annotations: + app.dekorate.io/vcs-url: <> + labels: + app.kubernetes.io/version: 0.2.1-SNAPSHOT + app.kubernetes.io/name: spring-boot-sample + name: spring-boot-sample +spec: + dnsNames: + - spring-boot-sample.test.svc + - localhost + duration: 7776000000000000ns + encodeUsagesInRequest: false + isCA: false + issuerRef: + name: spring-boot-sample + keystores: + pkcs12: + create: true + passwordSecretRef: + key: password + name: pkcs12-pass + privateKey: + algorithm: RSA + encoding: PKCS8 + size: 2048 + renewBefore: 1296000000000000ns + secretName: tls-secret + subject: + organizations: + - Dekorate + - Community + usages: + - server auth + - client auth +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + app.dekorate.io/vcs-url: <> + labels: + app.kubernetes.io/version: 0.2.1-SNAPSHOT + app.kubernetes.io/name: spring-boot-sample + name: spring-boot-sample +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/version: 0.2.1-SNAPSHOT + app.kubernetes.io/name: spring-boot-sample + template: + metadata: + annotations: + app.dekorate.io/vcs-url: <> + labels: + app.kubernetes.io/version: 0.2.1-SNAPSHOT + app.kubernetes.io/name: spring-boot-sample + spec: + containers: + - env: + - name: KUBERNETES_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: SERVER_SSL_KEY_STORE + value: /etc/certs/keystore.p12 + - name: SERVER_SSL_KEY_STORE_PASSWORD + valueFrom: + secretKeyRef: + key: password + name: pkcs12-pass + image: csviri/spring-boot-sample:0.2.1-SNAPSHOT + imagePullPolicy: IfNotPresent + name: spring-boot-sample + ports: + - containerPort: 443 + name: http + protocol: TCP + volumeMounts: + - mountPath: /etc/certs + name: volume-certs + readOnly: true + volumes: + - name: volume-certs + secret: + optional: false + secretName: tls-secret +--- +apiVersion: cert-manager.io/v1 +kind: Issuer +metadata: + annotations: + app.dekorate.io/vcs-url: <> + labels: + app.kubernetes.io/version: 0.2.1-SNAPSHOT + app.kubernetes.io/name: spring-boot-sample + name: spring-boot-sample +spec: + selfSigned: {} diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index b7e45c43..0a8252df 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -39,21 +39,6 @@ org.springframework.boot spring-boot-starter-webflux - - io.dekorate - kubernetes-spring-starter - ${dekorate.version} - - - io.dekorate - certmanager-annotations - ${dekorate.version} - - - io.dekorate - jib-annotations - ${dekorate.version} - org.springframework.boot spring-boot-starter-test From acb0d24d003a2ae4a03363b6f3f0ea49b5e7e1e4 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 5 Sep 2022 14:22:59 +0200 Subject: [PATCH 6/7] image generation fix --- .github/workflows/pr.yml | 4 +++- samples/spring-boot/k8s/kubernetes.yml | 4 ++-- samples/spring-boot/pom.xml | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0ca7d715..bfa96156 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -69,7 +69,9 @@ jobs: # Generate manifests and image cd samples/spring-boot - ./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests + ./mvnw jib:dockerBuild + kind load docker-image spring-boot-sample:latest + # ./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests # Install manifests kubectl apply -f k8s/kubernetes.yml diff --git a/samples/spring-boot/k8s/kubernetes.yml b/samples/spring-boot/k8s/kubernetes.yml index 4ecf6399..47da37a9 100644 --- a/samples/spring-boot/k8s/kubernetes.yml +++ b/samples/spring-boot/k8s/kubernetes.yml @@ -101,8 +101,8 @@ spec: secretKeyRef: key: password name: pkcs12-pass - image: csviri/spring-boot-sample:0.2.1-SNAPSHOT - imagePullPolicy: IfNotPresent + image: csviri/spring-boot-sample:latest + imagePullPolicy: Never name: spring-boot-sample ports: - containerPort: 443 diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 0a8252df..567b3509 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -15,7 +15,7 @@ 11 - 2.11.2 + 3.3.0 @@ -68,6 +68,19 @@ + + com.google.cloud.tools + jib-maven-plugin + ${jib-maven-plugin.version} + + + gcr.io/distroless/java:11 + + + spring-boot-sample + + + org.springframework.boot spring-boot-maven-plugin From 7aee90ba7a77ae615c65242f35063eefc0ea0a6d Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 5 Sep 2022 15:50:37 +0200 Subject: [PATCH 7/7] image name fix --- samples/spring-boot/k8s/kubernetes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/spring-boot/k8s/kubernetes.yml b/samples/spring-boot/k8s/kubernetes.yml index 47da37a9..82fc8eaf 100644 --- a/samples/spring-boot/k8s/kubernetes.yml +++ b/samples/spring-boot/k8s/kubernetes.yml @@ -101,7 +101,7 @@ spec: secretKeyRef: key: password name: pkcs12-pass - image: csviri/spring-boot-sample:latest + image: spring-boot-sample:latest imagePullPolicy: Never name: spring-boot-sample ports: