Skip to content

switch to new discrete certs for sa/ca.crt #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deads2k merged 1 commit into from
Feb 23, 2019
Merged

switch to new discrete certs for sa/ca.crt #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindata/bootkube/config/bootstrap-config-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kubecontrolplane.config.openshift.io/v1
kind: KubeControllerManagerConfig
extendedArguments:
root-ca-file:
- "/etc/kubernetes/secrets/kube-ca.crt"
- "/etc/kubernetes/secrets/kube-apiserver-complete-server-ca-bundle.crt"
service-account-private-key-file:
- "/etc/kubernetes/secrets/service-account.key"
cluster-signing-cert-file:
Expand Down
2 changes: 0 additions & 2 deletions bindata/bootkube/config/config-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: kubecontrolplane.config.openshift.io/v1
kind: KubeControllerManagerConfig
extendedArguments:
service-account-private-key-file:
- "/var/run/secrets/service-account-private-key/service-account.key"
cluster-signing-cert-file:
- "/var/run/secrets/cluster-signing-ca/kube-ca.crt"
cluster-signing-key-file:
Expand Down
9 changes: 0 additions & 9 deletions bindata/bootkube/manifests/configmap-initial-kube-controller-manager-serviceaccount-ca.yaml
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions pkg/operator/targetconfigcontroller/targetconfigcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,8 @@ func manageServiceAccountCABundle(lister corev1listers.ConfigMapLister, client c
requiredConfigMap, err := resourcesynccontroller.CombineCABundleConfigMaps(
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.TargetNamespace, Name: "serviceaccount-ca"},
lister, client, recorder,
// include ca bundles from the installer
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalUserSpecifiedConfigNamespace, Name: "initial-serviceaccount-ca"},
// include the ca bundle needed to recognize the server
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "managed-kube-apiserver-serving-cert-signer"},
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "kube-apiserver-server-ca"},
// include the ca bundle needed to recognize default
// certificates generated by cluster-ingress-operator
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "router-ca"},
Expand Down