From 28e5e7ac5395c2809eae739cab09cbe51a1d53cb Mon Sep 17 00:00:00 2001 From: Tanmay Satam Date: Tue, 5 Sep 2023 11:25:40 -0400 Subject: [PATCH] Hardcode dnsmasq ignition config version to 3.2 This is the "default" version supported by the Machine Config Operator v4.7, and has been explicitly set here to avoid vender dependency updates bumping this version up. --- pkg/operator/controllers/dnsmasq/dnsmasq.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/operator/controllers/dnsmasq/dnsmasq.go b/pkg/operator/controllers/dnsmasq/dnsmasq.go index db2f971f877..c58fd4ac2d8 100644 --- a/pkg/operator/controllers/dnsmasq/dnsmasq.go +++ b/pkg/operator/controllers/dnsmasq/dnsmasq.go @@ -11,6 +11,7 @@ import ( "text/template" "github.com/Azure/go-autorest/autorest/to" + "github.com/blang/semver" ign3types "github.com/coreos/ignition/v2/config/v3_2/types" mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/vincent-petithory/dataurl" @@ -90,7 +91,13 @@ func ignition3Config(clusterDomain, apiIntIP, ingressIP string, gatewayDomains [ ign := &ign3types.Config{ Ignition: ign3types.Ignition{ - Version: ign3types.MaxVersion.String(), + // This Ignition Config version should be kept up to date with the default + // rendered Ignition Config version from the Machine Config Operator version + // on the lowest OCP version we support (4.7). + Version: semver.Version{ + Major: 3, + Minor: 2, + }.String(), }, Storage: ign3types.Storage{ Files: []ign3types.File{