Skip to content
This repository has been archived by the owner on May 3, 2022. It is now read-only.

Reject modifications to Release environment #357

Merged
merged 1 commit into from
Oct 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions pkg/webhook/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,15 @@ func (c *Webhook) validateRelease(request *admission.AdmissionRequest, release s
return err
}

// validate against rollout blocks
if !reflect.DeepEqual(release.Spec, oldRelease.Spec) {
err = rolloutblock.ValidateBlocks(existingBlocks, overrides)
}

// make sure the environment wasn't changed
if !reflect.DeepEqual(release.Spec.Environment, oldRelease.Spec.Environment) {
return fmt.Errorf("the Release environment must not be changed; consider editing the Application object")
}
}

return err
Expand Down
49 changes: 49 additions & 0 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,55 @@ func TestNewAppAllIn(t *testing.T) {
f.checkReadyPods(relName, targetReplicas)
}

func TestRejectModificationToReleaseEnv(t *testing.T) {
if !*runEndToEnd {
t.Skip("skipping end-to-end tests: --e2e is false")
}
t.Parallel()

targetReplicas := 4
ns, err := setupNamespace(t.Name())
if err != nil {
t.Fatalf("could not create namespace %s: %q", t.Name(), err)
}
f := newFixture(ns.GetName(), t)
defer func() {
if *inspectFailed && t.Failed() {
return
}
teardownNamespace(ns.GetName())
}()

newApp := newApplication(ns.GetName(), appName, &allIn)
newApp.Spec.Template.Values = &shipper.ChartValues{"replicaCount": targetReplicas}
newApp.Spec.Template.Chart.Name = "test-nginx"
newApp.Spec.Template.Chart.Version = "0.0.1"

_, err = shipperClient.ShipperV1alpha1().Applications(ns.GetName()).Create(newApp)
if err != nil {
t.Fatalf("could not create application %q: %q", appName, err)
}

t.Logf("waiting for a new release for new application %q", appName)
rel := f.waitForRelease(appName, 0)
relName := rel.GetName()
t.Logf("waiting for release %q to complete", relName)
f.waitForComplete(rel.GetName())
t.Logf("checking that release %q has %d pods (strategy step 0 -- finished)", relName, targetReplicas)
f.checkReadyPods(relName, targetReplicas)

rel, err = shipperClient.ShipperV1alpha1().Releases(ns.GetName()).Get(relName, metav1.GetOptions{})
if err != nil {
t.Fatalf("could not get release %q: %q", relName, err)
}
rel.Spec.Environment.Chart.Name = "changed name"
_, err = shipperClient.ShipperV1alpha1().Releases(ns.GetName()).Update(rel)
if err == nil {
t.Fatalf("updated release environment %q: %q", relName, err)
}
t.Logf("successfully failed to update release environment %q", relName)
}

func TestNewAppAllInWithRolloutBlockOverride(t *testing.T) {
if !*runEndToEnd {
t.Skip("skipping end-to-end tests: --e2e is false")
Expand Down