Merge pull request #2667 from jcpowermac/issue-2634

Add fips for bootstrap node; template ign machine config encap
openshift · Nov 20, 2019 · e9b4862 · e9b4862
2 parents d181bf9 + 57472b2
commit e9b4862
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/data/data/bootstrap/files/etc/ignition-machine-config-encapsulated.json.template b/data/data/bootstrap/files/etc/ignition-machine-config-encapsulated.json.template
@@ -0,0 +1,14 @@
+{
+  "metadata": {
+    "name": "bootstrap-fips"
+  },
+  "spec": {
+    "config": {
+      "ignition": {
+        "version": "2.2.0"
+      }
+    },
+    "kernelArguments": [],
+    "fips": {{ .FIPS }}
+  }
+}
diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -42,6 +42,7 @@ const (
 // template files.
 type bootstrapTemplateData struct {
 	AdditionalTrustBundle string
+	FIPS                  bool
 	EtcdCluster           string
 	PullSecret            string
 	ReleaseImage          string
@@ -223,6 +224,7 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, releaseI
 
 	return &bootstrapTemplateData{
 		AdditionalTrustBundle: installConfig.AdditionalTrustBundle,
+		FIPS:                  installConfig.FIPS,
 		PullSecret:            installConfig.PullSecret,
 		ReleaseImage:          releaseImage,
 		EtcdCluster:           strings.Join(etcdEndpoints, ","),