Skip to content

Commit fda6e2d

Browse files
pooknullpooknull
authored
K8SPSMDB-1101: fix usage of custom cert-manager certificates (#1576)
* K8SPSMDB-1101: fix usage of custom cert-manager certificates https://perconadev.atlassian.net/browse/K8SPSMDB-1101 * fix test
1 parent daa6e72 commit fda6e2d

16 files changed

+337
-14
lines changed

‎e2e-tests/functions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@ compare_kubectl() {
654654
del(.spec.template.spec.containers[].env[] | select(.name == "NAMESPACE")) |
655655
del(.metadata.selfLink) |
656656
del(.metadata.annotations."cloud.google.com/neg") |
657+
del(.metadata.annotations."kubectl.kubernetes.io/last-applied-configuration") |
657658
del(.. | select(has("image")).image) |
658659
del(.. | select(has("clusterIP")).clusterIP) |
659660
del(.. | select(has("clusterIPs")).clusterIPs) |

‎e2e-tests/tls-issue-cert-manager/compare/certificate_some-name-ca-cert-custom.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
generation: 1
7+
name: some-name-ca-cert
8+
spec:
9+
commonName: some-name-ca
10+
duration: 8760h0m0s
11+
isCA: true
12+
issuerRef:
13+
kind: Issuer
14+
name: some-name-psmdb-ca-issuer
15+
renewBefore: 730h0m0s
16+
secretName: some-name-ca-cert

‎e2e-tests/tls-issue-cert-manager/compare/certificate_some-name-ssl-custom.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
generation: 1
7+
name: some-name-ssl
8+
spec:
9+
commonName: some-name
10+
dnsNames:
11+
- localhost
12+
- some-name-rs0
13+
- some-name-rs0.NAME_SPACE
14+
- some-name-rs0.NAME_SPACE.svc.cluster.local
15+
- '*.some-name-rs0'
16+
- '*.some-name-rs0.NAME_SPACE'
17+
- '*.some-name-rs0.NAME_SPACE.svc.cluster.local'
18+
- some-name-rs0.NAME_SPACE.svc.clusterset.local
19+
- '*.some-name-rs0.NAME_SPACE.svc.clusterset.local'
20+
- '*.NAME_SPACE.svc.clusterset.local'
21+
- some-name-mongos
22+
- some-name-mongos.NAME_SPACE
23+
- some-name-mongos.NAME_SPACE.svc.cluster.local
24+
- '*.some-name-mongos'
25+
- '*.some-name-mongos.NAME_SPACE'
26+
- '*.some-name-mongos.NAME_SPACE.svc.cluster.local'
27+
- some-name-cfg
28+
- some-name-cfg.NAME_SPACE
29+
- some-name-cfg.NAME_SPACE.svc.cluster.local
30+
- '*.some-name-cfg'
31+
- '*.some-name-cfg.NAME_SPACE'
32+
- '*.some-name-cfg.NAME_SPACE.svc.cluster.local'
33+
- some-name-mongos.NAME_SPACE.svc.clusterset.local
34+
- '*.some-name-mongos.NAME_SPACE.svc.clusterset.local'
35+
- some-name-cfg.NAME_SPACE.svc.clusterset.local
36+
- '*.some-name-cfg.NAME_SPACE.svc.clusterset.local'
37+
duration: 2160h0m0s
38+
issuerRef:
39+
kind: Issuer
40+
name: some-name-psmdb-issuer
41+
secretName: some-name-ssl
42+
subject:
43+
organizations:
44+
- CUSTOM

‎e2e-tests/tls-issue-cert-manager/compare/certificate_some-name-ssl-internal-custom.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
generation: 1
7+
name: some-name-ssl-internal
8+
spec:
9+
commonName: some-name
10+
dnsNames:
11+
- localhost
12+
- some-name-rs0
13+
- some-name-rs0.NAME_SPACE
14+
- some-name-rs0.NAME_SPACE.svc.cluster.local
15+
- '*.some-name-rs0'
16+
- '*.some-name-rs0.NAME_SPACE'
17+
- '*.some-name-rs0.NAME_SPACE.svc.cluster.local'
18+
- some-name-rs0.NAME_SPACE.svc.clusterset.local
19+
- '*.some-name-rs0.NAME_SPACE.svc.clusterset.local'
20+
- '*.NAME_SPACE.svc.clusterset.local'
21+
- some-name-mongos
22+
- some-name-mongos.NAME_SPACE
23+
- some-name-mongos.NAME_SPACE.svc.cluster.local
24+
- '*.some-name-mongos'
25+
- '*.some-name-mongos.NAME_SPACE'
26+
- '*.some-name-mongos.NAME_SPACE.svc.cluster.local'
27+
- some-name-cfg
28+
- some-name-cfg.NAME_SPACE
29+
- some-name-cfg.NAME_SPACE.svc.cluster.local
30+
- '*.some-name-cfg'
31+
- '*.some-name-cfg.NAME_SPACE'
32+
- '*.some-name-cfg.NAME_SPACE.svc.cluster.local'
33+
- some-name-mongos.NAME_SPACE.svc.clusterset.local
34+
- '*.some-name-mongos.NAME_SPACE.svc.clusterset.local'
35+
- some-name-cfg.NAME_SPACE.svc.clusterset.local
36+
- '*.some-name-cfg.NAME_SPACE.svc.clusterset.local'
37+
duration: 2160h0m0s
38+
issuerRef:
39+
kind: Issuer
40+
name: some-name-psmdb-issuer
41+
secretName: some-name-ssl-internal
42+
subject:
43+
organizations:
44+
- CUSTOM

‎e2e-tests/tls-issue-cert-manager/compare/issuer_some-name-psmdb-ca-issuer-custom.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Issuer
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
generation: 1
7+
name: some-name-psmdb-ca-issuer
8+
spec:
9+
selfSigned: {}

‎e2e-tests/tls-issue-cert-manager/compare/issuer_some-name-psmdb-issuer-custom.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Issuer
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
generation: 1
7+
name: some-name-psmdb-issuer
8+
spec:
9+
ca:
10+
secretName: some-name-ca-cert

‎e2e-tests/tls-issue-cert-manager/conf/some-name-ca-cert.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
name: some-name-ca-cert
7+
spec:
8+
commonName: some-name-ca
9+
duration: 8760h0m0s
10+
isCA: true
11+
issuerRef:
12+
kind: Issuer
13+
name: some-name-psmdb-ca-issuer
14+
renewBefore: 730h0m0s
15+
secretName: some-name-ca-cert

‎e2e-tests/tls-issue-cert-manager/conf/some-name-psmdb-ca-issuer.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Issuer
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
name: some-name-psmdb-ca-issuer
7+
spec:
8+
selfSigned: {}

‎e2e-tests/tls-issue-cert-manager/conf/some-name-psmdb-issuer.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Issuer
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
name: some-name-psmdb-issuer
7+
spec:
8+
ca:
9+
secretName: some-name-ca-cert

‎e2e-tests/tls-issue-cert-manager/conf/some-name-ssl-internal.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
annotations:
5+
some-random-annotation: "true"
6+
name: some-name-ssl-internal
7+
spec:
8+
commonName: some-name
9+
dnsNames:
10+
- localhost
11+
- some-name-rs0
12+
- some-name-rs0.NAME_SPACE
13+
- some-name-rs0.NAME_SPACE.svc.cluster.local
14+
- '*.some-name-rs0'
15+
- '*.some-name-rs0.NAME_SPACE'
16+
- '*.some-name-rs0.NAME_SPACE.svc.cluster.local'
17+
- some-name-rs0.NAME_SPACE.svc.clusterset.local
18+
- '*.some-name-rs0.NAME_SPACE.svc.clusterset.local'
19+
- '*.NAME_SPACE.svc.clusterset.local'
20+
- some-name-mongos
21+
- some-name-mongos.NAME_SPACE
22+
- some-name-mongos.NAME_SPACE.svc.cluster.local
23+
- '*.some-name-mongos'
24+
- '*.some-name-mongos.NAME_SPACE'
25+
- '*.some-name-mongos.NAME_SPACE.svc.cluster.local'
26+
- some-name-cfg
27+
- some-name-cfg.NAME_SPACE
28+
- some-name-cfg.NAME_SPACE.svc.cluster.local
29+
- '*.some-name-cfg'
30+
- '*.some-name-cfg.NAME_SPACE'
31+
- '*.some-name-cfg.NAME_SPACE.svc.cluster.local'
32+
- some-name-mongos.NAME_SPACE.svc.clusterset.local
33+
- '*.some-name-mongos.NAME_SPACE.svc.clusterset.local'
34+
- some-name-cfg.NAME_SPACE.svc.clusterset.local
35+
- '*.some-name-cfg.NAME_SPACE.svc.clusterset.local'
36+
duration: 2160h0m0s
37+
issuerRef:
38+
kind: Issuer
39+
name: some-name-psmdb-issuer
40+
secretName: some-name-ssl-internal
41+
subject:
42+
organizations:
43+
- CUSTOM

0 commit comments

Comments
 (0)