Merge branch 'master' into issue-23642

Makefile

@@ -78,5 +78,11 @@ update-labels:
 	hack/make-rules/update/labels.sh
 verify-labels:
 	hack/make-rules/verify/labels.sh
+.PHONY: update-codegen
+update-codegen:
+	hack/make-rules/update/codegen.sh
+.PHONY: verify-codegen
+verify-codegen:
+	hack/make-rules/verify/codegen.sh
 #################################################################################
 .PHONY: unit test verify go-lint update-gofmt verify-gofmt update-file-perms verify-file-perms update-spelling verify-spelling update-labels verify-labels

OWNERS_ALIASES

@@ -33,8 +33,7 @@ aliases:
   sig-apps-leads:
     - janetkuo
     - kow3ns
-    - mattfarina
-    - prydonius
+    - soltysh
   sig-architecture-leads:
     - derekwaynecarr
     - dims
@@ -44,11 +43,13 @@ aliases:
     - enj
     - liggitt
     - mikedanese
-    - tallclair
+    - ritazh
   sig-autoscaling-leads:
+    - gjtempleton
     - mwielgus
   sig-cli-leads:
-    - pwittrock
+    - KnVerey
+    - eddiezane
     - seans3
     - soltysh
   sig-cloud-provider-leads:
@@ -58,18 +59,21 @@ aliases:
     - fabriziopandini
     - justinsb
     - neolit123
-    - timothysc
+    - vincepri
   sig-contributor-experience-leads:
-    - castrojo
+    - alisondy
     - cblecker
     - mrbobbytables
     - nikhita
   sig-docs-leads:
+    - divya-mohan0209
     - jimangel
     - kbhawkey
+    - onlydole
     - sftim
   sig-instrumentation-leads:
     - brancz
+    - dashpole
     - ehashman
     - logicalhan
   sig-k8s-infra-leads:
@@ -78,8 +82,8 @@ aliases:
     - spiffxp
     - thockin
   sig-multicluster-leads:
+    - jeremyot
     - pmorie
-    - quinton-hoole
   sig-network-leads:
     - caseydavenport
     - dcbw
@@ -100,9 +104,13 @@ aliases:
   sig-scheduling-leads:
     - Huang-Wei
     - ahg-g
+    - alculquicondor
+  sig-security-leads:
+    - IanColdwater
+    - tabbysable
   sig-service-catalog-leads:
     - jberkhahn
-    - mszostok
+    - jhvhs
   sig-storage-leads:
     - jsafrane
     - msau42
@@ -119,51 +127,37 @@ aliases:
     - maciaszczykm
     - shu-mutou
   sig-usability-leads:
-    - Rajakavitha1
     - hpandeycodeit
+    - morengab
     - tashimi
-    - vllry
   sig-windows-leads:
-    - benmoss
-    - ddebroy
+    - claudiubelu
+    - jayunit100
+    - jsturtevant
     - marosset
-    - michmike
-  wg-apply-leads:
-    - lavalamp
-  wg-component-standard-leads:
-    - mtaufen
-    - stealthybox
-    - sttts
+  wg-api-expression-leads:
+    - apelisse
+    - kwiesmueller
   wg-data-protection-leads:
     - xing-yang
     - yuxiangqian
   wg-iot-edge-leads:
     - cantbewong
     - cindyxing
     - dejanb
-  wg-lts-leads:
-    - imkin
-    - quinton-hoole
-    - tpepper
-    - youngnick
-  wg-machine-learning-leads:
-    - k82cn
-    - kow3ns
-    - vishh
   wg-multitenancy-leads:
     - srampal
     - tashimi
   wg-policy-leads:
-    - ericavonb
-    - hannibalhuang
-  wg-resource-management-leads:
-    - derekwaynecarr
-    - vishh
-  wg-security-audit-leads:
-    - aasmall
-    - cji
-    - jaybeale
-    - joelsmith
+    - JimBugwadia
+    - rficcaglia
+  wg-reliability-leads:
+    - deads2k
+    - stevekuznetsov
+    - wojtek-t
+  wg-structured-logging-leads:
+    - pohly
+    - serathius
   ug-big-data-leads:
     - erikerlandson
     - foxish
