diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template index cf4cb63524a..e7c95c75709 100755 --- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template +++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template @@ -231,8 +231,8 @@ podman run \ --cakey=/opt/openshift/tls/etcd-client-ca.key \ --metric-cacrt=/opt/openshift/tls/etcd-metric-signer.crt \ --metric-cakey=/opt/openshift/tls/etcd-metric-signer.key \ - --servcrt=/opt/openshift/tls/apiserver.crt \ - --servkey=/opt/openshift/tls/apiserver.key \ + --servcrt=/opt/openshift/tls/kube-apiserver-lb-server.crt \ + --servkey=/opt/openshift/tls/kube-apiserver-lb-server.key \ --address=0.0.0.0:6443 \ --csrdir=/tmp \ --peercertdur=26280h \ diff --git a/docs/design/resource_dep.svg b/docs/design/resource_dep.svg index 261e9abedb5..3381fe5de14 100644 --- a/docs/design/resource_dep.svg +++ b/docs/design/resource_dep.svg @@ -4,1929 +4,1929 @@ - - + + G - + cluster_Target - -Target + +Target cluster_bootkube - -bootkube + +bootkube cluster_bootstrap - -bootstrap + +bootstrap cluster_cluster - -cluster + +cluster cluster_installconfig - -installconfig + +installconfig cluster_kubeconfig - -kubeconfig + +kubeconfig cluster_machine - -machine + +machine cluster_machines - -machines + +machines cluster_manifests - -manifests + +manifests cluster_openshift - -openshift + +openshift cluster_password - -password + +password cluster_rhcos - -rhcos + +rhcos cluster_tls - -tls + +tls installconfig.InstallConfig - -installconfig.InstallConfig + +installconfig.InstallConfig Target Install Config - -Target Install Config + +Target Install Config installconfig.InstallConfig->Target Install Config - - + + machines.Master - -machines.Master + +machines.Master installconfig.InstallConfig->machines.Master - - + + installconfig.ClusterID - -installconfig.ClusterID + +installconfig.ClusterID installconfig.InstallConfig->installconfig.ClusterID - - + + installconfig.PlatformCredsCheck - -installconfig.PlatformCredsCheck + +installconfig.PlatformCredsCheck installconfig.InstallConfig->installconfig.PlatformCredsCheck - - + + rhcos.Image - -rhcos.Image + +rhcos.Image installconfig.InstallConfig->rhcos.Image - - + + machine.Master - -machine.Master + +machine.Master installconfig.InstallConfig->machine.Master - - + + machines.Worker - -machines.Worker + +machines.Worker installconfig.InstallConfig->machines.Worker - - + + machine.Worker - -machine.Worker + +machine.Worker installconfig.InstallConfig->machine.Worker - - + + manifests.Manifests - -manifests.Manifests + +manifests.Manifests installconfig.InstallConfig->manifests.Manifests - - + + manifests.Ingress - -manifests.Ingress + +manifests.Ingress installconfig.InstallConfig->manifests.Ingress - - + + manifests.DNS - -manifests.DNS + +manifests.DNS installconfig.InstallConfig->manifests.DNS - - + + manifests.Infrastructure - -manifests.Infrastructure + +manifests.Infrastructure installconfig.InstallConfig->manifests.Infrastructure - - + + manifests.CloudProviderConfig - -manifests.CloudProviderConfig + +manifests.CloudProviderConfig installconfig.InstallConfig->manifests.CloudProviderConfig - - + + manifests.Networking - -manifests.Networking + +manifests.Networking installconfig.InstallConfig->manifests.Networking - - + + tls.MCSCertKey - -tls.MCSCertKey + +tls.MCSCertKey installconfig.InstallConfig->tls.MCSCertKey - - + + - + manifests.Openshift - -manifests.Openshift + +manifests.Openshift - + installconfig.InstallConfig->manifests.Openshift - - + + - + kubeconfig.AdminClient - -kubeconfig.AdminClient + +kubeconfig.AdminClient installconfig.InstallConfig->kubeconfig.AdminClient - - + + - + bootstrap.Bootstrap - -bootstrap.Bootstrap + +bootstrap.Bootstrap - + installconfig.InstallConfig->bootstrap.Bootstrap - - + + - + kubeconfig.Kubelet - -kubeconfig.Kubelet + +kubeconfig.Kubelet - + installconfig.InstallConfig->kubeconfig.Kubelet - - + + - + tls.APIServerCertKey - -tls.APIServerCertKey + +tls.APIServerCertKey - + installconfig.InstallConfig->tls.APIServerCertKey - - + + - + tls.KubeAPIServerExternalLBServerCertKey - -tls.KubeAPIServerExternalLBServerCertKey + +tls.KubeAPIServerExternalLBServerCertKey - + installconfig.InstallConfig->tls.KubeAPIServerExternalLBServerCertKey - - + + - + tls.KubeAPIServerInternalLBServerCertKey - -tls.KubeAPIServerInternalLBServerCertKey + +tls.KubeAPIServerInternalLBServerCertKey - + installconfig.InstallConfig->tls.KubeAPIServerInternalLBServerCertKey - - + + - + tls.KubeAPIServerServiceNetworkServerCertKey - -tls.KubeAPIServerServiceNetworkServerCertKey + +tls.KubeAPIServerServiceNetworkServerCertKey - + installconfig.InstallConfig->tls.KubeAPIServerServiceNetworkServerCertKey - - + + - + cluster.Metadata - -cluster.Metadata + +cluster.Metadata - + installconfig.InstallConfig->cluster.Metadata - - + + - + cluster.TerraformVariables - -cluster.TerraformVariables + +cluster.TerraformVariables - + installconfig.InstallConfig->cluster.TerraformVariables - - + + - + cluster.Cluster - -cluster.Cluster + +cluster.Cluster - + installconfig.InstallConfig->cluster.Cluster - - + + installconfig.sshPublicKey - -installconfig.sshPublicKey + +installconfig.sshPublicKey installconfig.sshPublicKey->installconfig.InstallConfig - - + + installconfig.baseDomain - -installconfig.baseDomain + +installconfig.baseDomain installconfig.baseDomain->installconfig.InstallConfig - - + + installconfig.clusterName - -installconfig.clusterName + +installconfig.clusterName installconfig.baseDomain->installconfig.clusterName - - + + installconfig.platform - -installconfig.platform + +installconfig.platform installconfig.platform->installconfig.InstallConfig - - + + installconfig.platform->installconfig.baseDomain - - + + installconfig.clusterName->installconfig.InstallConfig - - + + installconfig.pullSecret - -installconfig.pullSecret + +installconfig.pullSecret installconfig.pullSecret->installconfig.InstallConfig - - + + Target Manifests - -Target Manifests + +Target Manifests machines.Master->Target Manifests - - + + - + machines.Master->bootstrap.Bootstrap - - + + - + machines.Master->cluster.TerraformVariables - - + + installconfig.ClusterID->machines.Master - - + + installconfig.ClusterID->machines.Worker - - + + installconfig.ClusterID->manifests.Manifests - - + + installconfig.ClusterID->manifests.DNS - - + + installconfig.ClusterID->manifests.Infrastructure - - + + + + + +installconfig.ClusterID->manifests.Openshift + + - + installconfig.ClusterID->cluster.Metadata - - + + - + installconfig.ClusterID->cluster.TerraformVariables - - + + - + installconfig.ClusterID->cluster.Cluster - - + + installconfig.PlatformCredsCheck->machines.Master - - + + installconfig.PlatformCredsCheck->machines.Worker - - + + installconfig.PlatformCredsCheck->manifests.DNS - - + + installconfig.PlatformCredsCheck->manifests.CloudProviderConfig - - + + - + installconfig.PlatformCredsCheck->cluster.Cluster - - + + rhcos.Image->machines.Master - - + + rhcos.Image->machines.Worker - - + + - + rhcos.Image->cluster.TerraformVariables - - + + machine.Master->machines.Master - - + + - + Target Ignition Configs - -Target Ignition Configs + +Target Ignition Configs - + machine.Master->Target Ignition Configs - - + + - + machine.Master->cluster.TerraformVariables - - + + tls.RootCA - -tls.RootCA + +tls.RootCA tls.RootCA->machine.Master - - + + tls.RootCA->machine.Worker - - + + tls.RootCA->manifests.Manifests - - + + tls.RootCA->tls.MCSCertKey - - + + - + tls.RootCA->bootstrap.Bootstrap - - + + - + tls.JournalCertKey - -tls.JournalCertKey + +tls.JournalCertKey - + tls.RootCA->tls.JournalCertKey - - + + machines.Worker->Target Manifests - - + + - + machines.Worker->bootstrap.Bootstrap - - + + - + machines.Worker->cluster.TerraformVariables - - + + machine.Worker->machines.Worker - - + + - + machine.Worker->Target Ignition Configs - - + + manifests.Manifests->Target Manifests - - + + - + manifests.Manifests->bootstrap.Bootstrap - - + + manifests.Ingress->manifests.Manifests - - + + manifests.DNS->manifests.Manifests - - + + manifests.Infrastructure->manifests.Manifests - - + + manifests.CloudProviderConfig->manifests.Infrastructure - - + + manifests.Networking->manifests.Manifests - - + + openshift.NetworkCRDs - -openshift.NetworkCRDs + +openshift.NetworkCRDs openshift.NetworkCRDs->manifests.Networking - - + + tls.EtcdCA - -tls.EtcdCA + +tls.EtcdCA tls.EtcdCA->manifests.Manifests - - + + tls.EtcdClientCertKey - -tls.EtcdClientCertKey + +tls.EtcdClientCertKey tls.EtcdCA->tls.EtcdClientCertKey - - + + - + tls.EtcdCA->bootstrap.Bootstrap - - + + tls.EtcdSignerCertKey - -tls.EtcdSignerCertKey + +tls.EtcdSignerCertKey tls.EtcdSignerCertKey->manifests.Manifests - - + + tls.EtcdCABundle - -tls.EtcdCABundle + +tls.EtcdCABundle tls.EtcdSignerCertKey->tls.EtcdCABundle - - + + tls.EtcdSignerClientCertKey - -tls.EtcdSignerClientCertKey + +tls.EtcdSignerClientCertKey tls.EtcdSignerCertKey->tls.EtcdSignerClientCertKey - - + + - + tls.EtcdSignerCertKey->bootstrap.Bootstrap - - + + tls.EtcdCABundle->manifests.Manifests - - + + - + tls.EtcdCABundle->bootstrap.Bootstrap - - + + tls.EtcdSignerClientCertKey->manifests.Manifests - - + + - + tls.EtcdSignerClientCertKey->bootstrap.Bootstrap - - + + tls.EtcdClientCertKey->manifests.Manifests - - + + - + tls.EtcdClientCertKey->bootstrap.Bootstrap - - + + tls.EtcdMetricCABundle - -tls.EtcdMetricCABundle + +tls.EtcdMetricCABundle tls.EtcdMetricCABundle->manifests.Manifests - - + + - + tls.EtcdMetricCABundle->bootstrap.Bootstrap - - + + tls.EtcdMetricSignerCertKey - -tls.EtcdMetricSignerCertKey + +tls.EtcdMetricSignerCertKey tls.EtcdMetricSignerCertKey->tls.EtcdMetricCABundle - - + + tls.EtcdMetricSignerClientCertKey - -tls.EtcdMetricSignerClientCertKey + +tls.EtcdMetricSignerClientCertKey tls.EtcdMetricSignerCertKey->tls.EtcdMetricSignerClientCertKey - - + + - + tls.EtcdMetricSignerCertKey->bootstrap.Bootstrap - - + + tls.EtcdMetricSignerClientCertKey->manifests.Manifests - - + + - + tls.EtcdMetricSignerClientCertKey->bootstrap.Bootstrap - - + + tls.MCSCertKey->manifests.Manifests - - + + - + tls.MCSCertKey->bootstrap.Bootstrap - - + + bootkube.CVOOverrides - -bootkube.CVOOverrides + +bootkube.CVOOverrides bootkube.CVOOverrides->manifests.Manifests - - + + bootkube.EtcdServiceKubeSystem - -bootkube.EtcdServiceKubeSystem + +bootkube.EtcdServiceKubeSystem bootkube.EtcdServiceKubeSystem->manifests.Manifests - - + + bootkube.HostEtcdServiceEndpointsKubeSystem - -bootkube.HostEtcdServiceEndpointsKubeSystem + +bootkube.HostEtcdServiceEndpointsKubeSystem bootkube.HostEtcdServiceEndpointsKubeSystem->manifests.Manifests - - + + bootkube.HostEtcdServiceKubeSystem - -bootkube.HostEtcdServiceKubeSystem + +bootkube.HostEtcdServiceKubeSystem bootkube.HostEtcdServiceKubeSystem->manifests.Manifests - - + + bootkube.KubeCloudConfig - -bootkube.KubeCloudConfig + +bootkube.KubeCloudConfig bootkube.KubeCloudConfig->manifests.Manifests - - + + bootkube.KubeSystemConfigmapEtcdCA - -bootkube.KubeSystemConfigmapEtcdCA + +bootkube.KubeSystemConfigmapEtcdCA bootkube.KubeSystemConfigmapEtcdCA->manifests.Manifests - - + + bootkube.KubeSystemConfigmapEtcdServingCA - -bootkube.KubeSystemConfigmapEtcdServingCA + +bootkube.KubeSystemConfigmapEtcdServingCA bootkube.KubeSystemConfigmapEtcdServingCA->manifests.Manifests - - + + bootkube.KubeSystemConfigmapRootCA - -bootkube.KubeSystemConfigmapRootCA + +bootkube.KubeSystemConfigmapRootCA bootkube.KubeSystemConfigmapRootCA->manifests.Manifests - - + + bootkube.KubeSystemSecretEtcdClient - -bootkube.KubeSystemSecretEtcdClient + +bootkube.KubeSystemSecretEtcdClient bootkube.KubeSystemSecretEtcdClient->manifests.Manifests - - + + bootkube.KubeSystemSecretEtcdClientCADeprecated - -bootkube.KubeSystemSecretEtcdClientCADeprecated + +bootkube.KubeSystemSecretEtcdClientCADeprecated bootkube.KubeSystemSecretEtcdClientCADeprecated->manifests.Manifests - - + + bootkube.KubeSystemSecretEtcdSigner - -bootkube.KubeSystemSecretEtcdSigner + +bootkube.KubeSystemSecretEtcdSigner bootkube.KubeSystemSecretEtcdSigner->manifests.Manifests - - + + bootkube.KubeSystemSecretEtcdSignerClient - -bootkube.KubeSystemSecretEtcdSignerClient + +bootkube.KubeSystemSecretEtcdSignerClient bootkube.KubeSystemSecretEtcdSignerClient->manifests.Manifests - - + + bootkube.MachineConfigServerTLSSecret - -bootkube.MachineConfigServerTLSSecret + +bootkube.MachineConfigServerTLSSecret bootkube.MachineConfigServerTLSSecret->manifests.Manifests - - + + bootkube.OpenshiftConfigConfigmapEtcdMetricServingCA - -bootkube.OpenshiftConfigConfigmapEtcdMetricServingCA + +bootkube.OpenshiftConfigConfigmapEtcdMetricServingCA bootkube.OpenshiftConfigConfigmapEtcdMetricServingCA->manifests.Manifests - - + + bootkube.OpenshiftConfigSecretEtcdMetricClient - -bootkube.OpenshiftConfigSecretEtcdMetricClient + +bootkube.OpenshiftConfigSecretEtcdMetricClient bootkube.OpenshiftConfigSecretEtcdMetricClient->manifests.Manifests - - + + bootkube.OpenshiftConfigSecretPullSecret - -bootkube.OpenshiftConfigSecretPullSecret + +bootkube.OpenshiftConfigSecretPullSecret bootkube.OpenshiftConfigSecretPullSecret->manifests.Manifests - - + + bootkube.OpenshiftMachineConfigOperator - -bootkube.OpenshiftMachineConfigOperator + +bootkube.OpenshiftMachineConfigOperator bootkube.OpenshiftMachineConfigOperator->manifests.Manifests - - - - - -bootkube.Pull - -bootkube.Pull - - - -bootkube.Pull->manifests.Manifests - - + + - + manifests.Openshift->Target Manifests - - + + - + manifests.Openshift->bootstrap.Bootstrap - - + + - + password.KubeadminPassword - -password.KubeadminPassword + +password.KubeadminPassword password.KubeadminPassword->manifests.Openshift - - + + + + + +password.KubeadminPassword->Target Ignition Configs + + - + Target Cluster - -Target Cluster + +Target Cluster - + password.KubeadminPassword->Target Cluster - - + + - + password.KubeadminPassword->cluster.Cluster - - + + - + openshift.BindingDiscovery - -openshift.BindingDiscovery + +openshift.BindingDiscovery openshift.BindingDiscovery->manifests.Openshift - - + + - + openshift.CloudCredsSecret - -openshift.CloudCredsSecret + +openshift.CloudCredsSecret openshift.CloudCredsSecret->manifests.Openshift - - + + - + openshift.KubeadminPasswordSecret - -openshift.KubeadminPasswordSecret + +openshift.KubeadminPasswordSecret openshift.KubeadminPasswordSecret->manifests.Openshift - - + + - + openshift.RoleCloudCredsSecretReader - -openshift.RoleCloudCredsSecretReader + +openshift.RoleCloudCredsSecretReader openshift.RoleCloudCredsSecretReader->manifests.Openshift - - + + kubeconfig.AdminClient->Target Ignition Configs - - + + - + kubeconfig.AdminClient->bootstrap.Bootstrap - - + + - + kubeconfig.AdminClient->Target Cluster - - + + - + tls.AdminKubeConfigClientCertKey - -tls.AdminKubeConfigClientCertKey + +tls.AdminKubeConfigClientCertKey tls.AdminKubeConfigClientCertKey->kubeconfig.AdminClient - - + + - + tls.AdminKubeConfigSignerCertKey - -tls.AdminKubeConfigSignerCertKey + +tls.AdminKubeConfigSignerCertKey tls.AdminKubeConfigSignerCertKey->tls.AdminKubeConfigClientCertKey - - + + - + tls.AdminKubeConfigCABundle - -tls.AdminKubeConfigCABundle + +tls.AdminKubeConfigCABundle - + tls.AdminKubeConfigSignerCertKey->tls.AdminKubeConfigCABundle - - + + - + tls.KubeAPIServerCompleteCABundle - -tls.KubeAPIServerCompleteCABundle + +tls.KubeAPIServerCompleteCABundle tls.KubeAPIServerCompleteCABundle->kubeconfig.AdminClient - - + + - + tls.KubeAPIServerCompleteCABundle->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerCompleteCABundle->kubeconfig.Kubelet - - + + - + tls.KubeCA - -tls.KubeCA + +tls.KubeCA tls.KubeCA->tls.KubeAPIServerCompleteCABundle - - + + - + tls.KubeCA->bootstrap.Bootstrap - - + + - + tls.KubeCA->tls.APIServerCertKey - - + + - + tls.KubeAPIServerCompleteClientCABundle - -tls.KubeAPIServerCompleteClientCABundle + +tls.KubeAPIServerCompleteClientCABundle - + tls.KubeCA->tls.KubeAPIServerCompleteClientCABundle - - + + - + tls.KubeAPIServerLocalhostCABundle - -tls.KubeAPIServerLocalhostCABundle + +tls.KubeAPIServerLocalhostCABundle tls.KubeAPIServerLocalhostCABundle->tls.KubeAPIServerCompleteCABundle - - + + - + tls.KubeAPIServerLocalhostCABundle->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerLocalhostSignerCertKey - -tls.KubeAPIServerLocalhostSignerCertKey + +tls.KubeAPIServerLocalhostSignerCertKey tls.KubeAPIServerLocalhostSignerCertKey->tls.KubeAPIServerLocalhostCABundle - - + + - + tls.KubeAPIServerLocalhostSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerLocalhostServerCertKey - -tls.KubeAPIServerLocalhostServerCertKey + +tls.KubeAPIServerLocalhostServerCertKey - + tls.KubeAPIServerLocalhostSignerCertKey->tls.KubeAPIServerLocalhostServerCertKey - - + + - + tls.KubeControlPlaneCABundle - -tls.KubeControlPlaneCABundle + +tls.KubeControlPlaneCABundle - + tls.KubeAPIServerLocalhostSignerCertKey->tls.KubeControlPlaneCABundle - - + + - + tls.KubeAPIServerServiceNetworkCABundle - -tls.KubeAPIServerServiceNetworkCABundle + +tls.KubeAPIServerServiceNetworkCABundle tls.KubeAPIServerServiceNetworkCABundle->tls.KubeAPIServerCompleteCABundle - - + + - + tls.KubeAPIServerServiceNetworkCABundle->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerServiceNetworkSignerCertKey - -tls.KubeAPIServerServiceNetworkSignerCertKey + +tls.KubeAPIServerServiceNetworkSignerCertKey tls.KubeAPIServerServiceNetworkSignerCertKey->tls.KubeAPIServerServiceNetworkCABundle - - + + - + tls.KubeAPIServerServiceNetworkSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerServiceNetworkSignerCertKey->tls.KubeAPIServerServiceNetworkServerCertKey - - + + - + tls.KubeAPIServerServiceNetworkSignerCertKey->tls.KubeControlPlaneCABundle - - + + - + tls.KubeAPIServerLBCABundle - -tls.KubeAPIServerLBCABundle + +tls.KubeAPIServerLBCABundle tls.KubeAPIServerLBCABundle->tls.KubeAPIServerCompleteCABundle - - + + - + tls.KubeAPIServerLBCABundle->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerLBSignerCertKey - -tls.KubeAPIServerLBSignerCertKey + +tls.KubeAPIServerLBSignerCertKey tls.KubeAPIServerLBSignerCertKey->tls.KubeAPIServerLBCABundle - - + + - + tls.KubeAPIServerLBSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerLBSignerCertKey->tls.KubeAPIServerExternalLBServerCertKey - - + + - + tls.KubeAPIServerLBSignerCertKey->tls.KubeAPIServerInternalLBServerCertKey - - + + - + tls.KubeAPIServerLBSignerCertKey->tls.KubeControlPlaneCABundle - - + + - + bootstrap.Bootstrap->Target Ignition Configs - - + + - + bootstrap.Bootstrap->cluster.TerraformVariables - - + + - + kubeconfig.Kubelet->bootstrap.Bootstrap - - + + - + tls.KubeletClientCertKey - -tls.KubeletClientCertKey + +tls.KubeletClientCertKey - + tls.KubeletClientCertKey->bootstrap.Bootstrap - - + + - + tls.KubeletClientCertKey->kubeconfig.Kubelet - - + + - + tls.KubeletBootstrapCertSigner - -tls.KubeletBootstrapCertSigner + +tls.KubeletBootstrapCertSigner - + tls.KubeletBootstrapCertSigner->tls.KubeletClientCertKey - - + + - + tls.KubeletBootstrapCABundle - -tls.KubeletBootstrapCABundle + +tls.KubeletBootstrapCABundle - + tls.KubeletBootstrapCertSigner->tls.KubeletBootstrapCABundle - - + + - + tls.AdminKubeConfigCABundle->bootstrap.Bootstrap - - + + - + tls.AdminKubeConfigCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - + tls.AggregatorCA - -tls.AggregatorCA + +tls.AggregatorCA - + tls.AggregatorCA->bootstrap.Bootstrap - - + + - + tls.APIServerProxyCertKey - -tls.APIServerProxyCertKey + +tls.APIServerProxyCertKey - + tls.AggregatorCA->tls.APIServerProxyCertKey - - + + - + tls.AggregatorCABundle - -tls.AggregatorCABundle + +tls.AggregatorCABundle - + tls.AggregatorCABundle->bootstrap.Bootstrap - - + + - + tls.AggregatorSignerCertKey - -tls.AggregatorSignerCertKey + +tls.AggregatorSignerCertKey - + tls.AggregatorSignerCertKey->bootstrap.Bootstrap - - + + - + tls.AggregatorSignerCertKey->tls.AggregatorCABundle - - + + - + tls.AggregatorClientCertKey - -tls.AggregatorClientCertKey + +tls.AggregatorClientCertKey - + tls.AggregatorSignerCertKey->tls.AggregatorClientCertKey - - + + - + tls.AggregatorClientCertKey->bootstrap.Bootstrap - - + + - + tls.APIServerCertKey->bootstrap.Bootstrap - - + + - + tls.APIServerProxyCertKey->bootstrap.Bootstrap - - + + - + tls.JournalCertKey->bootstrap.Bootstrap - - + + - + tls.JournalCertKey->Target Cluster - - + + - + tls.KubeAPIServerExternalLBServerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerInternalLBServerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerLocalhostServerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerServiceNetworkServerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerCompleteClientCABundle->bootstrap.Bootstrap - - + + - + tls.KubeletClientCABundle - -tls.KubeletClientCABundle + +tls.KubeletClientCABundle - + tls.KubeletClientCABundle->bootstrap.Bootstrap - - + + - + tls.KubeletClientCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - + tls.KubeletCSRSignerCertKey - -tls.KubeletCSRSignerCertKey + +tls.KubeletCSRSignerCertKey - + tls.KubeletCSRSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeletCSRSignerCertKey->tls.KubeletClientCABundle - - + + - + tls.KubeletServingCABundle - -tls.KubeletServingCABundle + +tls.KubeletServingCABundle - + tls.KubeletCSRSignerCertKey->tls.KubeletServingCABundle - - + + - + tls.KubeControlPlaneCABundle->bootstrap.Bootstrap - - + + - + tls.KubeControlPlaneCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - + tls.KubeControlPlaneSignerCertKey - -tls.KubeControlPlaneSignerCertKey + +tls.KubeControlPlaneSignerCertKey - + tls.KubeControlPlaneSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeControlPlaneSignerCertKey->tls.KubeControlPlaneCABundle - - + + - + tls.KubeControlPlaneKubeControllerManagerClientCertKey - -tls.KubeControlPlaneKubeControllerManagerClientCertKey + +tls.KubeControlPlaneKubeControllerManagerClientCertKey - + tls.KubeControlPlaneSignerCertKey->tls.KubeControlPlaneKubeControllerManagerClientCertKey - - + + - + tls.KubeControlPlaneKubeSchedulerClientCertKey - -tls.KubeControlPlaneKubeSchedulerClientCertKey + +tls.KubeControlPlaneKubeSchedulerClientCertKey - + tls.KubeControlPlaneSignerCertKey->tls.KubeControlPlaneKubeSchedulerClientCertKey - - + + - - -tls.KubeAPIServerToKubeletClientCertKey - -tls.KubeAPIServerToKubeletClientCertKey + + +tls.KubeAPIServerToKubeletCABundle + +tls.KubeAPIServerToKubeletCABundle - - -tls.KubeAPIServerToKubeletClientCertKey->bootstrap.Bootstrap - - + + +tls.KubeAPIServerToKubeletCABundle->bootstrap.Bootstrap + + - - -tls.KubeAPIServerToKubeletClientCertKey->tls.KubeAPIServerCompleteClientCABundle - - + + +tls.KubeAPIServerToKubeletCABundle->tls.KubeAPIServerCompleteClientCABundle + + - + tls.KubeAPIServerToKubeletSignerCertKey - -tls.KubeAPIServerToKubeletSignerCertKey + +tls.KubeAPIServerToKubeletSignerCertKey - + tls.KubeAPIServerToKubeletSignerCertKey->bootstrap.Bootstrap - - - - - -tls.KubeAPIServerToKubeletSignerCertKey->tls.KubeAPIServerToKubeletClientCertKey - - - - - -tls.KubeAPIServerToKubeletCABundle - -tls.KubeAPIServerToKubeletCABundle + + - + tls.KubeAPIServerToKubeletSignerCertKey->tls.KubeAPIServerToKubeletCABundle - - + + + + + +tls.KubeAPIServerToKubeletClientCertKey + +tls.KubeAPIServerToKubeletClientCertKey + + + +tls.KubeAPIServerToKubeletSignerCertKey->tls.KubeAPIServerToKubeletClientCertKey + + - + tls.KubeletBootstrapCABundle->bootstrap.Bootstrap - - + + - + tls.KubeletBootstrapCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - - -tls.KubeAPIServerToKubeletCABundle->bootstrap.Bootstrap - - + + +tls.KubeAPIServerToKubeletClientCertKey->bootstrap.Bootstrap + + - + tls.KubeControlPlaneKubeControllerManagerClientCertKey->bootstrap.Bootstrap - - + + - + tls.KubeControlPlaneKubeSchedulerClientCertKey->bootstrap.Bootstrap - - + + - + tls.KubeletServingCABundle->bootstrap.Bootstrap - - + + - + tls.ServiceAccountKeyPair - -tls.ServiceAccountKeyPair + +tls.ServiceAccountKeyPair - + tls.ServiceAccountKeyPair->bootstrap.Bootstrap - - + + - + cluster.Metadata->Target Ignition Configs - - + + - + cluster.Metadata->Target Cluster - - + + - + cluster.TerraformVariables->Target Cluster - - + + - + cluster.TerraformVariables->cluster.Cluster - - + + - + cluster.Cluster->Target Cluster - - + + diff --git a/pkg/asset/tls/apiserver.go b/pkg/asset/tls/apiserver.go index fd2e2eb174b..868023904c2 100644 --- a/pkg/asset/tls/apiserver.go +++ b/pkg/asset/tls/apiserver.go @@ -31,27 +31,13 @@ func (a *APIServerCertKey) Dependencies() []asset.Asset { // Generate generates the cert/key pair based on its dependencies. func (a *APIServerCertKey) Generate(dependencies asset.Parents) error { kubeCA := &KubeCA{} - installConfig := &installconfig.InstallConfig{} - dependencies.Get(kubeCA, installConfig) - - apiServerAddress, err := cidrhost(installConfig.Config.Networking.ServiceNetwork[0].IPNet, 1) - if err != nil { - return errors.Wrap(err, "failed to get API Server address from InstallConfig") - } + dependencies.Get(kubeCA) cfg := &CertCfg{ Subject: pkix.Name{CommonName: "system:kube-apiserver", Organization: []string{"kube-master"}}, KeyUsages: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, - ExtKeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth}, + ExtKeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}, Validity: ValidityTenYears, - DNSNames: []string{ - apiAddress(installConfig.Config), - "kubernetes", "kubernetes.default", - "kubernetes.default.svc", - "kubernetes.default.svc.cluster.local", - "localhost", - }, - IPAddresses: []net.IP{net.ParseIP(apiServerAddress), net.ParseIP("127.0.0.1")}, } return a.SignedCertKey.Generate(cfg, kubeCA, "apiserver", AppendParent) @@ -538,12 +524,12 @@ var _ asset.Asset = (*KubeAPIServerCompleteClientCABundle)(nil) // Dependencies returns the dependency of the cert bundle. func (a *KubeAPIServerCompleteClientCABundle) Dependencies() []asset.Asset { return []asset.Asset{ - &KubeCA{}, // TODO this should be removed once it never signs a client - &AdminKubeConfigCABundle{}, // admin.kubeconfig - &KubeletClientCABundle{}, // signed kubelet certs - &KubeControlPlaneCABundle{}, // controller-manager, scheduler - &KubeAPIServerToKubeletClientCertKey{}, // kube-apiserver to kubelet (kubelet piggy-backs on KAS client-ca) - &KubeletBootstrapCABundle{}, // used to create the kubelet kubeconfig files that are used to create CSRs + &KubeCA{}, // TODO this should be removed once it never signs a client + &AdminKubeConfigCABundle{}, // admin.kubeconfig + &KubeletClientCABundle{}, // signed kubelet certs + &KubeControlPlaneCABundle{}, // controller-manager, scheduler + &KubeAPIServerToKubeletCABundle{}, // kube-apiserver to kubelet (kubelet piggy-backs on KAS client-ca) + &KubeletBootstrapCABundle{}, // used to create the kubelet kubeconfig files that are used to create CSRs } }