Skip to content

operator: Add bootstrap arg --osimg-config-file #349

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
cgwalters wants to merge 2 commits into from
Closed

operator: Add bootstrap arg --osimg-config-file #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497da65
operator: Extract a helper to read a ConfigMap from disk
cgwalters Jan 27, 2019
80a5b6c
operator: Add bootstrap arg --osimg-config-file
cgwalters Jan 27, 2019
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
20 changes: 5 additions & 15 deletions cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@ package main
import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"

"github.com/golang/glog"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"

"github.com/openshift/machine-config-operator/pkg/operator"
"github.com/openshift/machine-config-operator/pkg/version"
Expand All @@ -29,6 +24,7 @@ var (
rootCAFile string
pullSecretFile string
configFile string
osimgConfigMapFile string
imagesConfigMapFile string
mccImage string
mcsImage string
Expand All @@ -48,6 +44,7 @@ func init() {
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mcsImage, "machine-config-server-image", "", "Image for Machine Config Server. (this cannot be set if --images-json-configmap is set)")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.mcdImage, "machine-config-daemon-image", "", "Image for Machine Config Daemon. (this cannot be set if --images-json-configmap is set)")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.configFile, "config-file", "", "ClusterConfig ConfigMap file.")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.osimgConfigMapFile, "osimg-config-file", "", "ConfigMap containing osImageURL")
}

func runBootstrapCmd(cmd *cobra.Command, args []string) {
Expand Down Expand Up @@ -86,28 +83,21 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
imgs.MachineConfigServer = bootstrapOpts.mcsImage
imgs.MachineConfigDaemon = bootstrapOpts.mcdImage
}

if err := operator.RenderBootstrap(
bootstrapOpts.configFile,
bootstrapOpts.etcdCAFile, bootstrapOpts.rootCAFile, bootstrapOpts.pullSecretFile,
imgs,
imgs, bootstrapOpts.osimgConfigMapFile,
bootstrapOpts.destinationDir,
); err != nil {
glog.Fatalf("error rendering bootstrap manifests: %v", err)
}
}

func rawImagesFromConfigMapOnDisk(file string) ([]byte, error) {
data, err := ioutil.ReadFile(bootstrapOpts.imagesConfigMapFile)
cm, err := operator.DecodeConfigMap(file)
if err != nil {
return nil, err
}
obji, err := runtime.Decode(scheme.Codecs.UniversalDecoder(corev1.SchemeGroupVersion), data)
if err != nil {
return nil, err
}
cm, ok := obji.(*corev1.ConfigMap)
if !ok {
return nil, fmt.Errorf("expected *corev1.ConfigMap found %T", obji)
}
return []byte(cm.Data["images.json"]), nil
}
30 changes: 28 additions & 2 deletions pkg/operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
func RenderBootstrap(
clusterConfigConfigMapFile string,
etcdCAFile, rootCAFile string, pullSecretFile string,
imgs Images,
imgs Images, osimgConfigMapFile string,
destinationDir string,
) error {
filesData := map[string][]byte{}
Expand All @@ -37,12 +37,21 @@ func RenderBootstrap(
filesData[file] = data
}

var osimageurl string
if osimgConfigMapFile != "" {
cm, err := DecodeConfigMap(osimgConfigMapFile)
if err != nil {
return err
}
osimageurl = cm.Data["osImageURL"]
}

mcoconfig, err := discoverMCOConfig(getInstallConfigFromFile(filesData[clusterConfigConfigMapFile]))
if err != nil {
return fmt.Errorf("error discovering MCOConfig from %q: %v", clusterConfigConfigMapFile, err)
}

config := getRenderConfig(mcoconfig, filesData[etcdCAFile], filesData[rootCAFile], nil, imgs, "")
config := getRenderConfig(mcoconfig, filesData[etcdCAFile], filesData[rootCAFile], nil, imgs, osimageurl)

manifests := []struct {
name string
Expand Down Expand Up @@ -98,6 +107,23 @@ func RenderBootstrap(
return nil
}

/// DecodeConfigMap converts a file on disk into a ConfigMap
func DecodeConfigMap(file string) (*corev1.ConfigMap, error) {
data, err := ioutil.ReadFile(file)
if err != nil {
return nil, err
}
obji, err := runtime.Decode(scheme.Codecs.UniversalDecoder(corev1.SchemeGroupVersion), data)
if err != nil {
return nil, err
}
cm, ok := obji.(*corev1.ConfigMap)
if !ok {
return nil, fmt.Errorf("expected *corev1.ConfigMap found %T", obji)
}
return cm, nil
}

func getInstallConfigFromFile(cmData []byte) installConfigGetter {
return func() (installertypes.InstallConfig, error) {
obji, err := runtime.Decode(scheme.Codecs.UniversalDecoder(corev1.SchemeGroupVersion), cmData)
Expand Down