Skip to content

Add tls assets for the clusterapi-operator #79

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 3 commits into from
Jul 30, 2018
Merged

Add tls assets for the clusterapi-operator #79

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc23f7
Add tls assets for the clusterapi-operator
Jul 26, 2018
0095711
cluster-apiserver tls: fix naming
Jul 30, 2018
ac76d1d
sign cluster api cert with aggregator ca
Jul 30, 2018
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
14 changes: 14 additions & 0 deletions installer/pkg/config-generator/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const (
kubeCAKeyPath = "generated/tls/kube-ca.key"
kubeletCertPath = "generated/tls/kubelet.crt"
kubeletKeyPath = "generated/tls/kubelet.key"
clusterAPIServerCertPath = "generated/tls/clusterapi-apiserver-ca.crt"
clusterAPIServerKeyPath = "generated/tls/clusterapi-apiserver-ca.key"

@wking wking Jul 30, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be generated/tls/cluster-apiserver-ca.key for consistency with the domain name? Or maybe they could all be ...clusterapi-server... (closer to your 04-clusterapi-namespace.yaml)?

osAPIServerCertPath = "generated/tls/openshift-apiserver.crt"
osAPIServerKeyPath = "generated/tls/openshift-apiserver.key"
rootCACertPath = "generated/tls/root-ca.crt"
Expand Down Expand Up @@ -253,6 +255,18 @@ func (c *ConfigGenerator) GenerateTLSConfig(clusterDir string) error {
if _, _, err := generateCert(clusterDir, caKey, caCert, tncKeyPath, tncCertPath, cfg, false); err != nil {
return fmt.Errorf("failed to generate tnc certificate: %v", err)
}

// Cluster API cert
cfg = &tls.CertCfg{
Subject: pkix.Name{CommonName: "cluster-apiserver", OrganizationalUnit: []string{"bootkube"}},
KeyUsages: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
Validity: validityTenYears,
IsCA: true,
}
if _, _, err := generateCert(clusterDir, caKey, caCert, clusterAPIServerKeyPath, clusterAPIServerCertPath, cfg, true); err != nil {

@abhinavdahiya abhinavdahiya Jul 30, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being signed by root-ca. If this is an aggregated apiserver, it should be signed by aggregatorCA

return fmt.Errorf("failed to generate cluster-apiserver CA: %v", err)
}

return nil
}

Expand Down
3 changes: 3 additions & 0 deletions modules/bootkube/manifests.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ variable "manifest_names" {
"kube-controller-manager-secret.yaml",
"node-config-kind.yaml",
"openshift-apiserver-secret.yaml",
"clusterapi-apiserver-secret.yaml",
"pull.json",
"tectonic-network-operator.yaml",
"tectonic-node-controller-operator.yaml",
Expand Down Expand Up @@ -42,6 +43,8 @@ data "template_file" "manifest_file_list" {
openshift_apiserver_cert = "${base64encode(var.openshift_apiserver_cert_pem)}"
apiserver_proxy_key = "${base64encode(var.apiserver_proxy_key_pem)}"
apiserver_proxy_cert = "${base64encode(var.apiserver_proxy_cert_pem)}"
clusterapi_ca_cert = "${base64encode(var.clusterapi_ca_cert_pem)}"
clusterapi_ca_key = "${base64encode(var.clusterapi_ca_key_pem)}"
oidc_ca_cert = "${base64encode(var.oidc_ca_cert)}"
pull_secret = "${base64encode(file(var.pull_secret_path))}"
serviceaccount_pub = "${base64encode(tls_private_key.service_account.public_key_pem)}"
Expand Down
7 changes: 7 additions & 0 deletions modules/bootkube/resources/manifests/04-clusterapi-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v1
kind: Namespace
metadata:
# This is the namespace used to hold the machine-api-operator.
name: kube-cluster
labels:
name: kube-cluster
12 changes: 12 additions & 0 deletions modules/bootkube/resources/manifests/clusterapi-apiserver-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: v1
kind: Secret
type: kubernetes.io/tls
metadata:
name: cluster-apiserver-certs
namespace: default
labels:
api: clusterapi
apiserver: "true"
data:
tls.crt: ${clusterapi_ca_cert}
tls.key: ${clusterapi_ca_key}
8 changes: 8 additions & 0 deletions modules/bootkube/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ variable "oidc_ca_cert" {
type = "string"
}

variable "clusterapi_ca_cert_pem" {
type = "string"
}

variable "clusterapi_ca_key_pem" {
type = "string"
}

variable "service_cidr" {
description = "A CIDR notation IP range from which to assign service cluster IPs"
type = "string"
Expand Down
24 changes: 24 additions & 0 deletions steps/assets/base/ignition-tls.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,28 @@ data "ignition_file" "service_serving_ca_cert" {
path = "/opt/tectonic/tls/service-serving-ca.crt"
}

data "ignition_file" "clusterapi_ca_key" {
filesystem = "root"
mode = "0600"

content {
content = "${local.clusterapi_ca_key_pem}"
}

path = "/opt/tectonic/tls/clusterapi-apiserver-ca.key"
}

data "ignition_file" "clusterapi_ca_cert" {
filesystem = "root"
mode = "0644"

content {
content = "${local.clusterapi_ca_cert_pem}"
}

path = "/opt/tectonic/tls/clusterapi-apiserver-ca.crt"
}

data "ignition_file" "etcd_ca_key" {
filesystem = "root"
mode = "0600"
Expand Down Expand Up @@ -264,6 +286,8 @@ locals {
"${data.ignition_file.service_serving_ca_cert.id}",
"${data.ignition_file.etcd_ca_key.id}",
"${data.ignition_file.etcd_ca_cert.id}",
"${data.ignition_file.clusterapi_ca_key.id}",
"${data.ignition_file.clusterapi_ca_cert.id}",
]

etcd_certs_ignition_file_id_list = [
Expand Down
16 changes: 9 additions & 7 deletions steps/assets/base/inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
locals {
tls_path = "${path.cwd}/generated/tls"
admin_cert_pem = "${file("${local.tls_path}/admin.crt")}"
admin_key_pem = "${file("${local.tls_path}/admin.key")}"
aggregator_ca_cert_pem = "${file("${local.tls_path}/aggregator-ca.crt")}"
aggregator_ca_key_pem = "${file("${local.tls_path}/aggregator-ca.key")}"
service_serving_ca_cert_pem = "${file("${local.tls_path}/service-serving-ca.crt")}"
service_serving_ca_key_pem = "${file("${local.tls_path}/service-serving-ca.key")}"
apiserver_cert_pem = "${file("${local.tls_path}/apiserver.crt")}"
apiserver_key_pem = "${file("${local.tls_path}/apiserver.key")}"
openshift_apiserver_cert_pem = "${file("${local.tls_path}/openshift-apiserver.crt")}"
openshift_apiserver_key_pem = "${file("${local.tls_path}/openshift-apiserver.key")}"
apiserver_proxy_cert_pem = "${file("${local.tls_path}/apiserver-proxy.crt")}"
apiserver_proxy_key_pem = "${file("${local.tls_path}/apiserver-proxy.key")}"
clusterapi_ca_cert_pem = "${file("${local.tls_path}/clusterapi-apiserver-ca.crt")}"
clusterapi_ca_key_pem = "${file("${local.tls_path}/clusterapi-apiserver-ca.key")}"
etcd_ca_cert_pem = "${file("${local.tls_path}/etcd-client-ca.crt")}"
etcd_ca_key_pem = "${file("${local.tls_path}/etcd-client-ca.key")}"
etcd_client_cert_pem = "${file("${local.tls_path}/etcd-client.crt")}"
Expand All @@ -23,8 +20,13 @@ locals {
kube_ca_key_pem = "${file("${local.tls_path}/kube-ca.key")}"
kubelet_cert_pem = "${file("${local.tls_path}/kubelet.crt")}"
kubelet_key_pem = "${file("${local.tls_path}/kubelet.key")}"
tnc_cert_pem = "${file("${local.tls_path}/tnc.crt")}"
tnc_key_pem = "${file("${local.tls_path}/tnc.key")}"
oidc_ca_cert = "${file("${local.tls_path}/ingress-ca.crt")}"
openshift_apiserver_cert_pem = "${file("${local.tls_path}/openshift-apiserver.crt")}"
openshift_apiserver_key_pem = "${file("${local.tls_path}/openshift-apiserver.key")}"
root_ca_cert_pem = "${file("${local.tls_path}/root-ca.crt")}"
service_serving_ca_cert_pem = "${file("${local.tls_path}/service-serving-ca.crt")}"
service_serving_ca_key_pem = "${file("${local.tls_path}/service-serving-ca.key")}"
tls_path = "${path.cwd}/generated/tls"
tnc_cert_pem = "${file("${local.tls_path}/tnc.crt")}"
tnc_key_pem = "${file("${local.tls_path}/tnc.key")}"
}
14 changes: 8 additions & 6 deletions steps/assets/base/tectonic.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,8 @@ module "bootkube" {
admin_key_pem = "${local.admin_key_pem}"
aggregator_ca_cert_pem = "${local.aggregator_ca_cert_pem}"
aggregator_ca_key_pem = "${local.aggregator_ca_key_pem}"
service_serving_ca_cert_pem = "${local.service_serving_ca_cert_pem}"
service_serving_ca_key_pem = "${local.service_serving_ca_key_pem}"
apiserver_cert_pem = "${local.apiserver_cert_pem}"
apiserver_key_pem = "${local.apiserver_key_pem}"
openshift_apiserver_cert_pem = "${local.openshift_apiserver_cert_pem}"
openshift_apiserver_key_pem = "${local.openshift_apiserver_key_pem}"
apiserver_proxy_cert_pem = "${local.apiserver_proxy_cert_pem}"
apiserver_proxy_key_pem = "${local.apiserver_proxy_key_pem}"
etcd_ca_cert_pem = "${local.etcd_ca_cert_pem}"
Expand All @@ -40,10 +36,16 @@ module "bootkube" {
kube_ca_key_pem = "${local.kube_ca_key_pem}"
kubelet_cert_pem = "${local.kubelet_cert_pem}"
kubelet_key_pem = "${local.kubelet_key_pem}"
tnc_cert_pem = "${local.tnc_cert_pem}"
tnc_key_pem = "${local.tnc_key_pem}"
clusterapi_ca_cert_pem = "${local.clusterapi_ca_cert_pem}"
clusterapi_ca_key_pem = "${local.clusterapi_ca_key_pem}"
oidc_ca_cert = "${local.oidc_ca_cert}"
openshift_apiserver_cert_pem = "${local.openshift_apiserver_cert_pem}"
openshift_apiserver_key_pem = "${local.openshift_apiserver_key_pem}"
root_ca_cert_pem = "${local.root_ca_cert_pem}"
service_serving_ca_cert_pem = "${local.service_serving_ca_cert_pem}"
service_serving_ca_key_pem = "${local.service_serving_ca_key_pem}"
tnc_cert_pem = "${local.tnc_cert_pem}"
tnc_key_pem = "${local.tnc_key_pem}"

etcd_endpoints = "${data.template_file.etcd_hostname_list.*.rendered}"
}
Expand Down