Skip to content

Commit ab89b59

Browse files
Merge pull request #185 from michalskrivanek/OCPBUGS-77160
OCPBUGS-77160: Add NMStateConfig to BareMetal backup
2 parents faa7cf8 + 8c0783a commit ab89b59

12 files changed

Lines changed: 409 additions & 33 deletions

File tree

examples/BareMetal/03-backup-bm-csi-compatible.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
- bmh
2020
- configmap
2121
- infraenv
22+
- nmstateconfig
2223
- priorityclasses
2324
- pdb
2425
- agents

examples/BareMetal/03-backup-bm-csi-no-compatible.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
- bmh
2020
- configmap
2121
- infraenv
22+
- nmstateconfig
2223
- priorityclasses
2324
- pdb
2425
- agents

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
77
github.com/onsi/gomega v1.39.0
88
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff
9-
github.com/openshift/hypershift/api v0.0.0-20260306140012-860432ad354d
9+
github.com/openshift/hypershift/api v0.0.0-20260317154635-8eaac177f1b0
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/vmware-tanzu/velero v1.14.0
1212
k8s.io/api v0.34.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
210210
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
211211
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff h1:6C1z4xMAruyeiTFGqahxNDpI1cXPCjpaFeIeIodty08=
212212
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff/go.mod h1:1vBNCcWNpQyFCz83PWYT/lHUFJ9ost2t5FijHElh6gQ=
213-
github.com/openshift/hypershift/api v0.0.0-20260306140012-860432ad354d h1:mFqKfqVEsrhx/przl97VOAEPoquc8mdDiZNawpNHlac=
214-
github.com/openshift/hypershift/api v0.0.0-20260306140012-860432ad354d/go.mod h1:xm7n2ozbGXXI/vojdlx96VdUzI3hX+jyp/eAvXbA1mw=
213+
github.com/openshift/hypershift/api v0.0.0-20260317154635-8eaac177f1b0 h1:x5DgHyFXF9zpgTH4JYDpBhQnASEIj6z1WXdeHl1DGAI=
214+
github.com/openshift/hypershift/api v0.0.0-20260317154635-8eaac177f1b0/go.mod h1:eYDwJzXCU+0HO9DdvhBAA143z7woIJ5dV71TaJXIkgk=
215215
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11 h1:/BjkW8HljIX96clCuv/V+PzShD3coVcNilCXd/Axlfo=
216216
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0=
217217
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

pkg/core/types/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var (
1414
BackupIBMPowerVSResources = []string{"ibmpowervsmachines", "ibmpowervsmachinetemplates", "ibmpowervsclusters", "ibmpowervsclustertemplates"}
1515
BackupOpenStackResources = []string{"openstackmachines", "openstackmachinetemplates", "openstackclusters", "openstackclustertemplates"}
1616
BackupKubevirtResources = []string{"kubevirtcluster", "kubevirtmachinetemplate", "datavolume"}
17-
BackupAgentResources = []string{"agents", "agentmachines", "agentmachinetemplates", "agentmachinepools", "agentclusters"}
17+
BackupAgentResources = []string{"agents", "agentmachines", "agentmachinetemplates", "agentmachinepools", "agentclusters", "nmstateconfigs", "nmstateconfig", "infraenvs", "infraenv"}
1818
)
1919

2020
type BackupOptions struct {

vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/aws.go

Lines changed: 85 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hosted_controlplane.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_conditions.go

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)