@@ -174,35 +168,34 @@ aliases:
     - mylesagray
     - phenixblue
   committee-code-of-conduct:
-    - AevaOnline
     - celestehorgan
     - karenhchu
-    - tashimi
+    - palnabarun
     - tpepper
-  committee-product-security:
+    - vllry
+  committee-security-response:
     - cjcullen
     - joelsmith
-    - jonpulsifer
-    - liggitt
     - lukehinds
-    - philips
+    - micahhausler
+    - swamymsft
+    - tabbysable
     - tallclair
   committee-steering:
     - cblecker
-    - derekwaynecarr
     - dims
-    - nikhita
+    - justaugustus
+    - liggitt
+    - mrbobbytables
     - parispittman
-    - spiffxp
-    - timothysc
+    - tpepper
 ## BEGIN CUSTOM CONTENT
   provider-aws:
-    - d-nishi
     - justinsb
-    - kris-nova
+    - nckturner
+    - wongma7
   provider-azure:
     - craiglpeters
-    - justaugustus
     - feiskyer
     - khenidak
   provider-gcp:

config/jobs/GoogleCloudPlatform/k8s-multicluster-ingress/k8s-multicluster-ingress-config.yaml

@@ -8,7 +8,7 @@ presubmits:
       preset-service-account: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         args:
         - "--repo=github.com/GoogleCloudPlatform/$(REPO_NAME)=$(PULL_REFS)"
         - "--root=/go/src"
@@ -43,7 +43,7 @@ postsubmits:
       preset-dind-enabled: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         args:
         - "--repo=k8s.io/test-infra=master"
         - "--root=/go/src/"
@@ -69,7 +69,7 @@ periodics:
     preset-service-account: "true"
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
       args:
       - --repo=github.com/GoogleCloudPlatform/k8s-multicluster-ingress=master
       - --root=/go/src

config/jobs/README.md

