diff --git a/docs/design/resource_dep.svg b/docs/design/resource_dep.svg index 3381fe5de14..d7cef6fe476 100644 --- a/docs/design/resource_dep.svg +++ b/docs/design/resource_dep.svg @@ -4,1929 +4,1887 @@ - - + + 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 - - - -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.CloudProviderConfig + + - + 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 - - + + - + 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.KubeAPIServerCompleteCABundle - - - - - -tls.KubeCA->bootstrap.Bootstrap - - - - - -tls.KubeCA->tls.APIServerCertKey - - - - - -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.KubeAPIServerCompleteClientCABundle + +tls.KubeAPIServerCompleteClientCABundle - + 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.KubeAPIServerToKubeletCABundle - -tls.KubeAPIServerToKubeletCABundle + +tls.KubeAPIServerToKubeletCABundle - + tls.KubeAPIServerToKubeletCABundle->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerToKubeletCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - + tls.KubeAPIServerToKubeletSignerCertKey - -tls.KubeAPIServerToKubeletSignerCertKey + +tls.KubeAPIServerToKubeletSignerCertKey - + tls.KubeAPIServerToKubeletSignerCertKey->bootstrap.Bootstrap - - + + - + tls.KubeAPIServerToKubeletSignerCertKey->tls.KubeAPIServerToKubeletCABundle - - + + - + tls.KubeAPIServerToKubeletClientCertKey - -tls.KubeAPIServerToKubeletClientCertKey + +tls.KubeAPIServerToKubeletClientCertKey - + tls.KubeAPIServerToKubeletSignerCertKey->tls.KubeAPIServerToKubeletClientCertKey - - + + - + tls.KubeletBootstrapCABundle->bootstrap.Bootstrap - - + + - + tls.KubeletBootstrapCABundle->tls.KubeAPIServerCompleteClientCABundle - - + + - + 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/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go index a92af8da6e8..23d8041377b 100644 --- a/pkg/asset/ignition/bootstrap/bootstrap.go +++ b/pkg/asset/ignition/bootstrap/bootstrap.go @@ -65,7 +65,6 @@ func (a *Bootstrap) Dependencies() []asset.Asset { &tls.AggregatorCABundle{}, &tls.AggregatorClientCertKey{}, &tls.AggregatorSignerCertKey{}, - &tls.APIServerCertKey{}, &tls.APIServerProxyCertKey{}, &tls.EtcdCA{}, &tls.EtcdCABundle{}, @@ -91,7 +90,6 @@ func (a *Bootstrap) Dependencies() []asset.Asset { &tls.KubeAPIServerToKubeletCABundle{}, &tls.KubeAPIServerToKubeletClientCertKey{}, &tls.KubeAPIServerToKubeletSignerCertKey{}, - &tls.KubeCA{}, &tls.KubeControlPlaneCABundle{}, &tls.KubeControlPlaneKubeControllerManagerClientCertKey{}, &tls.KubeControlPlaneKubeSchedulerClientCertKey{}, @@ -385,7 +383,6 @@ func (a *Bootstrap) addParentFiles(dependencies asset.Parents) { &tls.AggregatorCABundle{}, &tls.AggregatorClientCertKey{}, &tls.AggregatorSignerCertKey{}, - &tls.APIServerCertKey{}, &tls.APIServerProxyCertKey{}, &tls.EtcdCA{}, &tls.EtcdCABundle{}, @@ -410,7 +407,6 @@ func (a *Bootstrap) addParentFiles(dependencies asset.Parents) { &tls.KubeAPIServerToKubeletCABundle{}, &tls.KubeAPIServerToKubeletClientCertKey{}, &tls.KubeAPIServerToKubeletSignerCertKey{}, - &tls.KubeCA{}, &tls.KubeControlPlaneCABundle{}, &tls.KubeControlPlaneKubeControllerManagerClientCertKey{}, &tls.KubeControlPlaneKubeSchedulerClientCertKey{}, diff --git a/pkg/asset/tls/apiserver.go b/pkg/asset/tls/apiserver.go index 868023904c2..908b738b130 100644 --- a/pkg/asset/tls/apiserver.go +++ b/pkg/asset/tls/apiserver.go @@ -10,44 +10,6 @@ import ( "github.com/pkg/errors" ) -// APIServerCertKey is the asset that generates the API server key/cert pair. -// [DEPRECATED] -type APIServerCertKey struct { - SignedCertKey -} - -var _ asset.Asset = (*APIServerCertKey)(nil) - -// Dependencies returns the dependency of the the cert/key pair, which includes -// the parent CA, and install config if it depends on the install config for -// DNS names, etc. -func (a *APIServerCertKey) Dependencies() []asset.Asset { - return []asset.Asset{ - &KubeCA{}, - &installconfig.InstallConfig{}, - } -} - -// Generate generates the cert/key pair based on its dependencies. -func (a *APIServerCertKey) Generate(dependencies asset.Parents) error { - kubeCA := &KubeCA{} - 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.ExtKeyUsageClientAuth}, - Validity: ValidityTenYears, - } - - return a.SignedCertKey.Generate(cfg, kubeCA, "apiserver", AppendParent) -} - -// Name returns the human-friendly name of the asset. -func (a *APIServerCertKey) Name() string { - return "Certificate (kube-apiaserver)" -} - // KubeAPIServerToKubeletSignerCertKey is a key/cert pair that signs the kube-apiserver to kubelet client certs. type KubeAPIServerToKubeletSignerCertKey struct { SelfSignedCertKey @@ -491,7 +453,6 @@ var _ asset.Asset = (*KubeAPIServerCompleteCABundle)(nil) // Dependencies returns the dependency of the cert bundle. func (a *KubeAPIServerCompleteCABundle) Dependencies() []asset.Asset { return []asset.Asset{ - &KubeCA{}, // TODO this should be removed once the KAS no longer serves with it &KubeAPIServerLocalhostCABundle{}, &KubeAPIServerServiceNetworkCABundle{}, &KubeAPIServerLBCABundle{}, @@ -524,7 +485,6 @@ 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 diff --git a/pkg/asset/tls/kubeca.go b/pkg/asset/tls/kubeca.go deleted file mode 100644 index a519f4b7f07..00000000000 --- a/pkg/asset/tls/kubeca.go +++ /dev/null @@ -1,41 +0,0 @@ -package tls - -import ( - "crypto/x509" - "crypto/x509/pkix" - - "github.com/openshift/installer/pkg/asset" -) - -// KubeCA is the asset that generates the kube-ca key/cert pair. -// [DEPRECATED] -type KubeCA struct { - SelfSignedCertKey -} - -var _ asset.Asset = (*KubeCA)(nil) - -// Dependencies returns the dependency of the the cert/key pair, which includes -// the parent CA, and install config if it depends on the install config for -// DNS names, etc. -func (a *KubeCA) Dependencies() []asset.Asset { - return []asset.Asset{} -} - -// Generate generates the cert/key pair based on its dependencies. -func (a *KubeCA) Generate(dependencies asset.Parents) error { - - cfg := &CertCfg{ - Subject: pkix.Name{CommonName: "kube-ca", OrganizationalUnit: []string{"bootkube"}}, - KeyUsages: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, - Validity: ValidityTenYears, - IsCA: true, - } - - return a.SelfSignedCertKey.Generate(cfg, "kube-ca") -} - -// Name returns the human-friendly name of the asset. -func (a *KubeCA) Name() string { - return "Certificate (kube-ca)" -}