Skip to content

Commit e74351b

Browse files
csviricsviri
authored
feat: update fabric8 client to v6 RC1 (#26)
1 parent 38044b3 commit e74351b

File tree

5 files changed

+151
-21
lines changed

5 files changed

+151
-21
lines changed

‎.github/workflows/pr.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ jobs:
6969
7070
# Generate manifests and image
7171
cd samples/spring-boot
72-
./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests
72+
./mvnw jib:dockerBuild
73+
kind load docker-image spring-boot-sample:latest
74+
# ./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests
7375
7476
# Install manifests
75-
kubectl apply -f target/classes/META-INF/dekorate/kubernetes.yml
77+
kubectl apply -f k8s/kubernetes.yml
7678
7779
# Wait until the service is started
7880
kubectl wait --for=condition=available --timeout=600s deployment/spring-boot-sample

‎pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
4141

4242
<junit.version>5.8.2</junit.version>
43-
<fabric8-client.version>5.12.2</fabric8-client.version>
43+
<fabric8-client.version>6.1.1</fabric8-client.version>
4444
<slf4j.version>1.7.32</slf4j.version>
4545
<log4j.version>2.17.1</log4j.version>
4646
<mokito.version>4.1.0</mokito.version>
@@ -63,6 +63,7 @@
6363
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
6464
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
6565
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
66+
<spring-boot-dependencies.version>2.7.3</spring-boot-dependencies.version>
6667
</properties>
6768

6869
<modules>

‎samples/commons/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<properties>
1616
<java.version>11</java.version>
17-
<spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
1817
</properties>
1918

2019
<dependencies>

‎samples/spring-boot/k8s/kubernetes.yml

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
# Generated by dekorate - replace with generate if dekorate supports v6.1.1 fabric8 client
2+
---
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: pkcs12-pass
7+
data:
8+
password: c3VwZXJzZWNyZXQ=
9+
type: Opaque
10+
---
11+
apiVersion: v1
12+
kind: Service
13+
metadata:
14+
annotations:
15+
app.dekorate.io/vcs-url: <<unknown>>
16+
labels:
17+
app.kubernetes.io/name: spring-boot-sample
18+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
19+
name: spring-boot-sample
20+
spec:
21+
ports:
22+
- name: http
23+
port: 443
24+
targetPort: 443
25+
selector:
26+
app.kubernetes.io/name: spring-boot-sample
27+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
28+
type: ClusterIP
29+
---
30+
apiVersion: cert-manager.io/v1
31+
kind: Certificate
32+
metadata:
33+
annotations:
34+
app.dekorate.io/vcs-url: <<unknown>>
35+
labels:
36+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
37+
app.kubernetes.io/name: spring-boot-sample
38+
name: spring-boot-sample
39+
spec:
40+
dnsNames:
41+
- spring-boot-sample.test.svc
42+
- localhost
43+
duration: 7776000000000000ns
44+
encodeUsagesInRequest: false
45+
isCA: false
46+
issuerRef:
47+
name: spring-boot-sample
48+
keystores:
49+
pkcs12:
50+
create: true
51+
passwordSecretRef:
52+
key: password
53+
name: pkcs12-pass
54+
privateKey:
55+
algorithm: RSA
56+
encoding: PKCS8
57+
size: 2048
58+
renewBefore: 1296000000000000ns
59+
secretName: tls-secret
60+
subject:
61+
organizations:
62+
- Dekorate
63+
- Community
64+
usages:
65+
- server auth
66+
- client auth
67+
---
68+
apiVersion: apps/v1
69+
kind: Deployment
70+
metadata:
71+
annotations:
72+
app.dekorate.io/vcs-url: <<unknown>>
73+
labels:
74+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
75+
app.kubernetes.io/name: spring-boot-sample
76+
name: spring-boot-sample
77+
spec:
78+
replicas: 1
79+
selector:
80+
matchLabels:
81+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
82+
app.kubernetes.io/name: spring-boot-sample
83+
template:
84+
metadata:
85+
annotations:
86+
app.dekorate.io/vcs-url: <<unknown>>
87+
labels:
88+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
89+
app.kubernetes.io/name: spring-boot-sample
90+
spec:
91+
containers:
92+
- env:
93+
- name: KUBERNETES_NAMESPACE
94+
valueFrom:
95+
fieldRef:
96+
fieldPath: metadata.namespace
97+
- name: SERVER_SSL_KEY_STORE
98+
value: /etc/certs/keystore.p12
99+
- name: SERVER_SSL_KEY_STORE_PASSWORD
100+
valueFrom:
101+
secretKeyRef:
102+
key: password
103+
name: pkcs12-pass
104+
image: spring-boot-sample:latest
105+
imagePullPolicy: Never
106+
name: spring-boot-sample
107+
ports:
108+
- containerPort: 443
109+
name: http
110+
protocol: TCP
111+
volumeMounts:
112+
- mountPath: /etc/certs
113+
name: volume-certs
114+
readOnly: true
115+
volumes:
116+
- name: volume-certs
117+
secret:
118+
optional: false
119+
secretName: tls-secret
120+
---
121+
apiVersion: cert-manager.io/v1
122+
kind: Issuer
123+
metadata:
124+
annotations:
125+
app.dekorate.io/vcs-url: <<unknown>>
126+
labels:
127+
app.kubernetes.io/version: 0.2.1-SNAPSHOT
128+
app.kubernetes.io/name: spring-boot-sample
129+
name: spring-boot-sample
130+
spec:
131+
selfSigned: {}

‎samples/spring-boot/pom.xml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
<properties>
1717
<java.version>11</java.version>
18-
<spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
19-
<dekorate.version>2.11.1</dekorate.version>
18+
<jib-maven-plugin.version>3.3.0</jib-maven-plugin.version>
2019
</properties>
2120

2221
<dependencyManagement>
@@ -40,21 +39,6 @@
4039
<groupId>org.springframework.boot</groupId>
4140
<artifactId>spring-boot-starter-webflux</artifactId>
4241
</dependency>
43-
<dependency>
44-
<groupId>io.dekorate</groupId>
45-
<artifactId>kubernetes-spring-starter</artifactId>
46-
<version>${dekorate.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>io.dekorate</groupId>
50-
<artifactId>certmanager-annotations</artifactId>
51-
<version>${dekorate.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>io.dekorate</groupId>
55-
<artifactId>jib-annotations</artifactId>
56-
<version>${dekorate.version}</version>
57-
</dependency>
5842
<dependency>
5943
<groupId>org.springframework.boot</groupId>
6044
<artifactId>spring-boot-starter-test</artifactId>
@@ -84,6 +68,19 @@
8468

8569
<build>
8670
<plugins>
71+
<plugin>
72+
<groupId>com.google.cloud.tools</groupId>
73+
<artifactId>jib-maven-plugin</artifactId>
74+
<version>${jib-maven-plugin.version}</version>
75+
<configuration>
76+
<from>
77+
<image>gcr.io/distroless/java:11</image>
78+
</from>
79+
<to>
80+
<image>spring-boot-sample</image>
81+
</to>
82+
</configuration>
83+
</plugin>
8784
<plugin>
8885
<groupId>org.springframework.boot</groupId>
8986
<artifactId>spring-boot-maven-plugin</artifactId>

0 commit comments

Comments
 (0)