diff --git a/pkg/asset/manifests/ingress.go b/pkg/asset/manifests/ingress.go index 0a17fba6682..8478f5b46ff 100644 --- a/pkg/asset/manifests/ingress.go +++ b/pkg/asset/manifests/ingress.go @@ -2,7 +2,6 @@ package manifests import ( "fmt" - "os" "path/filepath" "github.com/ghodss/yaml" @@ -23,7 +22,6 @@ var ( // Ingress generates the cluster-ingress-*.yml files. type Ingress struct { - config *configv1.Ingress FileList []*asset.File } @@ -47,7 +45,7 @@ func (ing *Ingress) Generate(dependencies asset.Parents) error { installConfig := &installconfig.InstallConfig{} dependencies.Get(installConfig) - ing.config = &configv1.Ingress{ + config := &configv1.Ingress{ TypeMeta: metav1.TypeMeta{ APIVersion: configv1.SchemeGroupVersion.String(), Kind: "Ingress", @@ -61,7 +59,7 @@ func (ing *Ingress) Generate(dependencies asset.Parents) error { }, } - configData, err := yaml.Marshal(ing.config) + configData, err := yaml.Marshal(config) if err != nil { return errors.Wrapf(err, "failed to create %s manifests from InstallConfig", ing.Name()) } @@ -90,33 +88,7 @@ func (ing *Ingress) Files() []*asset.File { return ing.FileList } -// Load loads the already-rendered files back from disk. +// Load returns false since this asset is not written to disk by the installer. func (ing *Ingress) Load(f asset.FileFetcher) (bool, error) { - crdFile, err := f.FetchByName(filepath.Join(manifestDir, ingCrdFilename)) - if err != nil { - if os.IsNotExist(err) { - return false, nil - } - return false, err - } - - cfgFile, err := f.FetchByName(ingCfgFilename) - if err != nil { - if os.IsNotExist(err) { - return false, nil - } - - return false, err - } - - ingressConfig := &configv1.Ingress{} - if err := yaml.Unmarshal(cfgFile.Data, ingressConfig); err != nil { - return false, errors.Wrapf(err, "failed to unmarshal %s", ingCfgFilename) - } - - fileList := []*asset.File{crdFile, cfgFile} - - ing.FileList, ing.config = fileList, ingressConfig - - return true, nil + return false, nil } diff --git a/pkg/asset/manifests/network.go b/pkg/asset/manifests/network.go index cfd4f21ba20..54c0a881bfa 100644 --- a/pkg/asset/manifests/network.go +++ b/pkg/asset/manifests/network.go @@ -1,7 +1,6 @@ package manifests import ( - "os" "path/filepath" "github.com/ghodss/yaml" @@ -48,7 +47,7 @@ spec: // Networking generates the cluster-network-*.yml files. type Networking struct { - config *netopv1.NetworkConfig + Config *netopv1.NetworkConfig FileList []*asset.File } @@ -104,7 +103,7 @@ func (no *Networking) Generate(dependencies asset.Parents) error { } } - no.config = &netopv1.NetworkConfig{ + no.Config = &netopv1.NetworkConfig{ TypeMeta: metav1.TypeMeta{ APIVersion: netopv1.SchemeGroupVersion.String(), Kind: "NetworkConfig", @@ -121,7 +120,7 @@ func (no *Networking) Generate(dependencies asset.Parents) error { }, } - configData, err := yaml.Marshal(no.config) + configData, err := yaml.Marshal(no.Config) if err != nil { return errors.Wrapf(err, "failed to create %s manifests from InstallConfig", no.Name()) } @@ -149,19 +148,19 @@ func (no *Networking) Files() []*asset.File { // object. This is called by ClusterK8sIO, which captures generalized cluster // state but shouldn't need to be fully networking aware. func (no *Networking) ClusterNetwork() (*clusterv1a1.ClusterNetworkingConfig, error) { - if no.config == nil { + if no.Config == nil { // should be unreachable. return nil, errors.Errorf("ClusterNetwork called before initialization") } pods := []string{} - for _, cn := range no.config.Spec.ClusterNetworks { + for _, cn := range no.Config.Spec.ClusterNetworks { pods = append(pods, cn.CIDR) } cn := &clusterv1a1.ClusterNetworkingConfig{ Services: clusterv1a1.NetworkRanges{ - CIDRBlocks: []string{no.config.Spec.ServiceNetwork}, + CIDRBlocks: []string{no.Config.Spec.ServiceNetwork}, }, Pods: clusterv1a1.NetworkRanges{ CIDRBlocks: pods, @@ -170,33 +169,7 @@ func (no *Networking) ClusterNetwork() (*clusterv1a1.ClusterNetworkingConfig, er return cn, nil } -// Load loads the already-rendered files back from disk. +// Load returns false since this asset is not written to disk by the installer. func (no *Networking) Load(f asset.FileFetcher) (bool, error) { - crdFile, err := f.FetchByName(noCrdFilename) - if err != nil { - if os.IsNotExist(err) { - return false, nil - } - return false, err - } - - cfgFile, err := f.FetchByName(noCfgFilename) - if err != nil { - if os.IsNotExist(err) { - return false, nil - } - - return false, err - } - - netConfig := &netopv1.NetworkConfig{} - if err := yaml.Unmarshal(cfgFile.Data, netConfig); err != nil { - return false, errors.Wrapf(err, "failed to unmarshal %s", noCfgFilename) - } - - fileList := []*asset.File{crdFile, cfgFile} - - no.FileList, no.config = fileList, netConfig - - return true, nil + return false, nil }