Skip to content

Commit

Permalink
revert images
Browse files Browse the repository at this point in the history
Signed-off-by: Megrez Lu <lujiajing1126@gmail.com>
  • Loading branch information
lujiajing1126 committed May 15, 2024
1 parent 1fc4d41 commit 5720914
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions test/e2e/rollout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@ var _ = SIGDescribe("Rollout", func() {

// update success image, v3
newEnvs = mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version3"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:latest"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:latest"
workload.Spec.Template.Spec.Containers[0].Env = newEnvs
UpdateDeployment(workload)
By("Update deployment image from(v2) -> to(v3)")
Expand Down Expand Up @@ -3121,7 +3121,7 @@ var _ = SIGDescribe("Rollout", func() {

// rollback -> v1
newEnvs = mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version1"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:latest"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:latest"
workload.Spec.Template.Spec.Containers[0].Env = newEnvs
UpdateCloneSet(workload)
By("Rollback deployment env NODE_NAME from(version2) -> to(version1)")
Expand Down Expand Up @@ -3447,7 +3447,7 @@ var _ = SIGDescribe("Rollout", func() {

// v1 -> v2, start rollout action
//newEnvs := mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version2"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:0.3.5"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:1.10.2"
UpdateCloneSet(workload)
By("Update cloneSet env NODE_NAME from(version1) -> to(version2)")
// wait step 1 complete
Expand Down Expand Up @@ -3877,7 +3877,7 @@ var _ = SIGDescribe("Rollout", func() {

// rollback -> v1
newEnvs = mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version1"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:latest"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:latest"
workload.Spec.Template.Spec.Containers[0].Env = newEnvs
UpdateNativeStatefulSet(workload)
By("Rollback deployment env NODE_NAME from(version2) -> to(version1)")
Expand Down Expand Up @@ -3964,7 +3964,7 @@ var _ = SIGDescribe("Rollout", func() {

// v1 -> v2, start rollout action
//newEnvs := mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version2"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:0.3.5"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:1.10.2"
UpdateNativeStatefulSet(workload)
By("Update cloneSet env NODE_NAME from(version1) -> to(version2)")
// wait step 1 complete
Expand Down Expand Up @@ -4388,7 +4388,7 @@ var _ = SIGDescribe("Rollout", func() {

// rollback -> v1
newEnvs = mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version1"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:latest"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:latest"
workload.Spec.Template.Spec.Containers[0].Env = newEnvs
UpdateAdvancedStatefulSet(workload)
By("Rollback deployment env NODE_NAME from(version2) -> to(version1)")
Expand Down Expand Up @@ -4475,7 +4475,7 @@ var _ = SIGDescribe("Rollout", func() {

// v1 -> v2, start rollout action
//newEnvs := mergeEnvVar(workload.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: "NODE_NAME", Value: "version2"})
workload.Spec.Template.Spec.Containers[0].Image = "jmalloc/echo-server:0.3.5"
workload.Spec.Template.Spec.Containers[0].Image = "cilium/echoserver:1.10.2"
UpdateAdvancedStatefulSet(workload)
By("Update cloneSet env NODE_NAME from(version1) -> to(version2)")
// wait step 1 complete
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test_data/rollout/advanced_statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: echoserver
image: jmalloc/echo-server:latest
image: cilium/echoserver:latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test_data/rollout/cloneset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
spec:
containers:
- name: echoserver
image: jmalloc/echo-server:latest
image: cilium/echoserver:latest
# imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test_data/rollout/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
spec:
containers:
- name: echoserver
image: jmalloc/echo-server:latest
image: cilium/echoserver:latest
# imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test_data/rollout/native_statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: echoserver
image: jmalloc/echo-server:latest
image: cilium/echoserver:latest
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
Expand Down

0 comments on commit 5720914

Please sign in to comment.