Add osRelease field

api/v1alpha1/osartifact_types.go

@@ -37,6 +37,7 @@ type OSArtifactSpec struct {
 
 	Bundles     []string `json:"bundles,omitempty"`
 	PullOptions Pull     `json:"pull,omitempty"`
+	OSRelease   string   `json:"osRelease,omitempty"`
 	PushOptions Push     `json:"push,omitempty"`
 }
 

config/crd/bases/build.c3os-x.io_osartifacts.yaml

@@ -51,6 +51,8 @@ spec:
                 type: string
               iso:
                 type: boolean
+              osRelease:
+                type: string
               pull:
                 properties:
                   containerRegistryCredentials:

controllers/configmap.go

@@ -32,7 +32,8 @@ func (r *OSArtifactReconciler) genConfigMap(artifact buildv1alpha1.OSArtifact) *
 			OwnerReferences: genOwner(artifact),
 		},
 		Data: map[string]string{
-			"config":   artifact.Spec.CloudConfig,
-			"grub.cfg": artifact.Spec.GRUBConfig,
+			"config":     artifact.Spec.CloudConfig,
+			"grub.cfg":   artifact.Spec.GRUBConfig,
+			"os-release": artifact.Spec.OSRelease,
 		}}
 }

controllers/deployment.go

@@ -81,23 +81,24 @@ func createImageContainer(containerImage string, pushOptions buildv1alpha1.Push)
 	}
 }
 
-func pushImageContainer(containerImage string, pushOptions buildv1alpha1.Push) v1.Container {
+func osReleaseContainer(containerImage string) v1.Container {
 	return v1.Container{
 		ImagePullPolicy: v1.PullAlways,
-		Name:            "push-image",
+		Name:            "os-release",
 		Image:           containerImage,
 		Command:         []string{"/bin/bash", "-cxe"},
 		Args: []string{
-			fmt.Sprintf(
-				"skopeo /public/image.tar %s",
-				pushOptions.ImageName,
-			),
+			"cp -rfv /etc/os-release /rootfs/etc/os-release",
 		},
 		VolumeMounts: []v1.VolumeMount{
-
 			{
-				Name:      "public",
-				MountPath: "/public",
+				Name:      "config",
+				MountPath: "/etc/os-release",
+				SubPath:   "os-release",
+			},
+			{
+				Name:      "rootfs",
+				MountPath: "/rootfs",
 			},
 		},
 	}
@@ -189,6 +190,11 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)
 		pod.InitContainers = append(pod.InitContainers, unpackContainer(fmt.Sprint(i), r.ToolImage, bundle, artifact.Spec.PullOptions))
 	}
 
+	if artifact.Spec.OSRelease != "" {
+		pod.InitContainers = append(pod.InitContainers, osReleaseContainer(r.ToolImage))
+
+	}
+
 	pod.InitContainers = append(pod.InitContainers, buildIsoContainer)
 
 	if pushImage {