Skip to content

Commit

Permalink
Hardcode dnsmasq ignition config version to 3.2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tsatam committed Sep 6, 2023
1 parent 5b361a9 commit 28e5e7a
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkg/operator/controllers/dnsmasq/dnsmasq.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit 28e5e7a

Please sign in to comment.