improved ignition dirs transpiling

Author: andfasano

pkg/controller/internalreleaseimage/internalreleaseimage_controller.go

@@ -320,7 +320,7 @@ func (ctrl *Controller) syncInternalReleaseImage(key string) error {
 		if isNotFound {
 			mc, err = r.CreateEmptyMachineConfig()
 			if err != nil {
-				return err //syncStatusOnly, could not create MachineConfig
+				return err // syncStatusOnly, could not create MachineConfig
 			}
 		}
 

pkg/controller/internalreleaseimage/internalreleaseimage_helpers_test.go

@@ -30,7 +30,7 @@ func verifyInternalReleaseMasterMachineConfig(t *testing.T, mc *mcfgv1.MachineCo
 	assert.Equal(t, controllerKind.Kind, mc.OwnerReferences[0].Kind)
 
 	ignCfg, err := ctrlcommon.ParseAndConvertConfig(mc.Spec.Config.Raw)
-	assert.NoError(t, err)
+	assert.NoError(t, err, mc.Name)
 
 	assert.Len(t, ignCfg.Systemd.Units, 1)
 	assert.Contains(t, *ignCfg.Systemd.Units[0].Contents, "docker-registry-image-pullspec")

pkg/controller/internalreleaseimage/internalreleaseimage_renderer.go

@@ -10,14 +10,20 @@ import (
 	"text/template"
 
 	"github.com/clarketm/json"
+	fcctbase "github.com/coreos/fcct/base/v0_1"
+	"github.com/coreos/go-semver/semver"
+	ign3 "github.com/coreos/ignition/v2/config/v3_5"
 	ign3types "github.com/coreos/ignition/v2/config/v3_5/types"
+	"github.com/ghodss/yaml"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	mcfgv1alpha1 "github.com/openshift/api/machineconfiguration/v1alpha1"
+	"github.com/openshift/machine-config-operator/pkg/controller/common"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	templatectrl "github.com/openshift/machine-config-operator/pkg/controller/template"
 	"github.com/openshift/machine-config-operator/pkg/version"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
@@ -143,35 +149,58 @@ func (r *Renderer) generateIgnitionFromTemplates(rc *renderContext) (*ign3types.
 	if err != nil {
 		return nil, err
 	}
-	dirs := []string{
-		"/etc/iri-registry",
-		"/etc/iri-registry/certs",
-		"/var/lib/iri-registry",
+	dirs, err := r.renderTemplateFolder(rc, filepath.Join(r.role, "directories"))
+	if err != nil {
+		return nil, err
 	}
 
 	// Generate the iri ignition
-	ignCfg, err := ctrlcommon.TranspileCoreOSConfigToIgn(files, units)
+	ignCfg, err := r.transpileIgnition(dirs, files, units)
 	if err != nil {
 		return nil, fmt.Errorf("error transpiling CoreOS config to Ignition config: %w", err)
 	}
-	r.transpileIgitionDirs(ignCfg, dirs)
+	return ignCfg, nil
+}
+
+func (r *Renderer) transpileIgnition(dirs []string, files []string, units []string) (*ign3types.Config, error) {
+	ignCfg, err := ctrlcommon.TranspileCoreOSConfigToIgn(files, units)
+	if err != nil {
+		return nil, err
+	}
 
+	ignCfgDirs, err := r.transpileCoreOSConfigDirsToIgn(dirs)
+	if err != nil {
+		return nil, err
+	}
+
+	*ignCfg = ign3.Merge(*ignCfg, *ignCfgDirs)
 	return ignCfg, nil
 }
 
 // transpileIgitionDirs generates the ignition for creating the specified directories.
-func (r *Renderer) transpileIgitionDirs(ignCfg *ign3types.Config, directories []string) {
-	for _, d := range directories {
-		mode := 0644
-		ignCfg.Storage.Directories = append(ignCfg.Storage.Directories, ign3types.Directory{
-			Node: ign3types.Node{
-				Path: d,
-			},
-			DirectoryEmbedded1: ign3types.DirectoryEmbedded1{
-				Mode: &mode,
-			},
-		})
+func (r *Renderer) transpileCoreOSConfigDirsToIgn(directories []string) (*ign3types.Config, error) {
+	outConfig := ign3types.Config{}
+	for _, contents := range directories {
+		d := new(fcctbase.Directory)
+		if err := yaml.Unmarshal([]byte(contents), d); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal %q into struct: %w", contents, err)
+		}
+
+		// Add the directory to the config
+		var ctCfg fcctbase.Config
+		ctCfg.Storage.Directories = append(ctCfg.Storage.Directories, *d)
+		ign30Config, tSet, err := ctCfg.ToIgn3_0()
+		if err != nil {
+			return nil, fmt.Errorf("failed to transpile config to Ignition config %w\nTranslation set: %v", err, tSet)
+		}
+		ign3Config, err := common.IgnitionConverterSingleton().Convert(ign30Config, *semver.New(ign30Config.Ignition.Version), ign3types.MaxVersion)
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert config from 3.0 to %v. %w", ign3types.MaxVersion, err)
+		}
+		outConfig = ign3.Merge(outConfig, ign3Config.(ign3types.Config))
 	}
+
+	return &outConfig, nil
 }
 
 // renderTemplateFolder renders all the templates found in the specified folder.

pkg/controller/internalreleaseimage/templates/master/directories/etc_iri-registry_certs.yaml

@@ -0,0 +1,2 @@
+path: /etc/iri-registry/certs
+mode: 0644

pkg/controller/internalreleaseimage/templates/master/directories/var_lib_iri-registry.yaml

@@ -0,0 +1,2 @@
+path: /var/lib/iri-registry
+mode: 0644