Skip to content

pkg/asset/manifests: Drop oidc-ca.crt #568

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
openshift-merge-robot merged 1 commit into from
Oct 30, 2018
Merged

pkg/asset/manifests: Drop oidc-ca.crt #568

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
1 change: 0 additions & 1 deletion pkg/asset/manifests/content/bootkube/kube-apiserver-secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ data:
etcd-client-ca.crt: {{.EtcdCaCert}}
etcd-client.crt: {{.EtcdClientCert}}
etcd-client.key: {{.EtcdClientKey}}
oidc-ca.crt: {{.OidcCaCert}}
service-serving-ca.crt: {{.ServiceServingCaCert}}
service-serving-ca.key: {{.ServiceServingCaKey}}
kubeconfig: {{.OpenshiftLoopbackKubeconfig}}
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/content/bootkube/openshift-apiserver-secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ data:
etcd-client-ca.crt: {{.EtcdCaCert}}
etcd-client.crt: {{.EtcdClientCert}}
etcd-client.key: {{.EtcdClientKey}}
oidc-ca.crt: {{.OidcCaCert}}
service-serving-ca.crt: {{.ServiceServingCaCert}}
service-serving-ca.key: {{.ServiceServingCaKey}}
kubeconfig: {{.OpenshiftLoopbackKubeconfig}}
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
KubeCaKey: base64.StdEncoding.EncodeToString(kubeCA.Key()),
McsTLSCert: base64.StdEncoding.EncodeToString(mcsCertKey.Cert()),
McsTLSKey: base64.StdEncoding.EncodeToString(mcsCertKey.Key()),
OidcCaCert: base64.StdEncoding.EncodeToString(kubeCA.Cert()),
OpenshiftApiserverCert: base64.StdEncoding.EncodeToString(openshiftAPIServerCertKey.Cert()),
OpenshiftApiserverKey: base64.StdEncoding.EncodeToString(openshiftAPIServerCertKey.Key()),
OpenshiftLoopbackKubeconfig: base64.StdEncoding.EncodeToString(adminKubeconfig.Files()[0].Data),
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ type bootkubeTemplateData struct {
KubeCaKey string
McsTLSCert string
McsTLSKey string
OidcCaCert string
OpenshiftApiserverCert string
OpenshiftApiserverKey string
OpenshiftLoopbackKubeconfig string
Expand Down