From 01a61749410f411f94a3f69390dd90606930ce02 Mon Sep 17 00:00:00 2001 From: Megrez Lu Date: Wed, 13 Mar 2024 11:35:57 +0800 Subject: [PATCH] do not provide default value for path --- .github/workflows/e2e-custom.yaml | 2 +- api/v1beta1/rollout_types.go | 4 +--- .../crd/bases/rollouts.kruise.io_rollouts.yaml | 7 +------ test/e2e/rollout_test.go | 16 ++++++++-------- .../test_data/rollout/advanced_statefulset.yaml | 2 +- test/e2e/test_data/rollout/cloneset.yaml | 2 +- test/e2e/test_data/rollout/deployment.yaml | 2 +- .../test_data/rollout/native_statefulset.yaml | 2 +- 8 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/e2e-custom.yaml b/.github/workflows/e2e-custom.yaml index 4803b098..cb730459 100644 --- a/.github/workflows/e2e-custom.yaml +++ b/.github/workflows/e2e-custom.yaml @@ -70,7 +70,7 @@ jobs: kubectl apply -f ./test/e2e/test_data/customNetworkProvider/lua_script_configmap.yaml make ginkgo set +e - ./bin/ginkgo -timeout 60m -v --focus='Canary rollout with custon network provider' test/e2e + ./bin/ginkgo -timeout 60m -v --focus='Canary rollout with custom network provider' test/e2e retVal=$? # kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}') diff --git a/api/v1beta1/rollout_types.go b/api/v1beta1/rollout_types.go index a77a0155..df99bf20 100644 --- a/api/v1beta1/rollout_types.go +++ b/api/v1beta1/rollout_types.go @@ -155,13 +155,11 @@ type TrafficRoutingStrategy struct { } type HttpRouteMatch struct { - // Path specifies a HTTP request path matcher. If this field is not - // specified, a default prefix match on the "/" path is provided. + // Path specifies a HTTP request path matcher. // Supported list: // - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest // // +optional - // +kubebuilder:default={type: "PathPrefix", value: "/"} Path *gatewayv1beta1.HTTPPathMatch `json:"path,omitempty"` // Headers specifies HTTP request header matchers. Multiple match values are diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml index 177d015e..ff3f07a6 100644 --- a/config/crd/bases/rollouts.kruise.io_rollouts.yaml +++ b/config/crd/bases/rollouts.kruise.io_rollouts.yaml @@ -690,13 +690,8 @@ spec: - name x-kubernetes-list-type: map path: - default: - type: PathPrefix - value: / description: 'Path specifies a HTTP request path - matcher. If this field is not specified, a default - prefix match on the "/" path is provided. Supported - list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest' + matcher. Supported list: - Istio: https://istio.io/latest/docs/reference/config/networking/virtual-service/#HTTPMatchRequest' properties: type: default: PathPrefix diff --git a/test/e2e/rollout_test.go b/test/e2e/rollout_test.go index c8a7cae2..c8759af8 100644 --- a/test/e2e/rollout_test.go +++ b/test/e2e/rollout_test.go @@ -1664,7 +1664,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 = "cilium/echoserver:latest" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:latest" workload.Spec.Template.Spec.Containers[0].Env = newEnvs UpdateDeployment(workload) By("Update deployment image from(v2) -> to(v3)") @@ -2651,7 +2651,7 @@ var _ = SIGDescribe("Rollout", func() { }) }) - KruiseDescribe("Canary rollout with custon network provider", func() { + KruiseDescribe("Canary rollout with custom network provider", func() { It("V1->V2: Route traffic with header matches and weight using rollout for VirtualService", func() { By("Creating Rollout...") rollout := &v1alpha1.Rollout{} @@ -3095,7 +3095,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 = "cilium/echoserver:latest" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:latest" workload.Spec.Template.Spec.Containers[0].Env = newEnvs UpdateCloneSet(workload) By("Rollback deployment env NODE_NAME from(version2) -> to(version1)") @@ -3421,7 +3421,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 = "cilium/echoserver:1.10.2" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:1.0" UpdateCloneSet(workload) By("Update cloneSet env NODE_NAME from(version1) -> to(version2)") // wait step 1 complete @@ -3851,7 +3851,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 = "cilium/echoserver:latest" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:latest" workload.Spec.Template.Spec.Containers[0].Env = newEnvs UpdateNativeStatefulSet(workload) By("Rollback deployment env NODE_NAME from(version2) -> to(version1)") @@ -3938,7 +3938,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 = "cilium/echoserver:1.10.2" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:1.0" UpdateNativeStatefulSet(workload) By("Update cloneSet env NODE_NAME from(version1) -> to(version2)") // wait step 1 complete @@ -4362,7 +4362,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 = "cilium/echoserver:latest" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:latest" workload.Spec.Template.Spec.Containers[0].Env = newEnvs UpdateAdvancedStatefulSet(workload) By("Rollback deployment env NODE_NAME from(version2) -> to(version1)") @@ -4449,7 +4449,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 = "cilium/echoserver:1.10.2" + workload.Spec.Template.Spec.Containers[0].Image = "kicbase/echo-server:1.0" UpdateAdvancedStatefulSet(workload) By("Update cloneSet env NODE_NAME from(version1) -> to(version2)") // wait step 1 complete diff --git a/test/e2e/test_data/rollout/advanced_statefulset.yaml b/test/e2e/test_data/rollout/advanced_statefulset.yaml index db9ce702..aece5a86 100644 --- a/test/e2e/test_data/rollout/advanced_statefulset.yaml +++ b/test/e2e/test_data/rollout/advanced_statefulset.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: echoserver - image: cilium/echoserver:latest + image: kicbase/echo-server:latest imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/test/e2e/test_data/rollout/cloneset.yaml b/test/e2e/test_data/rollout/cloneset.yaml index b1770201..aef4b570 100644 --- a/test/e2e/test_data/rollout/cloneset.yaml +++ b/test/e2e/test_data/rollout/cloneset.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: echoserver - image: cilium/echoserver:latest + image: kicbase/echo-server:latest # imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/test/e2e/test_data/rollout/deployment.yaml b/test/e2e/test_data/rollout/deployment.yaml index 68e1fea0..5ea83f9f 100644 --- a/test/e2e/test_data/rollout/deployment.yaml +++ b/test/e2e/test_data/rollout/deployment.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: echoserver - image: cilium/echoserver:latest + image: kicbase/echo-server:latest # imagePullPolicy: IfNotPresent ports: - containerPort: 8080 diff --git a/test/e2e/test_data/rollout/native_statefulset.yaml b/test/e2e/test_data/rollout/native_statefulset.yaml index 2ced5586..97914122 100644 --- a/test/e2e/test_data/rollout/native_statefulset.yaml +++ b/test/e2e/test_data/rollout/native_statefulset.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: echoserver - image: cilium/echoserver:latest + image: kicbase/echo-server:latest imagePullPolicy: IfNotPresent ports: - containerPort: 8080