[pull] master from kubernetes:master

.devcontainer/devcontainer.json

@@ -0,0 +1,39 @@
+// For format details, see https://containers.dev
+{
+  "name": "Kops environment from dev container",
+  // Image to pull when not building from scratch. See .devcontainer/build/devcontainer.json
+  // and .github/devcontainer-build-and-push.yml for the instructions on how this image is built
+  "image": "debian:bookworm",
+  // "image": "registry.k8s.io/build-image/kube-cross:v1.30.0-go1.22.0-bullseye.0",
+  // Setup the go environment and mount into the dev container at the expected location
+  "workspaceFolder": "/go/src/k8s.io/kops",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/go/src/k8s.io/kops,type=bind,consistency=cached",
+  // Ensure that the host machine has enough resources to build and test Kops
+  "hostRequirements": {
+    "cpus": 4
+  },
+  // Copy over welcome message and install pyyaml
+  "onCreateCommand": "bash .devcontainer/setup.sh",
+  // for Kubernetes testing, suppress extraneous forwarding messages
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "remoteUser": "root",
+  // Configure tool-specific properties.
+  // "customizations": {
+  // },
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "installDirectlyFromGitHubRelease": true,
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/go:1": {
+      "version": "latest"
+    }
+  }
+}

.devcontainer/setup.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Copyright 2023 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux
+
+# Copies over welcome message
+mkdir -p /usr/local/etc/vscode-dev-containers/
+cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
+
+git remote add upstream https://github.com/kubernetes/kops.git
+# Never push to upstream master
+git remote set-url --push upstream no_push

.devcontainer/welcome-message.txt

@@ -0,0 +1,20 @@
+👋 Welcome to Kops contribution in a dev container!
+     Works in GitHub Codespaces, VS Code, or in docker using the devcontainer cli
+
+See https://kops.sigs.k8s.io/contributing/ for guidance on contributing to Kops
+
+This debian dev container image satisfies https://github.com/kubernetes/community/blob/master/contributors/devel/development.md and includes:
+ - kubernetes/kubernetes repository
+ - Docker
+ - go
+ - kubectl, etcd, kubetest2, and kind
+For details about dev containers and the debian dev container base image see https://containers.dev and https://github.com/devcontainers/images/tree/main/src/base-debian.
+The configuration for the dev container is in the .github/.devcontainer folder. (will be moved to prow)
+🎵 By default in Codespaces this environment uses a 4-core machine. Some tests may require a larger machine. In Codespaces you can change the machine type.
+   See https://docs.github.com/en/codespaces/customizing-your-codespace/changing-the-machine-type-for-your-codespace
+
+⚙️ If you are working in Codespaces on your own fork, this environment is automatically configured to support the GitHub
+   workflow https://www.kubernetes.dev/docs/guide/github-workflow/ (omit the clone step)
+↪️ Otherwise Codespaces will automatically fork the repository for you when you make your first push
+
+🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).

.gitattributes

@@ -1,5 +1,6 @@
 **/zz_generated.*.go linguist-generated=true