@@ -136,7 +136,7 @@ periodics:
     path_alias: "sigs.k8s.io/cluster-api-provider-aws"
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
       command:
       - "./scripts/ci-aws-cred-test.sh"
 ```

config/jobs/cadvisor/cadvisor.yaml

@@ -25,7 +25,7 @@ presubmits:
       preset-k8s-ssh: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         args:
         - "--job=$(JOB_NAME)"
         - "--repo=k8s.io/kubernetes"
@@ -56,7 +56,7 @@ periodics:
     preset-k8s-ssh: "true"
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
       args:
       - --job=$(JOB_NAME)
       - --root=/go/src

config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml

@@ -15,7 +15,7 @@ presubmits:
       preset-dind-enabled: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         command:
         - runner.sh
         args:
@@ -52,10 +52,12 @@ presubmits:
     spec:
       containers:
       - name: pull-containerd-node-e2e
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         env:
         - name: USE_TEST_INFRA_LOG_DUMPING
           value: "true"
+        # Feature:DynamicKubeletConfig is deprecated and soon will be removed so tests are skipped.
+        # If we want to run these tests, we need a separate job for it.
         command:
         - sh
         - -c
@@ -72,6 +74,6 @@ presubmits:
           '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
           --node-tests=true
           --provider=gce
-          '--test_args=--nodes=8 --focus="\[NodeConformance\]|\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]"'
+          '--test_args=--nodes=8 --focus="\[NodeConformance\]|\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]|\[NodeFeature:DynamicKubeletConfig\]"'
           --timeout=65m
           "--node-args=--image-config-file=${GOPATH}/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-master-presubmit/image-config-presubmit.yaml -node-env=PULL_REFS=$(PULL_REFS)"

config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml

@@ -9,7 +9,7 @@ presubmits:
       preset-service-account: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         env:
         - name: GO111MODULE
           value: "off"
@@ -44,7 +44,7 @@ presubmits:
     spec:
       containers:
       - name: pull-cri-containerd-node-e2e
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         command:
         - sh
         - -c
@@ -74,7 +74,7 @@ presubmits:
       preset-service-account: "true"
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         args:
         - "--repo=github.com/containerd/$(REPO_NAME)=$(PULL_REFS)"
         - "--root=/go/src"
@@ -102,7 +102,7 @@ presubmits:
     spec:
       containers:
       - name: pull-cri-containerd-windows-cri
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211104-c3a88263fc-master
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211111-d096cb0c5f-master
         command:
         - runner.sh
         args:

config/jobs/image-pushing/k8s-staging-etcdadm.yaml

@@ -8,9 +8,11 @@ postsubmits:
       branches:
         - ^master$
         - ^release-.*
-        # Build tags also
+        # Build (root) tags also
         # this is a regex for semver, from https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
         - ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+        # Build etcd-manager tags
+        - ^etcd-manager/.*$
       spec:
         serviceAccountName: gcb-builder
         containers:

config/jobs/image-pushing/k8s-staging-test-infra.yaml

@@ -3,12 +3,12 @@ postsubmits:
     #
     # job images, e.g. images/*
     #
-    - name: post-test-infra-push-bazelbuild-canary
+    - name: post-test-infra-push-bazelbuild
       cluster: k8s-infra-prow-build-trusted
       run_if_changed: '^images/bazelbuild/'
       annotations:
-        testgrid-dashboards: sig-testing-canaries, sig-k8s-infra-canaries, sig-k8s-infra-gcb
-        testgrid-tab-name: bazelbuild-canary
+        testgrid-dashboards: sig-testing-images, sig-k8s-infra-gcb
+        testgrid-tab-name: bazelbuild
         testgrid-alert-email: [email protected], [email protected]
         testgrid-num-failures-to-alert: '1'
         description: builds and pushes the image builder's own image
@@ -27,12 +27,12 @@ postsubmits:
           - --project=k8s-staging-test-infra
           - --build-dir=.
           - images/bazelbuild/
-    - name: post-test-infra-push-benchmarkjunit-canary
+    - name: post-test-infra-push-benchmarkjunit
       cluster: k8s-infra-prow-build-trusted
       run_if_changed: '^pkg/benchmarkjunit/'
       annotations:
-        testgrid-dashboards: sig-testing-canaries, sig-k8s-infra-canaries, sig-k8s-infra-gcb
-        testgrid-tab-name: benchmarkjunit-canary
+        testgrid-dashboards: sig-testing-images, sig-k8s-infra-gcb
+        testgrid-tab-name: benchmarkjunit
         testgrid-alert-email: [email protected], [email protected]
         testgrid-num-failures-to-alert: '1'
         description: builds and pushes the image builder's own image
@@ -273,3 +273,26 @@ postsubmits:
           - --project=k8s-staging-test-infra
           - --env-passthrough=PULL_BASE_REF
           - triage/
+    - name: post-test-infra-push-pytest
+      cluster: k8s-infra-prow-build-trusted
+      run_if_changed: '^(images/pytest|experiment|hack|kettle|metrics|releng)/'
+      annotations:
+        testgrid-dashboards: sig-testing-images, sig-k8s-infra-gcb
+        testgrid-tab-name: "pytest"
+        testgrid-num-failures-to-alert: '1'
+        description: builds and pushes the python testing image
+      decorate: true
+      branches:
+      - ^master$
+      max_concurrency: 1
+      spec:
+        serviceAccountName: gcb-builder
+        containers:
+        - image: gcr.io/k8s-staging-test-infra/image-builder:v20211014-7ca1952a94
+          command:
+          - /run.sh
+          args:
+          - --scratch-bucket=gs://k8s-staging-test-infra-gcb
+          - --project=k8s-staging-test-infra
+          - --build-dir=.
+          - images/pytest