Skip to content

Commit 282394a

Browse files
pooknullnmarukovichhorstplavcic
authored
K8SPSMDB-1014: update cert-manager certs and issuers (#1383)
* K8SPSMDB-1014: update cert-manager certs and issuers https://jira.percona.com/browse/K8SPSMDB-1014 * fix * Fix upgrade from `1.14.0` * fix test * fix merge * update `upgrade-consistency-sharded-tls` * fix `TestReconcileStatefulSet` * fix test * don't use dry controller for deleting deprecated issuer * rename variables * fix * check if sharding is enabled * rename `isAllStsHasLatestSSL` --------- Co-authored-by: Natalia Marukovich <nmarukovich@gmail.com> Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com> Co-authored-by: Tomislav Plavcic <tomislav.plavcic@percona.com>
1 parent a821182 commit 282394a

35 files changed

+914
-248
lines changed

clientcmd/clientcmd.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"k8s.io/client-go/kubernetes/scheme"
99
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1010
restclient "k8s.io/client-go/rest"
11-
"k8s.io/client-go/tools/clientcmd"
1211
"k8s.io/client-go/tools/remotecommand"
1312
)
1413

@@ -17,29 +16,16 @@ type Client struct {
1716
restconfig *restclient.Config
1817
}
1918

20-
func NewClient() (*Client, error) {
21-
// Instantiate loader for kubeconfig file.
22-
kubeconfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
23-
clientcmd.NewDefaultClientConfigLoadingRules(),
24-
&clientcmd.ConfigOverrides{},
25-
)
26-
27-
// Get a rest.Config from the kubeconfig file. This will be passed into all
28-
// the client objects we create.
29-
restconfig, err := kubeconfig.ClientConfig()
30-
if err != nil {
31-
return nil, err
32-
}
33-
19+
func NewClient(config *restclient.Config) (*Client, error) {
3420
// Create a Kubernetes core/v1 client.
35-
cl, err := corev1client.NewForConfig(restconfig)
21+
cl, err := corev1client.NewForConfig(config)
3622
if err != nil {
3723
return nil, err
3824
}
3925

4026
return &Client{
4127
client: cl,
42-
restconfig: restconfig,
28+
restconfig: config,
4329
}, nil
4430
}
4531

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apiVersion: cert-manager.io/v1
22
kind: Certificate
33
metadata:
4+
annotations: {}
45
generation: 1
56
name: some-name-ssl-internal
67
ownerReferences:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apiVersion: cert-manager.io/v1
22
kind: Certificate
33
metadata:
4+
annotations: {}
45
generation: 1
56
name: some-name-ssl
67
ownerReferences:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apiVersion: cert-manager.io/v1
22
kind: Issuer
33
metadata:
4+
annotations: {}
45
generation: 1
56
name: some-name-psmdb-ca-issuer
67
ownerReferences:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apiVersion: cert-manager.io/v1
22
kind: Issuer
33
metadata:
4+
annotations: {}
45
generation: 1
56
name: some-name-psmdb-issuer
67
ownerReferences:

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1150-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 7
5+
generation: 5
66
labels:
77
app.kubernetes.io/component: cfg
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1150.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 7
5+
generation: 5
66
labels:
77
app.kubernetes.io/component: cfg
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1160-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 10
5+
generation: 8
66
labels:
77
app.kubernetes.io/component: cfg
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1160.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 10
5+
generation: 8
66
labels:
77
app.kubernetes.io/component: cfg
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1150-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 8
5+
generation: 5
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

0 commit comments

Comments
 (0)