Skip to content

OCPBUGS-82166: fix etcd snapshot restore for etcd 3.6 and enforce restoreSnapshotURL immutability #8186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Apr 10, 2026
Merged

OCPBUGS-82166: fix etcd snapshot restore for etcd 3.6 and enforce restoreSnapshotURL immutability #8186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c13485e
fix(OCPBUGS-82166): add etcd 3.6 compatibility for snapshot restore
jparrill Apr 8, 2026
d82d5d0
feat(CNTRLPLANE-2678): enforce restoreSnapshotURL immutability via CEL
jparrill Apr 10, 2026
29497e2
chore(CNTRLPLANE-2678): regenerate CRDs for restoreSnapshotURL immuta…
jparrill Apr 10, 2026
f2dab40
test(CNTRLPLANE-2678): add envtest suite for restoreSnapshotURL CEL v…
jparrill Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/hypershift/v1beta1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,6 +1901,7 @@ type EtcdSpec struct {
type ManagedEtcdSpec struct {
// storage specifies how etcd data is persisted.
// +required
// +kubebuilder:validation:XValidation:rule="has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)",message="restoreSnapshotURL cannot be added or removed after creation"
Storage ManagedEtcdStorageSpec `json:"storage"`

@muraee muraee Apr 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is difficult to read and reason about. Here I would just add:

// +kubebuilder:validation:XValidation:rule="has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)",message="restoreSnapshotURL cannot be added or removed after creation"
Storage ManagedEtcdStorageSpec `json:"storage"`

and add the equality check back ontop of restoreSnapshotUR field directly

// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="restoreSnapshotURL is immutable"
RestoreSnapshotURL []string `json:"restoreSnapshotURL,omitempty"`


// backup defines the backup configuration for managed etcd, including
Expand Down Expand Up @@ -1952,6 +1953,7 @@ type ManagedEtcdStorageSpec struct {
// +kubebuilder:validation:MaxItems=1
// +kubebuilder:validation:items:MaxLength=1024
// +kubebuilder:validation:XValidation:rule="self.size() <= 1", message="RestoreSnapshotURL shouldn't contain more than 1 entry"
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="restoreSnapshotURL is immutable"

@enxebre enxebre Apr 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we please update the gdoc to reflect clearly this is only settable on creation

RestoreSnapshotURL []string `json:"restoreSnapshotURL,omitempty"`
}

Expand Down
6 changes: 6 additions & 0 deletions ...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2527,6 +2527,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2537,6 +2539,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ....featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2654,6 +2654,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2664,6 +2666,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...egated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2528,6 +2530,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2528,6 +2530,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...rated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2861,6 +2863,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...ests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2991,6 +2991,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -3001,6 +3003,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2982,6 +2984,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...erated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/GCPPlatform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2528,6 +2530,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...ated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/HCPEtcdBackup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2583,6 +2583,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2593,6 +2595,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...fests/hostedclusters.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2540,6 +2540,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2550,6 +2552,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...turegated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2536,6 +2536,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2546,6 +2548,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...turegated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2594,6 +2594,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2604,6 +2606,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...enerated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2528,6 +2530,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2444,6 +2444,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2454,6 +2456,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...uregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,6 +2573,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2583,6 +2585,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...d-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,6 +2435,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2445,6 +2447,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...ests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,6 +2435,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2445,6 +2447,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2768,6 +2768,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2778,6 +2780,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
6 changes: 6 additions & 0 deletions ...hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,6 +2908,8 @@ spec:
- message: RestoreSnapshotURL shouldn't contain more than
1 entry
rule: self.size() <= 1
- message: restoreSnapshotURL is immutable
rule: self == oldSelf
type:
description: |-
type is the kind of persistent storage implementation to use for etcd.
Expand All @@ -2918,6 +2920,10 @@ spec:
required:
- type
type: object
x-kubernetes-validations:
- message: restoreSnapshotURL cannot be added or removed after
creation
rule: has(self.restoreSnapshotURL) == has(oldSelf.restoreSnapshotURL)
required:
- storage
type: object
Expand Down
Loading
Loading