Merge branch 'master' into v1beta1-dmi

18 files changed, 45 insertions, 33 deletions

diff --git a/build/admission/Dockerfile b/build/admission/Dockerfile
index 13dece4f0..49ac932b4 100644
--- a/build/admission/Dockerfile
+++ b/build/admission/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/admission -ldfla
 github.com/kubeedge/kubeedge/cloud/cmd/admission
 
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /usr/local/bin/admission /usr/local/bin/admission
 
diff --git a/build/cloud/Dockerfile b/build/cloud/Dockerfile
index c7e5a9e7b..98a894627 100644
--- a/build/cloud/Dockerfile
+++ b/build/cloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/cloudcore -ldfla
     github.com/kubeedge/kubeedge/cloud/cmd/cloudcore
 
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /usr/local/bin/cloudcore /usr/local/bin/cloudcore
 
diff --git a/build/conformance/Dockerfile b/build/conformance/Dockerfile
index f9b2df8cd..3aa7600df 100644
--- a/build/conformance/Dockerfile
+++ b/build/conformance/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and

 # limitations under the License.

 

-FROM golang:1.19.12-alpine3.17 AS builder

+FROM golang:1.20.10-alpine3.18 AS builder

 

 ARG GO_LDFLAGS

 

-RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.0

+RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.5

 

 COPY . /go/src/github.com/kubeedge/kubeedge

 

@@ -30,7 +30,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off ginkgo build -ldflags "-w -s -extldflags -stat
 RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/e2e-runner -ldflags "$GO_LDFLAGS -w -s" \

    /go/src/github.com/kubeedge/kubeedge/build/conformance/e2e-runner

 

-FROM alpine:3.17

+FROM alpine:3.18

 

 COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo

 

