kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reissue client keypairs on issuer change

This commit is contained in:
John Gardiner Myers 2021-11-26 11:11:37 -08:00
parent 2b059a06d3
commit daca9fb2b8
19 changed files with 198 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
View File

@ -2,6 +2,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -10,6 +11,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -18,6 +20,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -26,6 +29,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -34,6 +38,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca

5
pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
View File

@ -2,6 +2,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -10,6 +11,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -18,6 +20,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -26,6 +29,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -34,6 +38,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca

5
pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml
View File

@ -2,6 +2,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -10,6 +11,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -18,6 +20,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -26,6 +29,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -34,6 +38,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca

5
pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
View File

@ -2,6 +2,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -10,6 +11,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -18,6 +20,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -26,6 +29,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -34,6 +38,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
View File

@ -79,6 +79,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -87,6 +88,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -95,6 +97,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -103,6 +106,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -111,6 +115,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -119,6 +124,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -130,10 +136,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -145,10 +153,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -157,6 +167,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -165,6 +176,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
View File

@ -78,6 +78,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -86,6 +87,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -94,6 +96,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -102,6 +105,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -110,6 +114,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -118,6 +123,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -129,10 +135,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -144,10 +152,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -156,6 +166,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -164,6 +175,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
View File

@ -78,6 +78,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -86,6 +87,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -94,6 +96,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -102,6 +105,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -110,6 +114,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -118,6 +123,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -129,10 +135,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -144,10 +152,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -156,6 +166,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -164,6 +175,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml
View File

@ -77,6 +77,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -85,6 +86,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -93,6 +95,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -101,6 +104,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -109,6 +113,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -117,6 +122,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -128,10 +134,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -143,10 +151,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -155,6 +165,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -163,6 +174,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
View File

@ -545,6 +545,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -553,6 +554,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -561,6 +563,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -569,6 +572,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -577,6 +581,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -585,6 +590,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -596,10 +602,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -611,10 +619,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -623,6 +633,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -631,6 +642,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
View File

@ -520,6 +520,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -528,6 +529,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -536,6 +538,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -544,6 +547,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -552,6 +556,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -560,6 +565,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -571,10 +577,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -586,10 +594,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -598,6 +608,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -606,6 +617,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
View File

@ -557,6 +557,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -565,6 +566,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -573,6 +575,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -581,6 +584,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -589,6 +593,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -597,6 +602,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -608,10 +614,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -623,10 +631,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -635,6 +645,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -643,6 +654,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml
View File

@ -479,6 +479,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -487,6 +488,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -495,6 +497,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -503,6 +506,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -511,6 +515,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -519,6 +524,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -530,10 +536,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -545,10 +553,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -557,6 +567,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -565,6 +576,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
View File

@ -235,6 +235,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -243,6 +244,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -251,6 +253,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -259,6 +262,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -267,6 +271,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -275,6 +280,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -286,10 +292,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -301,10 +309,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -313,6 +323,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -321,6 +332,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml
View File

@ -261,6 +261,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -269,6 +270,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -277,6 +279,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -285,6 +288,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -293,6 +297,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -301,6 +306,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -312,10 +318,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -327,10 +335,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -339,6 +349,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -347,6 +358,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml
View File

@ -161,6 +161,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -169,6 +170,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -177,6 +179,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -185,6 +188,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -193,6 +197,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -201,6 +206,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -212,10 +218,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -227,10 +235,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -239,6 +249,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -247,6 +258,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml
View File

@ -187,6 +187,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -195,6 +196,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -203,6 +205,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -211,6 +214,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -219,6 +223,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -227,6 +232,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -238,10 +244,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -253,10 +261,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -265,6 +275,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -273,6 +284,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml
View File

@ -79,6 +79,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -87,6 +88,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -95,6 +97,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -103,6 +106,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -111,6 +115,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -119,6 +124,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -130,10 +136,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -145,10 +153,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -157,6 +167,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -165,6 +176,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

12
pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml
View File

