diff --git a/docs/design/resource_dep.svg b/docs/design/resource_dep.svg index 371f0b2a607..7a54b394a8d 100644 --- a/docs/design/resource_dep.svg +++ b/docs/design/resource_dep.svg @@ -4,735 +4,730 @@ - + G - + InstallConfig - -InstallConfig + +InstallConfig Target Install Config - -Target Install Config + +Target Install Config InstallConfig->Target Install Config - - + + Manifests - -Manifests + +Manifests InstallConfig->Manifests - - + + networkOperator - -networkOperator + +networkOperator InstallConfig->networkOperator - - + + machineAPIOperator - -machineAPIOperator + +machineAPIOperator InstallConfig->machineAPIOperator - - + + IngressCertKey - -IngressCertKey + +IngressCertKey InstallConfig->IngressCertKey - - + + APIServerCertKey - -APIServerCertKey + +APIServerCertKey InstallConfig->APIServerCertKey - - + + OpenshiftAPIServerCertKey - -OpenshiftAPIServerCertKey + +OpenshiftAPIServerCertKey InstallConfig->OpenshiftAPIServerCertKey - - + + MCSCertKey - -MCSCertKey + +MCSCertKey InstallConfig->MCSCertKey - - + + Admin - -Admin + +Admin InstallConfig->Admin - - - - -Worker - -Worker - - -InstallConfig->Worker - - + + -Tectonic - -Tectonic +Tectonic + +Tectonic -InstallConfig->Tectonic - - +InstallConfig->Tectonic + + -ClusterK8sIO - -ClusterK8sIO +ClusterK8sIO + +ClusterK8sIO -InstallConfig->ClusterK8sIO - - +InstallConfig->ClusterK8sIO + + + + +Worker + +Worker + + +InstallConfig->Worker + + Master - -Master + +Master -InstallConfig->Master - - +InstallConfig->Master + + kubeAddonOperator - -kubeAddonOperator + +kubeAddonOperator -InstallConfig->kubeAddonOperator - - +InstallConfig->kubeAddonOperator + + Bootstrap - -Bootstrap + +Bootstrap -InstallConfig->Bootstrap - - +InstallConfig->Bootstrap + + Kubelet - -Kubelet + +Kubelet -InstallConfig->Kubelet - - +InstallConfig->Kubelet + + TerraformVariables - -TerraformVariables + +TerraformVariables -InstallConfig->TerraformVariables - - +InstallConfig->TerraformVariables + + Cluster - -Cluster + +Cluster -InstallConfig->Cluster - - +InstallConfig->Cluster + + clusterID - -clusterID + +clusterID clusterID->InstallConfig - - + + emailAddress - -emailAddress + +emailAddress emailAddress->InstallConfig - - + + password - -password + +password password->InstallConfig - - + + sshPublicKey - -sshPublicKey + +sshPublicKey sshPublicKey->InstallConfig - - + + baseDomain - -baseDomain + +baseDomain baseDomain->InstallConfig - - + + clusterName - -clusterName + +clusterName clusterName->InstallConfig - - + + pullSecret - -pullSecret + +pullSecret pullSecret->InstallConfig - - + + platform - -platform + +platform platform->InstallConfig - - + + Target Manifests - -Target Manifests + +Target Manifests Manifests->Target Manifests - - + + -Manifests->Bootstrap - - +Manifests->Bootstrap + + networkOperator->Manifests - - + + machineAPIOperator->Manifests - - + + AggregatorCA - -AggregatorCA + +AggregatorCA AggregatorCA->machineAPIOperator - - + + AggregatorCA->Manifests - - + + ClusterAPIServerCertKey - -ClusterAPIServerCertKey + +ClusterAPIServerCertKey AggregatorCA->ClusterAPIServerCertKey - - + + AggregatorCA->OpenshiftAPIServerCertKey - - + + APIServerProxyCertKey - -APIServerProxyCertKey + +APIServerProxyCertKey AggregatorCA->APIServerProxyCertKey - - + + -AggregatorCA->Bootstrap - - +AggregatorCA->Bootstrap + + RootCA - -RootCA + +RootCA RootCA->AggregatorCA - - + + RootCA->Manifests - - + + EtcdCA - -EtcdCA + +EtcdCA RootCA->EtcdCA - - + + KubeCA - -KubeCA + +KubeCA RootCA->KubeCA - - + + ServiceServingCA - -ServiceServingCA + +ServiceServingCA RootCA->ServiceServingCA - - + + RootCA->MCSCertKey - - + + RootCA->Admin - - + + -RootCA->Worker - - +RootCA->Worker + + -RootCA->Master - - +RootCA->Master + + -RootCA->Bootstrap - - +RootCA->Bootstrap + + -RootCA->Kubelet - - +RootCA->Kubelet + + EtcdCA->Manifests - - + + EtcdClientCertKey - -EtcdClientCertKey + +EtcdClientCertKey EtcdCA->EtcdClientCertKey - - + + -EtcdCA->Bootstrap - - +EtcdCA->Bootstrap + + IngressCertKey->Manifests - - + + -IngressCertKey->Tectonic - - +IngressCertKey->Tectonic + + -IngressCertKey->Bootstrap - - +IngressCertKey->Bootstrap + + KubeCA->IngressCertKey - - + + KubeCA->Manifests - - + + KubeCA->APIServerCertKey - - + + KubeletCertKey - -KubeletCertKey + +KubeletCertKey KubeCA->KubeletCertKey - - + + AdminCertKey - -AdminCertKey + +AdminCertKey KubeCA->AdminCertKey - - + + -KubeCA->Tectonic - - +KubeCA->Tectonic + + -KubeCA->Bootstrap - - +KubeCA->Bootstrap + + ServiceServingCA->Manifests - - + + -ServiceServingCA->Bootstrap - - +ServiceServingCA->Bootstrap + + ClusterAPIServerCertKey->Manifests - - + + -ClusterAPIServerCertKey->Bootstrap - - +ClusterAPIServerCertKey->Bootstrap + + EtcdClientCertKey->Manifests - - + + -EtcdClientCertKey->Bootstrap - - +EtcdClientCertKey->Bootstrap + + APIServerCertKey->Manifests - - + + -APIServerCertKey->Bootstrap - - +APIServerCertKey->Bootstrap + + OpenshiftAPIServerCertKey->Manifests - - + + -OpenshiftAPIServerCertKey->Bootstrap - - +OpenshiftAPIServerCertKey->Bootstrap + + APIServerProxyCertKey->Manifests - - + + -APIServerProxyCertKey->Bootstrap - - +APIServerProxyCertKey->Bootstrap + + MCSCertKey->Manifests - - + + -MCSCertKey->Bootstrap - - +MCSCertKey->Bootstrap + + KubeletCertKey->Manifests - - + + -KubeletCertKey->Bootstrap - - +KubeletCertKey->Bootstrap + + -KubeletCertKey->Kubelet - - +KubeletCertKey->Kubelet + + ServiceAccountKeyPair - -ServiceAccountKeyPair + +ServiceAccountKeyPair ServiceAccountKeyPair->Manifests - - + + -ServiceAccountKeyPair->Bootstrap - - +ServiceAccountKeyPair->Bootstrap + + Admin->Manifests - - + + -Admin->Bootstrap - - +Admin->Bootstrap + + Target Cluster - -Target Cluster + +Target Cluster -Admin->Target Cluster - - +Admin->Target Cluster + + -Admin->Cluster - - +Admin->Cluster + + AdminCertKey->Admin - - + + -AdminCertKey->Bootstrap - - +AdminCertKey->Bootstrap + + - -Worker->Manifests - - + +Tectonic->Target Manifests + + + + +Tectonic->Bootstrap + + + + +ClusterK8sIO->Tectonic + + -Worker->Tectonic - - +Worker->Tectonic + + -Worker->Worker - - +Worker->Worker + + Target Ignition Configs - -Target Ignition Configs + +Target Ignition Configs -Worker->Target Ignition Configs - - +Worker->Target Ignition Configs + + -Worker->TerraformVariables - - - - -Tectonic->Target Manifests - - - - -Tectonic->Bootstrap - - - - -ClusterK8sIO->Tectonic - - +Worker->TerraformVariables + + -Master->Tectonic - - +Master->Tectonic + + -Master->Master - - +Master->Master + + -Master->Target Ignition Configs - - +Master->Target Ignition Configs + + -Master->TerraformVariables - - +Master->TerraformVariables + + -kubeAddonOperator->Tectonic - - +kubeAddonOperator->Tectonic + + -Bootstrap->Target Ignition Configs - - +Bootstrap->Target Ignition Configs + + -Bootstrap->TerraformVariables - - +Bootstrap->TerraformVariables + + -Kubelet->Bootstrap - - +Kubelet->Bootstrap + + -TerraformVariables->Target Cluster - - +TerraformVariables->Target Cluster + + -TerraformVariables->Cluster - - +TerraformVariables->Cluster + + -Cluster->Target Cluster - - +Cluster->Target Cluster + + diff --git a/pkg/asset/manifests/content/bootkube/ign-config.go b/pkg/asset/manifests/content/bootkube/ign-config.go deleted file mode 100644 index 1222a9d40d0..00000000000 --- a/pkg/asset/manifests/content/bootkube/ign-config.go +++ /dev/null @@ -1,19 +0,0 @@ -package bootkube - -import ( - "text/template" -) - -var ( - // IgnConfig is the constant to represent contents of ign_config.yaml file - IgnConfig = template.Must(template.New("ign-config.yaml").Parse(` -apiVersion: v1 -kind: Secret -metadata: - name: ignition-worker - namespace: openshift-cluster-api -type: Opaque -data: - userData: {{.WorkerIgnConfig}} -`)) -) diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index eb9b8cc9201..d5ef9848824 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -12,7 +12,6 @@ import ( "github.com/pkg/errors" "github.com/openshift/installer/pkg/asset" - "github.com/openshift/installer/pkg/asset/ignition/machine" "github.com/openshift/installer/pkg/asset/installconfig" "github.com/openshift/installer/pkg/asset/kubeconfig" "github.com/openshift/installer/pkg/asset/manifests/content/bootkube" @@ -64,7 +63,6 @@ func (m *Manifests) Dependencies() []asset.Asset { &tls.KubeletCertKey{}, &tls.ServiceAccountKeyPair{}, &kubeconfig.Admin{}, - &machine.Worker{}, } } @@ -117,7 +115,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass rootCA := &tls.RootCA{} serviceAccountKeyPair := &tls.ServiceAccountKeyPair{} serviceServingCA := &tls.ServiceServingCA{} - workerIgnition := &machine.Worker{} dependencies.Get( installConfig, aggregatorCA, @@ -133,7 +130,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass rootCA, serviceAccountKeyPair, serviceServingCA, - workerIgnition, ) etcdEndpointHostnames := make([]string, installConfig.Config.MasterCount()) @@ -169,7 +165,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass ServiceServingCaCert: base64.StdEncoding.EncodeToString(serviceServingCA.Cert()), ServiceServingCaKey: base64.StdEncoding.EncodeToString(serviceServingCA.Key()), TectonicNetworkOperatorImage: "quay.io/coreos/tectonic-network-operator-dev:375423a332f2c12b79438fc6a6da6e448e28ec0f", - WorkerIgnConfig: base64.StdEncoding.EncodeToString(workerIgnition.Files()[0].Data), CVOClusterID: installConfig.Config.ClusterID, EtcdEndpointHostnames: etcdEndpointHostnames, EtcdEndpointDNSSuffix: installConfig.Config.BaseDomain, @@ -177,7 +172,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass assetData := map[string][]byte{ "cluster-apiserver-certs.yaml": applyTemplateData(bootkube.ClusterApiserverCerts, templateData), - "ign-config.yaml": applyTemplateData(bootkube.IgnConfig, templateData), "kube-apiserver-secret.yaml": applyTemplateData(bootkube.KubeApiserverSecret, templateData), "kube-cloud-config.yaml": applyTemplateData(bootkube.KubeCloudConfig, templateData), "kube-controller-manager-secret.yaml": applyTemplateData(bootkube.KubeControllerManagerSecret, templateData),