diff --git a/build/conformance/e2e-runner/run.go b/build/conformance/e2e-runner/run.go
index cdf742824..75018c960 100644
--- a/build/conformance/e2e-runner/run.go
+++ b/build/conformance/e2e-runner/run.go
@@ -36,7 +36,8 @@ const (
 	dryRunEnvKey        = "E2E_DRYRUN"
 	skipEnvKey          = "E2E_SKIP"
 	focusEnvKey         = "E2E_FOCUS"
-	ginkgoEnvKey        = "GINKGO_BIN"
+	ginkgoPathEnvKey    = "GINKGO_BIN"
+	ginkgoTimeoutEnvKey = "GINKGO_TIMEOUT"
 	testBinEnvKey       = "TEST_BIN"
 	resultsDirEnvKey    = "RESULTS_DIR"
 	reportPrefixEnvKey  = "REPORT_PREFIX"
@@ -45,6 +46,7 @@ const (
 	kubeConfigEnvKey    = "KUBECONFIG"
 	logFileName         = "e2e.log"
 	defaultFocus        = "\\[Conformance\\]"
+	defaultTimeout      = "2h"
 	extraArgsEnvKey     = "E2E_EXTRA_ARGS"
 	defaultResultsDir   = "/tmp/results"
 	defaultReportPrefix = "conformance"
@@ -128,7 +130,10 @@ func makeCmd(w io.Writer) (*exec.Cmd, error) {
 
 	focusEnvValue := util.GetEnvWithDefault(focusEnvKey, defaultFocus)
 	ginkgoArgs = append(ginkgoArgs, "--focus="+focusEnvValue)
-	ginkgoArgs = append(ginkgoArgs, "--noColor=true")
+	ginkgoArgs = append(ginkgoArgs, "--no-color=true")
+
+	timeoutEnvValue := util.GetEnvWithDefault(ginkgoTimeoutEnvKey, defaultTimeout)
+	ginkgoArgs = append(ginkgoArgs, "--timeout="+timeoutEnvValue)
 
 	if len(util.GetEnvWithDefault(dryRunEnvKey, "")) > 0 {
 		ginkgoArgs = append(ginkgoArgs, "--dryRun=true")
@@ -152,7 +157,7 @@ func makeCmd(w io.Writer) (*exec.Cmd, error) {
 	args = append(args, "--")
 	args = append(args, extraArgs...)
 
-	cmd := exec.Command(util.GetEnvWithDefault(ginkgoEnvKey, defaultGinkgoBinary), args...)
+	cmd := exec.Command(util.GetEnvWithDefault(ginkgoPathEnvKey, defaultGinkgoBinary), args...)
 	cmd.Stdout = w
 	cmd.Stderr = w
 	return cmd, nil
diff --git a/build/conformance/kubernetes/edge_skip_case.yaml b/build/conformance/kubernetes/edge_skip_case.yaml
index 80dc5ea89..b3cacec5b 100644
--- a/build/conformance/kubernetes/edge_skip_case.yaml
+++ b/build/conformance/kubernetes/edge_skip_case.yaml
@@ -18,3 +18,5 @@
 - codename: should call prestop when killing a pod

 - codename: should support sysctls

 - codename: Should recreate evicted statefulset

+- codename: should execute poststart exec hook properly

+- codename: should execute prestop exec hook properly

diff --git a/build/conformance/node-e2e-runner/run.go b/build/conformance/node-e2e-runner/run.go
index 6bec14438..13347ff6f 100644
--- a/build/conformance/node-e2e-runner/run.go
+++ b/build/conformance/node-e2e-runner/run.go
@@ -36,7 +36,8 @@ const (
 	dryRunEnvKey        = "E2E_DRYRUN"
 	skipEnvKey          = "E2E_SKIP"
 	focusEnvKey         = "E2E_FOCUS"
-	ginkgoEnvKey        = "GINKGO_BIN"
+	ginkgoPathEnvKey    = "GINKGO_BIN"
+	ginkgoTimeoutEnvKey = "GINKGO_TIMEOUT"
 	testBinEnvKey       = "TEST_BIN"
 	resultsDirEnvKey    = "RESULTS_DIR"
 	reportPrefixEnvKey  = "REPORT_PREFIX"
@@ -45,6 +46,7 @@ const (
 	kubeConfigEnvKey    = "KUBECONFIG"
 	logFileName         = "e2e.log"
 	defaultFocus        = "\\[sig-node\\].*Conformance"
+	defaultTimeout      = "2h"
 	extraArgsEnvKey     = "E2E_EXTRA_ARGS"
 	defaultResultsDir   = "/tmp/results"
 	defaultReportPrefix = "conformance"
@@ -128,7 +130,10 @@ func makeCmd(w io.Writer) (*exec.Cmd, error) {
 
 	focusEnvValue := util.GetEnvWithDefault(focusEnvKey, defaultFocus)
 	ginkgoArgs = append(ginkgoArgs, "--focus="+focusEnvValue)
-	ginkgoArgs = append(ginkgoArgs, "--noColor=true")
+	ginkgoArgs = append(ginkgoArgs, "--no-color=true")
+
+	timeoutEnvValue := util.GetEnvWithDefault(ginkgoTimeoutEnvKey, defaultTimeout)
+	ginkgoArgs = append(ginkgoArgs, "--timeout="+timeoutEnvValue)
 
 	if len(util.GetEnvWithDefault(dryRunEnvKey, "")) > 0 {
 		ginkgoArgs = append(ginkgoArgs, "--dryRun=true")
@@ -152,7 +157,7 @@ func makeCmd(w io.Writer) (*exec.Cmd, error) {
 	args = append(args, "--")
 	args = append(args, extraArgs...)
 
-	cmd := exec.Command(util.GetEnvWithDefault(ginkgoEnvKey, defaultGinkgoBinary), args...)
+	cmd := exec.Command(util.GetEnvWithDefault(ginkgoPathEnvKey, defaultGinkgoBinary), args...)
 	cmd.Stdout = w
 	cmd.Stderr = w
 	return cmd, nil
diff --git a/build/conformance/nodeconformance.Dockerfile b/build/conformance/nodeconformance.Dockerfile
index f9b8cab24..d50b59afc 100644
--- a/build/conformance/nodeconformance.Dockerfile
+++ b/build/conformance/nodeconformance.Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
-RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.0
+RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.5
 
 COPY . /go/src/github.com/kubeedge/kubeedge
 
@@ -30,7 +30,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off ginkgo build -ldflags "-w -s -extldflags -stat
 RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/node-e2e-runner -ldflags "$GO_LDFLAGS -w -s" \
    /go/src/github.com/kubeedge/kubeedge/build/conformance/node-e2e-runner
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
 
diff --git a/build/conformance/util/util.go b/build/conformance/util/util.go
index c0664dc61..8fde5a3a3 100644
--- a/build/conformance/util/util.go
+++ b/build/conformance/util/util.go
@@ -121,7 +121,7 @@ var updateTaintBackoff = wait.Backoff{
 	Jitter:   1.0,
 }
 
-// beforeRunConformance do prepare work before run conformance
+// BeforeRunConformance do prepare work before run conformance
 func BeforeRunConformance() error {
 	kubeClient, err := getKubeClient()
 	if err != nil {
diff --git a/build/controllermanager/Dockerfile b/build/controllermanager/Dockerfile
index a8663c745..ee6df693c 100644
--- a/build/controllermanager/Dockerfile
+++ b/build/controllermanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/controllermanage
     github.com/kubeedge/kubeedge/cloud/cmd/controllermanager
 
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /usr/local/bin/controllermanager /usr/local/bin/controllermanager
 
diff --git a/build/csidriver/Dockerfile b/build/csidriver/Dockerfile
index 1601c97c1..5a44d04a7 100644
--- a/build/csidriver/Dockerfile
+++ b/build/csidriver/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
@@ -7,7 +7,7 @@ COPY . /go/src/github.com/kubeedge/kubeedge
 RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/csidriver -ldflags="${GO_LDFLAGS} -w -s" \
 github.com/kubeedge/kubeedge/cloud/cmd/csidriver
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /usr/local/bin/csidriver /usr/local/bin/csidriver
 
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile
index e769ff848..5d76c72f8 100644
--- a/build/docker/build-tools/build-tools.dockerfile
+++ b/build/docker/build-tools/build-tools.dockerfile
@@ -10,9 +10,9 @@ RUN apt-get autoremove -y &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/*
 
-RUN if [ "${ARCH}" = "amd64" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \
-    elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \
-    elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-armv6l.tar.gz -O - | tar -xz -C /usr/local; \
+RUN if [ "${ARCH}" = "amd64" ]; then wget -c https://dl.google.com/go/go1.20.10.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \
+    elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.20.10.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \
+    elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.20.10.linux-armv6l.tar.gz -O - | tar -xz -C /usr/local; \
     fi
 
 ENV GO111MODULE=on
diff --git a/build/docker/build-tools/make-build-tools.sh b/build/docker/build-tools/make-build-tools.sh
index 71656b22f..408925e12 100755
--- a/build/docker/build-tools/make-build-tools.sh
+++ b/build/docker/build-tools/make-build-tools.sh
@@ -6,7 +6,7 @@ REPOSITORY=${REPOSITORY:-"kubeedge/build-tools"}
 # image tag for build-tools image, including golang version and build-tools version
 # If there's some modifications for build-tools.dockerfile other than golang version, the build-tools version should be updated e.g. ke1, ke2.
 # If the golang version is updated in build-tools.dockerfile, the build-tools version should be started from ke1.
-IMAGE_TAG=${IMAGE_TAG:-"1.19.12-ke2"}
+IMAGE_TAG=${IMAGE_TAG:-"1.20.10-ke1"}
 WORK_DIR=$(cd "$(dirname "$0")";pwd)
 PUSH_TAG=${1}
 ARCHS=(amd64 arm64 arm)
diff --git a/build/docker/installation-package/installation-package.dockerfile b/build/docker/installation-package/installation-package.dockerfile
index 4848b7228..ec51941b9 100644
--- a/build/docker/installation-package/installation-package.dockerfile
+++ b/build/docker/installation-package/installation-package.dockerfile
@@ -1,4 +1,4 @@
-FROM kubeedge/build-tools:1.19.12-ke2 as builder
+FROM kubeedge/build-tools:1.20.10-ke1 as builder
 WORKDIR /work
 ADD . .
 RUN mkdir -p bin && \
diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile
index 83b6916b7..57992d317 100644
--- a/build/edge/Dockerfile
+++ b/build/edge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=golang:1.19.12-alpine3.17
+ARG BUILD_FROM=golang:1.20.10-alpine3.18
 ARG RUN_FROM=docker:dind
 
 FROM ${BUILD_FROM} AS builder
diff --git a/build/edgemark/Dockerfile b/build/edgemark/Dockerfile
index d3b1b6ece..4275dc493 100644
--- a/build/edgemark/Dockerfile
+++ b/build/edgemark/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=golang:1.19.12-alpine3.17

+ARG BUILD_FROM=golang:1.20.10-alpine3.18

 

 FROM ${BUILD_FROM} AS builder

 

@@ -12,7 +12,7 @@ apk --no-cache add build-base linux-headers sqlite-dev binutils-gold && \
 CGO_ENABLED=1 GO111MODULE=off go build -v -o /usr/local/bin/edgemark -ldflags="${GO_LDFLAGS} -w -s -extldflags -static" \

 github.com/kubeedge/kubeedge/edge/cmd/edgemark

 

-FROM alpine:3.17

+FROM alpine:3.18

 

 COPY --from=builder /usr/local/bin/edgemark /usr/local/bin/edgemark

 

diff --git a/build/edgesite/agent-build.Dockerfile b/build/edgesite/agent-build.Dockerfile
index 682aec0e9..3532f5b20 100644
--- a/build/edgesite/agent-build.Dockerfile
+++ b/build/edgesite/agent-build.Dockerfile
@@ -1,5 +1,5 @@
 # Build the proxy-agent binary
-FROM golang:1.19.12-alpine3.17 as builder
+FROM golang:1.20.10-alpine3.18 as builder
 
 WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy
 COPY . /go/src/github.com/kubeedge/kubeedge
diff --git a/build/edgesite/server-build.Dockerfile b/build/edgesite/server-build.Dockerfile
index c4d807817..37338d2ae 100644
--- a/build/edgesite/server-build.Dockerfile
+++ b/build/edgesite/server-build.Dockerfile
@@ -1,5 +1,5 @@
 # Build the proxy-server binary
-FROM golang:1.19.12-alpine3.17 as builder
+FROM golang:1.20.10-alpine3.18 as builder
 
 # Copy in the go src
 WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy
diff --git a/build/iptablesmanager/Dockerfile b/build/iptablesmanager/Dockerfile
index 6e9ee3941..bd55c7910 100644
--- a/build/iptablesmanager/Dockerfile
+++ b/build/iptablesmanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
 
 ARG GO_LDFLAGS
 
@@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/iptables-manager
     github.com/kubeedge/kubeedge/cloud/cmd/iptablesmanager
 
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 COPY --from=builder /usr/local/bin/iptables-manager /usr/local/bin/iptables-manager