Merge pull request #8849 from Lyndon-Li/release-1.16

[1.16] Issue 8847: inherit pod info from node-agent-windows
Merge branch 'release-1.16' into release-1.16
2026-01-11 15:30:34 +00:00 · 2025-04-08 13:38:04 +08:00 · 2025-04-08 12:57:26 +08:00 · 2025-04-07 23:27:46 -04:00 · 2025-04-07 19:41:14 +08:00 · 2025-03-31 15:15:43 +08:00
5 changed files with 9 additions and 9 deletions
--- a/6
+++ b/6
@@ -13,7 +13,7 @@
 # limitations under the License.

 # Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.23.7-bookworm AS velero-builder

 ARG GOPROXY
 ARG BIN
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \
    go clean -modcache -cache

 # Restic binary build section
-FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS restic-builder
+FROM --platform=$BUILDPLATFORM golang:1.23.7-bookworm AS restic-builder

 ARG GOPROXY
 ARG BIN
@@ -73,7 +73,7 @@ RUN mkdir -p /output/usr/bin && \
    go clean -modcache -cache

 # Velero image packing section
-FROM paketobuildpacks/run-jammy-tiny:latest
+FROM paketobuildpacks/run-jammy-tiny:0.2.57

 LABEL maintainer="Xun Jiang <jxun@vmware.com>"

--- a/2
+++ b/2
@@ -15,7 +15,7 @@
 ARG OS_VERSION=1809

 # Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.23.7-bookworm AS velero-builder

 ARG GOPROXY
 ARG BIN
--- a/2
+++ b/2
@@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(

 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.23 as tilt-helper
+FROM golang:1.23.7 as tilt-helper

 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
--- a/hack/build-image/Dockerfile
+++ b/hack/build-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM --platform=$TARGETPLATFORM golang:1.23-bookworm
+FROM --platform=$TARGETPLATFORM golang:1.23.7-bookworm

 ARG GOPROXY

--- a/pkg/exposer/generic_restore.go
+++ b/pkg/exposer/generic_restore.go
@@ -377,14 +377,14 @@ func (e *genericRestoreExposer) RebindVolume(ctx context.Context, ownerObject co
 }

 func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObject corev1.ObjectReference, targetPVC *corev1.PersistentVolumeClaim,
-	operationTimeout time.Duration, label map[string]string, annotation map[string]string, selectedNode string, resources corev1.ResourceRequirements, nodeType string) (*corev1.Pod, error) {
+	operationTimeout time.Duration, label map[string]string, annotation map[string]string, selectedNode string, resources corev1.ResourceRequirements, nodeOS string) (*corev1.Pod, error) {
 	restorePodName := ownerObject.Name
 	restorePVCName := ownerObject.Name

 	containerName := string(ownerObject.UID)
 	volumeName := string(ownerObject.UID)

-	podInfo, err := getInheritedPodInfo(ctx, e.kubeClient, ownerObject.Namespace, kube.NodeOSLinux)
+	podInfo, err := getInheritedPodInfo(ctx, e.kubeClient, ownerObject.Namespace, nodeOS)
 	if err != nil {
 		return nil, errors.Wrap(err, "error to get inherited pod info from node-agent")
 	}
@@ -427,7 +427,7 @@ func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObjec
 	nodeSelector := map[string]string{}
 	podOS := corev1.PodOS{}
 	toleration := []corev1.Toleration{}
-	if nodeType == kube.NodeOSWindows {
+	if nodeOS == kube.NodeOSWindows {
 		userID := "ContainerAdministrator"
 		securityCtx = &corev1.PodSecurityContext{
 			WindowsOptions: &corev1.WindowsSecurityContextOptions{
Author	SHA1	Message	Date
lyndon-li	8f31599fe4	Merge pull request #8849 from Lyndon-Li/release-1.16 Some checks failed Run the E2E test on kind / build (push) Failing after 6m40s Details Run the E2E test on kind / setup-test-matrix (push) Successful in 2s Details Run the E2E test on kind / run-e2e-test (push) Has been skipped Details Main CI / Build (push) Failing after 38s Details [1.16] Issue 8847: inherit pod info from node-agent-windows	2025-04-08 13:38:04 +08:00
lyndon-li	f8ae1495ac	Merge branch 'release-1.16' into release-1.16	2025-04-08 12:57:26 +08:00
Xun Jiang/Bruce Jiang	b469d9f427	Bump base image to 0.2.57 to fix CVEs. (#8853 ) Some checks failed Run the E2E test on kind / build (push) Failing after 6m58s Details Run the E2E test on kind / setup-test-matrix (push) Successful in 3s Details Run the E2E test on kind / run-e2e-test (push) Has been skipped Details Main CI / Build (push) Failing after 37s Details Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>	2025-04-07 23:27:46 -04:00
Lyndon-Li	87084ce3c7	issue 8847: inherit pod info from node-agent-windows Signed-off-by: Lyndon-Li <lyonghui@vmware.com>	2025-04-07 19:41:14 +08:00
lyndon-li	3df026ffdb	Merge pull request #8834 from Lyndon-Li/release-1.16 Some checks failed Run the E2E test on kind / build (push) Failing after 6m12s Details Run the E2E test on kind / setup-test-matrix (push) Successful in 3s Details Run the E2E test on kind / run-e2e-test (push) Has been skipped Details Main CI / Build (push) Failing after 37s Details Pin velero image for 1.16.0	2025-03-31 15:15:43 +08:00
Lyndon-Li	406a730c2a	pin velero image Signed-off-by: Lyndon-Li <lyonghui@vmware.com>	2025-03-31 13:39:27 +08:00