Skip to content

assets/templates: remove common templates asset #884

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

Closed
staebler wants to merge 1 commit into from
Closed

assets/templates: remove common templates asset #884

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
2 changes: 1 addition & 1 deletion cmd/openshift-install/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var (
Short: "Generates the unrendered Kubernetes manifest templates",
Long: "",
},
assets: []asset.WritableAsset{&templates.Templates{}},
assets: templates.Templates,
}

ignitionConfigsTarget = target{
Expand Down
132 changes: 21 additions & 111 deletions pkg/asset/templates/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,115 +7,25 @@ import (
"github.com/openshift/installer/pkg/asset/templates/content/openshift"
)

var _ asset.WritableAsset = (*Templates)(nil)

// Templates generates the dependent unrendered template files
type Templates struct {
FileList []*asset.File
}

// Name returns a human friendly name for the templates asset
func (m *Templates) Name() string {
return "Common Templates"
}

// Dependencies returns all of the dependencies directly needed by a
// Templates asset.
func (m *Templates) Dependencies() []asset.Asset {
return []asset.Asset{
&bootkube.KubeCloudConfig{},
&bootkube.MachineConfigServerTLSSecret{},
&bootkube.OpenshiftServiceCertSignerSecret{},
&bootkube.Pull{},
&bootkube.CVOOverrides{},
&bootkube.HostEtcdServiceEndpointsKubeSystem{},
&bootkube.KubeSystemConfigmapEtcdServingCA{},
&bootkube.KubeSystemConfigmapRootCA{},
&bootkube.KubeSystemSecretEtcdClient{},
&bootkube.OpenshiftMachineConfigOperator{},
&bootkube.OpenshiftClusterAPINamespace{},
&bootkube.OpenshiftServiceCertSignerNamespace{},
&bootkube.EtcdServiceKubeSystem{},
&bootkube.HostEtcdServiceKubeSystem{},
&openshift.BindingDiscovery{},
&openshift.CloudCredsSecret{},
&openshift.KubeadminPasswordSecret{},
&openshift.RoleCloudCredsSecretReader{},
}
}

// Generate generates the respective operator config.yml files
func (m *Templates) Generate(dependencies asset.Parents) error {
kubeCloudConfig := &bootkube.KubeCloudConfig{}
machineConfigServerTLSSecret := &bootkube.MachineConfigServerTLSSecret{}
openshiftServiceCertSignerSecret := &bootkube.OpenshiftServiceCertSignerSecret{}
pull := &bootkube.Pull{}
cVOOverrides := &bootkube.CVOOverrides{}
hostEtcdServiceEndpointsKubeSystem := &bootkube.HostEtcdServiceEndpointsKubeSystem{}
kubeSystemConfigmapEtcdServingCA := &bootkube.KubeSystemConfigmapEtcdServingCA{}
kubeSystemConfigmapRootCA := &bootkube.KubeSystemConfigmapRootCA{}
kubeSystemSecretEtcdClient := &bootkube.KubeSystemSecretEtcdClient{}
openshiftMachineConfigOperator := &bootkube.OpenshiftMachineConfigOperator{}
openshiftClusterAPINamespace := &bootkube.OpenshiftClusterAPINamespace{}
openshiftServiceCertSignerNamespace := &bootkube.OpenshiftServiceCertSignerNamespace{}
etcdServiceKubeSystem := &bootkube.EtcdServiceKubeSystem{}
hostEtcdServiceKubeSystem := &bootkube.HostEtcdServiceKubeSystem{}

bindingDiscovery := &openshift.BindingDiscovery{}
cloudCredsSecret := &openshift.CloudCredsSecret{}
kubeadminPasswordSecret := &openshift.KubeadminPasswordSecret{}
roleCloudCredsSecretReader := &openshift.RoleCloudCredsSecretReader{}

dependencies.Get(
kubeCloudConfig,
machineConfigServerTLSSecret,
openshiftServiceCertSignerSecret,
pull,
cVOOverrides,
hostEtcdServiceEndpointsKubeSystem,
kubeSystemConfigmapEtcdServingCA,
kubeSystemConfigmapRootCA,
kubeSystemSecretEtcdClient,
openshiftMachineConfigOperator,
openshiftClusterAPINamespace,
openshiftServiceCertSignerNamespace,
etcdServiceKubeSystem,
hostEtcdServiceKubeSystem,
bindingDiscovery,
cloudCredsSecret,
kubeadminPasswordSecret,
roleCloudCredsSecretReader)

m.FileList = []*asset.File{}
m.FileList = append(m.FileList, kubeCloudConfig.Files()...)
m.FileList = append(m.FileList, machineConfigServerTLSSecret.Files()...)
m.FileList = append(m.FileList, openshiftServiceCertSignerSecret.Files()...)
m.FileList = append(m.FileList, pull.Files()...)
m.FileList = append(m.FileList, cVOOverrides.Files()...)
m.FileList = append(m.FileList, hostEtcdServiceEndpointsKubeSystem.Files()...)
m.FileList = append(m.FileList, kubeSystemConfigmapEtcdServingCA.Files()...)
m.FileList = append(m.FileList, kubeSystemConfigmapRootCA.Files()...)
m.FileList = append(m.FileList, kubeSystemSecretEtcdClient.Files()...)
m.FileList = append(m.FileList, openshiftMachineConfigOperator.Files()...)
m.FileList = append(m.FileList, openshiftClusterAPINamespace.Files()...)
m.FileList = append(m.FileList, openshiftServiceCertSignerNamespace.Files()...)
m.FileList = append(m.FileList, etcdServiceKubeSystem.Files()...)
m.FileList = append(m.FileList, hostEtcdServiceKubeSystem.Files()...)

m.FileList = append(m.FileList, bindingDiscovery.Files()...)
m.FileList = append(m.FileList, cloudCredsSecret.Files()...)
m.FileList = append(m.FileList, kubeadminPasswordSecret.Files()...)
m.FileList = append(m.FileList, roleCloudCredsSecretReader.Files()...)

return nil
}

// Files returns the files generated by the asset.
func (m *Templates) Files() []*asset.File {
return m.FileList
}

// Load returns the manifests asset from disk.
func (m *Templates) Load(f asset.FileFetcher) (bool, error) {
return false, nil
// Templates are the targeted assets for generating the dependent unrendered
// template files.
var Templates = []asset.WritableAsset{
&bootkube.KubeCloudConfig{},
&bootkube.MachineConfigServerTLSSecret{},
&bootkube.OpenshiftServiceCertSignerSecret{},
&bootkube.Pull{},
&bootkube.CVOOverrides{},
&bootkube.HostEtcdServiceEndpointsKubeSystem{},
&bootkube.KubeSystemConfigmapEtcdServingCA{},
&bootkube.KubeSystemConfigmapRootCA{},
&bootkube.KubeSystemSecretEtcdClient{},
&bootkube.OpenshiftMachineConfigOperator{},
&bootkube.OpenshiftClusterAPINamespace{},
&bootkube.OpenshiftServiceCertSignerNamespace{},
&bootkube.EtcdServiceKubeSystem{},
&bootkube.HostEtcdServiceKubeSystem{},
&openshift.BindingDiscovery{},
&openshift.CloudCredsSecret{},
&openshift.KubeadminPasswordSecret{},
&openshift.RoleCloudCredsSecretReader{},
}