@ -79,6 +79,7 @@ Lifecycle: ""
Name: apiserver-aggregator-ca Name: apiserver-aggregator-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=apiserver-aggregator-ca subject: cn=apiserver-aggregator-ca
type: ca type: ca
@ -87,6 +88,7 @@ Lifecycle: ""
Name: etcd-clients-ca Name: etcd-clients-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-clients-ca subject: cn=etcd-clients-ca
type: ca type: ca
@ -95,6 +97,7 @@ Lifecycle: ""
Name: etcd-manager-ca-events Name: etcd-manager-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-events subject: cn=etcd-manager-ca-events
type: ca type: ca
@ -103,6 +106,7 @@ Lifecycle: ""
Name: etcd-manager-ca-main Name: etcd-manager-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-manager-ca-main subject: cn=etcd-manager-ca-main
type: ca type: ca
@ -111,6 +115,7 @@ Lifecycle: ""
Name: etcd-peers-ca-events Name: etcd-peers-ca-events
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-events subject: cn=etcd-peers-ca-events
type: ca type: ca
@ -119,6 +124,7 @@ Lifecycle: ""
Name: etcd-peers-ca-main Name: etcd-peers-ca-main
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=etcd-peers-ca-main subject: cn=etcd-peers-ca-main
type: ca type: ca
@ -130,10 +136,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kube-proxy subject: cn=kube-proxy
type: client type: client
@ -145,10 +153,12 @@ Signer:
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubelet subject: cn=kubelet
type: client type: client
@ -157,6 +167,7 @@ Lifecycle: ""
Name: kubernetes-ca Name: kubernetes-ca
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=kubernetes subject: cn=kubernetes
type: ca type: ca
@ -165,6 +176,7 @@ Lifecycle: ""
Name: service-account Name: service-account
Signer: null Signer: null
alternateNames: null alternateNames: null
issuer: ""
oldFormat: false oldFormat: false
subject: cn=service-account subject: cn=service-account
type: ca type: ca

10
upup/pkg/fi/fitasks/keypair.go
View File

@ -40,6 +40,8 @@ type Keypair struct {
Signer *Keypair Signer *Keypair
// Subject is the certificate subject // Subject is the certificate subject
Subject string `json:"subject"` Subject string `json:"subject"`
// Issuer is the certificate issuer, if not the same as the subject.
Issuer string `json:"issuer"`
// Type the type of certificate i.e. CA, server, client etc // Type the type of certificate i.e. CA, server, client etc
Type string `json:"type"` Type string `json:"type"`
// LegacyFormat is whether the keypair is stored in a legacy format. // LegacyFormat is whether the keypair is stored in a legacy format.
@ -93,6 +95,7 @@ func (e *Keypair) Find(c *fi.Context) (*Keypair, error) {
Name: &name, Name: &name,
AlternateNames: alternateNames, AlternateNames: alternateNames,
Subject: pki.PkixNameToString(&cert.Subject), Subject: pki.PkixNameToString(&cert.Subject),
Issuer: pki.PkixNameToString(&cert.Certificate.Issuer),
Type: pki.BuildTypeDescription(cert.Certificate), Type: pki.BuildTypeDescription(cert.Certificate),
LegacyFormat: keyset.LegacyFormat, LegacyFormat: keyset.LegacyFormat,
} }
@ -131,6 +134,9 @@ func (e *Keypair) normalize() error {
sort.Strings(alternateNames) sort.Strings(alternateNames)
e.AlternateNames = alternateNames e.AlternateNames = alternateNames
if e.Signer != nil {
e.Issuer = e.Signer.Subject
}
return nil return nil
} }
@ -146,6 +152,7 @@ func (_ *Keypair) CheckChanges(a, e, changes *Keypair) error {
func (_ *Keypair) ShouldCreate(a, e, changes *Keypair) (bool, error) { func (_ *Keypair) ShouldCreate(a, e, changes *Keypair) (bool, error) {
// Don't reissue a CA just because the Subject or AlternateNames changed // Don't reissue a CA just because the Subject or AlternateNames changed
if a != nil && e.Type == "ca" && changes.Type == "" && !a.LegacyFormat { if a != nil && e.Type == "ca" && changes.Type == "" && !a.LegacyFormat {
e.Subject = a.Subject
return false, nil return false, nil
} }
@ -171,6 +178,9 @@ func (_ *Keypair) Render(c *fi.Context, a, e, changes *Keypair) error {
} else if changes.Subject != "" && e.Type != "ca" { } else if changes.Subject != "" && e.Type != "ca" {
createCertificate = true createCertificate = true
klog.V(8).Infof("creating certificate new Subject") klog.V(8).Infof("creating certificate new Subject")
} else if changes.Issuer != "" {
createCertificate = true
klog.V(8).Infof("creating certificate new Issuer")
} else if changes.Type != "" { } else if changes.Type != "" {
createCertificate = true createCertificate = true
klog.Infof("creating certificate %q as Type has changed (actual=%v, expected=%v)", name, a.Type, e.Type) klog.Infof("creating certificate %q as Type has changed (actual=%v, expected=%v)", name, a.Type, e.Type)