Skip to content

asset/manifest: do not load network nor ingress from disk #877

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

asset/manifest: do not load network nor ingress from disk #877

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
36 changes: 4 additions & 32 deletions pkg/asset/manifests/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package manifests

import (
"fmt"
"os"
"path/filepath"

"github.com/ghodss/yaml"
Expand All @@ -23,7 +22,6 @@ var (

// Ingress generates the cluster-ingress-*.yml files.
type Ingress struct {
config *configv1.Ingress
FileList []*asset.File
}

Expand All @@ -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",
Expand All @@ -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())
}
Expand Down Expand Up @@ -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
}
43 changes: 8 additions & 35 deletions pkg/asset/manifests/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package manifests

import (
"os"
"path/filepath"

"github.com/ghodss/yaml"
Expand Down Expand Up @@ -48,7 +47,7 @@ spec:

// Networking generates the cluster-network-*.yml files.
type Networking struct {
config *netopv1.NetworkConfig
Config *netopv1.NetworkConfig
FileList []*asset.File
}

Expand Down Expand Up @@ -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",
Expand All @@ -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())
}
Expand Down Expand Up @@ -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,
Expand All @@ -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
}