Skip to content
This repository was archived by the owner on Jun 29, 2022. It is now read-only.

Commit 0757c8a

Browse files
committed
apiserver: Add mandatory flags
In 1.20 release `TokenRequest` has become GA. Hence the kube-apiserver flags `--service-account-signing-key-file` and `--service-account-issuer` are now required. This commit adds those flags. Read more: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#urgent-upgrade-notes
1 parent 6cdf8b3 commit 0757c8a

File tree

6 files changed

+8
-0
lines changed

6 files changed

+8
-0
lines changed

assets/charts/control-plane/kube-apiserver/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
4141
- --secure-port=6443
4242
- --service-account-key-file=/etc/kubernetes/secrets/service-account.pub
43+
- --service-account-signing-key-file=/etc/kubernetes/secrets/service-account.private
44+
- --service-account-issuer=kubernetes.default.svc
4345
- --service-cluster-ip-range={{ .Values.apiserver.serviceCIDR }}
4446
- --storage-backend=etcd3
4547
- --tls-cert-file=/etc/kubernetes/secrets/apiserver.crt

assets/charts/control-plane/kube-apiserver/templates/kube-apiserver-secret.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
apiserver.key: "{{ .Values.apiserver.apiserverKey }}"
33
apiserver.crt: "{{ .Values.apiserver.apiserverCert }}"
44
service-account.pub: "{{ .Values.apiserver.serviceAccountPub }}"
5+
service-account.private: "{{ .Values.apiserver.serviceAccountPrivate }}"
56
ca.crt: "{{ .Values.apiserver.caCert }}"
67
etcd-client-ca.crt: "{{ .Values.apiserver.etcdClientCaCert }}"
78
etcd-client.crt: "{{ .Values.apiserver.etcdClientCert }}"

assets/charts/control-plane/kube-apiserver/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiserver:
22
apiserverKey:
33
apiserverCert:
44
serviceAccountPub:
5+
serviceAccountPrivate:
56
caCert:
67
etcdClientCaCert:
78
etcdClientCert:

assets/terraform-modules/bootkube/assets.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ resource "local_file" "kube-apiserver" {
4040
apiserver_key = base64encode(tls_private_key.apiserver.private_key_pem)
4141
apiserver_cert = base64encode(tls_locally_signed_cert.apiserver.cert_pem)
4242
serviceaccount_pub = base64encode(tls_private_key.service-account.public_key_pem)
43+
serviceaccount_private = base64encode(tls_private_key.service-account.private_key_pem)
4344
etcd_ca_cert = base64encode(tls_self_signed_cert.etcd-ca.cert_pem)
4445
etcd_client_cert = base64encode(tls_locally_signed_cert.client.cert_pem)
4546
etcd_client_key = base64encode(tls_private_key.client.private_key_pem)

assets/terraform-modules/bootkube/resources/bootstrap-manifests/bootstrap-apiserver.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ spec:
3939
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
4040
- --secure-port=6443
4141
- --service-account-key-file=/etc/kubernetes/secrets/service-account.pub
42+
- --service-account-signing-key-file=/etc/kubernetes/secrets/service-account.key
43+
- --service-account-issuer=kubernetes.default.svc
4244
- --service-cluster-ip-range=${service_cidr}
4345
- --storage-backend=etcd3
4446
- --tls-cert-file=/etc/kubernetes/secrets/apiserver.crt

assets/terraform-modules/bootkube/resources/charts/kube-apiserver.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiserver:
22
apiserverKey: ${apiserver_key}
33
apiserverCert: ${apiserver_cert}
44
serviceAccountPub: ${serviceaccount_pub}
5+
serviceAccountPrivate: ${serviceaccount_private}
56
caCert: ${ca_cert}
67
etcdClientCaCert: ${etcd_ca_cert}
78
etcdClientCert: ${etcd_client_cert}

0 commit comments

Comments
 (0)