Skip to content

Commit ce32347

Browse files
Merge pull request #2794 from jrvaldes/failed-to-parse-MachineConfig-ignition
OCPBUGS-54499: bump ignition to 3.5
2 parents 0039f78 + 5a2e0b6 commit ce32347

33 files changed

+2039
-3
lines changed

pkg/ignition/ignition.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"sort"
77
"strings"
88

9-
ignCfg "github.com/coreos/ignition/v2/config/v3_4"
10-
ignCfgTypes "github.com/coreos/ignition/v2/config/v3_4/types"
9+
ignCfg "github.com/coreos/ignition/v2/config/v3_5"
10+
ignCfgTypes "github.com/coreos/ignition/v2/config/v3_5/types"
1111
mcfg "github.com/openshift/api/machineconfiguration/v1"
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"

pkg/nodeconfig/nodeconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
ignCfgTypes "github.com/coreos/ignition/v2/config/v3_4/types"
12+
ignCfgTypes "github.com/coreos/ignition/v2/config/v3_5/types"
1313
"github.com/go-logr/logr"
1414
configv1 "github.com/openshift/api/config/v1"
1515
mcfg "github.com/openshift/api/machineconfiguration/v1"

vendor/github.com/coreos/ignition/v2/config/v3_5/config.go

+78
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/translate/translate.go

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/types/cex.go

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/types/clevis.go

+49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/types/config.go

+64
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/types/device.go

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/ignition/v2/config/v3_5/types/directory.go

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)