Skip to content

Ensure operation is update when validating RKEConfig #1145

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
merged 1 commit into from
Oct 17, 2025
Merged

Ensure operation is update when validating RKEConfig #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions pkg/resources/provisioning.cattle.io/v1/cluster/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (p *provisioningAdmitter) Admit(request *admission.Request) (*admissionv1.A
return response, err
}

if response := p.validateRKEConfigChanged(oldCluster, cluster); !response.Allowed {
if response := p.validateRKEConfigChanged(request, oldCluster, cluster); !response.Allowed {
return response, nil
}

Expand Down Expand Up @@ -186,11 +186,10 @@ func getEnvVar(name string, envVars []rkev1.EnvVar) *rkev1.EnvVar {
// validateRKEConfigChanged validates that after creation, the `spec.rkeConfig` cannot be set to a non-nil value if it
// was nil, and likewise cannot be set to a nil value if it was not. The local cluster is explicitly exempted from
// setting rkeConfig from nil to not nil, as it is a valid usecase to do so for rancherd in harvester environments.
func (p *provisioningAdmitter) validateRKEConfigChanged(oldCluster, newCluster *v1.Cluster) *admissionv1.AdmissionResponse {
if oldCluster == nil {
func (p *provisioningAdmitter) validateRKEConfigChanged(request *admission.Request, oldCluster, newCluster *v1.Cluster) *admissionv1.AdmissionResponse {
if request.Operation != admissionv1.Update {
return admission.ResponseAllowed()
}

if oldCluster.Spec.RKEConfig == nil && newCluster.Spec.RKEConfig != nil && oldCluster.Name != localCluster {
return admission.ResponseBadRequest("RKEConfig cannot be changed from null after cluster creation")
} else if oldCluster.Spec.RKEConfig != nil && newCluster.Spec.RKEConfig == nil {
Expand Down
26 changes: 24 additions & 2 deletions pkg/resources/provisioning.cattle.io/v1/cluster/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2737,30 +2737,42 @@ func Test_validateS3Secret(t *testing.T) {
func Test_ValidateRKEConfigChanged(t *testing.T) {
tests := []struct {
name string
op admissionv1.Operation
oldCluster *v1.Cluster
newCluster *v1.Cluster
expected bool
}{
{
name: "create",
oldCluster: nil,
op: admissionv1.Create,
oldCluster: &v1.Cluster{},
newCluster: &v1.Cluster{},
expected: true,
},
{
name: "delete",
op: admissionv1.Delete,
oldCluster: &v1.Cluster{},
newCluster: &v1.Cluster{},
expected: true,
},
{
name: "no change - nil",
op: admissionv1.Update,
oldCluster: &v1.Cluster{},
newCluster: &v1.Cluster{},
expected: true,
},
{
name: "no change - nil - local",
op: admissionv1.Update,
oldCluster: &v1.Cluster{ObjectMeta: metav1.ObjectMeta{Name: "local"}},
newCluster: &v1.Cluster{ObjectMeta: metav1.ObjectMeta{Name: "local"}},
expected: true,
},
{
name: "no change - not nil",
op: admissionv1.Update,
oldCluster: &v1.Cluster{
Spec: v1.ClusterSpec{
RKEConfig: &v1.RKEConfig{},
Expand All @@ -2775,6 +2787,7 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
},
{
name: "no change - not nil - local",
op: admissionv1.Update,
oldCluster: &v1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "local",
Expand All @@ -2795,6 +2808,7 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
},
{
name: "change - was nil",
op: admissionv1.Update,
oldCluster: &v1.Cluster{},
newCluster: &v1.Cluster{
Spec: v1.ClusterSpec{
Expand All @@ -2805,6 +2819,7 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
},
{
name: "change - was nil - local",
op: admissionv1.Update,
oldCluster: &v1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "local",
Expand All @@ -2822,6 +2837,7 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
},
{
name: "change - was not nil",
op: admissionv1.Update,
oldCluster: &v1.Cluster{
Spec: v1.ClusterSpec{
RKEConfig: &v1.RKEConfig{},
Expand All @@ -2832,6 +2848,7 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
},
{
name: "change - was not nil - local",
op: admissionv1.Update,
oldCluster: &v1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "local",
Expand All @@ -2854,7 +2871,12 @@ func Test_ValidateRKEConfigChanged(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
p := provisioningAdmitter{}
response := p.validateRKEConfigChanged(tt.oldCluster, tt.newCluster)
req := &admission.Request{
AdmissionRequest: admissionv1.AdmissionRequest{
Operation: tt.op,
},
}
response := p.validateRKEConfigChanged(req, tt.oldCluster, tt.newCluster)
if tt.expected {
assert.True(t, response.Allowed, "Expected change to be admitted")
} else {
Expand Down