-BUILD.bazel linguist-generated=true
+
+/clusterapi/config/crds/** linguist-generated=true
 /docs/cli/** linguist-generated=true
 /protokube/pkg/gossip/mesh/mesh.pb.go linguist-generated=true
 /protokube/pkg/gossip/mesh/mesh.proto linguist-generated=true

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+    day: "sunday"
+  labels:
+  - "ok-to-test"

.github/workflows/depsreview.yaml

@@ -0,0 +1,19 @@
+name: 'Review Dependencies'
+
+on:
+  pull_request:
+    paths:
+      - 'go.mod'
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    if: ${{ github.repository == 'kubernetes/kops' }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - name: 'Review Dependencies'
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261

.github/workflows/e2e.yml

@@ -0,0 +1,91 @@
+---
+name: e2e
+
+'on':
+  - push
+  - pull_request
+
+env:
+  GOPROXY: https://proxy.golang.org
+  GOPATH: ${{ github.workspace }}/go
+
+permissions:
+  contents: read
+
+jobs:
+  tests-e2e-scenarios-bare-metal:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 70
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
+          fetch-depth: 3
+
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
+        with:
+          go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod'
+
+      - name: dev/tasks/free-disk-space-on-github-actions-runner
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          dev/tasks/free-disk-space-on-github-actions-runner
+
+      - name: tests/e2e/scenarios/bare-metal/run-test
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          CHANGED_VERSION=$(git diff --name-only HEAD~2 | grep -E '^kops-version\.go$' || true)
+          if [ -z "${CHANGED_VERSION}" ]
+          then
+            timeout 60m tests/e2e/scenarios/bare-metal/run-test
+          else
+            echo "kops-version.go has been modified, skipping test"
+          fi
+        env:
+          ARTIFACTS: /tmp/artifacts
+
+      - name: Archive production artifacts
+        if: always()
+        uses: actions/upload-artifact@v6
+        with:
+          name: tests-e2e-scenarios-bare-metal
+          path: /tmp/artifacts/
+
+  tests-e2e-scenarios-bare-metal-ipv6:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 70
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
+          fetch-depth: 3
+
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
+        with:
+          go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod'
+
+      - name: dev/tasks/free-disk-space-on-github-actions-runner
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          dev/tasks/free-disk-space-on-github-actions-runner
+
+      - name: tests/e2e/scenarios/bare-metal/run-test
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          CHANGED_VERSION=$(git diff --name-only HEAD~2 | grep -E '^kops-version\.go$' || true)
+          if [ -z "${CHANGED_VERSION}" ]
+          then
+            timeout 60m tests/e2e/scenarios/bare-metal/scenario-ipv6
+          else
+            echo "kops-version.go has been modified, skipping test"
+          fi
+        env:
+          ARTIFACTS: /tmp/artifacts
+      - name: Archive production artifacts
+        if: always()
+        uses: actions/upload-artifact@v6
+        with:
+          name: tests-e2e-scenarios-bare-metal-ipv6
+          path: /tmp/artifacts/

.github/workflows/main.yml

@@ -1,77 +1,100 @@
 ---
 name: CI
 
-'on':
+"on":
   - push
   - pull_request
 
 env:
   GOPROXY: https://proxy.golang.org
   GOPATH: ${{ github.workspace }}/go
 
+permissions:
+  contents: read
+
 jobs:
-  build-linux-amd64:
-    runs-on: ubuntu-20.04
+  build-linux:
+    strategy:
+      matrix:
+        os:
+          - name: Linux-amd64
+            runs-on: ubuntu-24.04
+            arch: amd64
+          - name: Linux-arm64
+            runs-on: ubuntu-24.04-arm
+            arch: arm64
+    name: build-linux-${{ matrix.os.arch }}
+    runs-on: ${{ matrix.os.runs-on }}
     steps:
-      - name: Set up go
-        uses: actions/setup-go@v2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
-          go-version: 1.17.2
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
 
-      - uses: actions/checkout@v2
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
         with:
-          path: ${{ env.GOPATH }}/src/k8s.io/kops
+          go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
 
       - name: make all examples test
         working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
         run: |
           make all examples test
 
   build-macos-amd64:
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
-    - name: Set up go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
 
-    - uses: actions/checkout@v2
-      with:
-        path: ${{ env.GOPATH }}/src/k8s.io/kops
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
+        with:
+          go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
 
-    - name: make kops examples test
-      working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
-      run: |
-        make kops examples test
+      - name: make kops examples test
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          make kops examples test
 
   build-windows-amd64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
-    - name: Set up go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        with:
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
 
-    - uses: actions/checkout@v2
-      with:
-        path: ${{ env.GOPATH }}/src/k8s.io/kops
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
+        with:
+          go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
 
-    - name: make kops examples test
-      working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
-      run: |
-        make kops examples test-windows
+      - name: make kops examples test
+        working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
+        run: |
+          make kops examples test-windows
 
   verify:
-    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        os:
+          - name: Linux-amd64
+            runs-on: ubuntu-24.04
+            arch: amd64
+          - name: Linux-arm64
+            runs-on: ubuntu-24.04-arm
+            arch: arm64
+    name: verify-${{ matrix.os.arch }}
+    runs-on: ${{ matrix.os.runs-on }}
     steps:
-      - name: Set up go
-        uses: actions/setup-go@v2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
         with:
-          go-version: 1.17.2
+          path: ${{ env.GOPATH }}/src/k8s.io/kops
 
-      - uses: actions/checkout@v2
+      - name: Set up go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5
         with:
-          path: ${{ env.GOPATH }}/src/k8s.io/kops
+          go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
 
       - name: make quick-ci
         working-directory: ${{ env.GOPATH }}/src/k8s.io/kops

.github/workflows/tag-release.yml

@@ -0,0 +1,23 @@
+name: 'Tag Release'
+
+on:
+  push:
+    branches:
+      - master
+      - 'release-*'
+    paths:
+      - kops-version.go
+
+jobs:
+  tag-release:
+    if: ${{ github.repository == 'kubernetes/kops' }}
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+      - run: /usr/bin/git config --global user.email actions@github.com
+      - run: /usr/bin/git config --global user.name 'GitHub Actions Release Tagger'
+      - run: hack/tag-release.sh