Skip to content

Commit f63b0cd

Browse files
csviricsviri
committed
dekorate temp removal
1 parent 32ad2c4 commit f63b0cd

File tree

3 files changed

+132
-16
lines changed

3 files changed

+132
-16
lines changed

‎.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
./mvnw ${MAVEN_ARGS} clean install -Ddekorate.jib.registry=$KIND_REGISTRY -Ddekorate.jib.group=tests -Ddekorate.jib.version=latest -Ddekorate.jib.autoPushEnabled=true -DskipTests
7373
7474
# Install manifests
75-
kubectl apply -f target/classes/META-INF/dekorate/kubernetes.yml
75+
kubectl apply -f k8s/kubernetes.yml
7676
7777
# Wait until the service is started
7878
kubectl wait --for=condition=available --timeout=600s deployment/spring-boot-sample

‎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: csviri/spring-boot-sample:0.2.1-SNAPSHOT
105+
imagePullPolicy: IfNotPresent
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: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,6 @@
3939
<groupId>org.springframework.boot</groupId>
4040
<artifactId>spring-boot-starter-webflux</artifactId>
4141
</dependency>
42-
<dependency>
43-
<groupId>io.dekorate</groupId>
44-
<artifactId>kubernetes-spring-starter</artifactId>
45-
<version>${dekorate.version}</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>io.dekorate</groupId>
49-
<artifactId>certmanager-annotations</artifactId>
50-
<version>${dekorate.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>io.dekorate</groupId>
54-
<artifactId>jib-annotations</artifactId>
55-
<version>${dekorate.version}</version>
56-
</dependency>
5742
<dependency>
5843
<groupId>org.springframework.boot</groupId>
5944
<artifactId>spring-boot-starter-test</artifactId>

0 commit comments

Comments
 (0)