Merge branch 'tg/support-provider-id-format-of-upstream-ccm' into tg/align-v1.1.x-to-current-main-then-reset-main

Author: guettli

.envrc.sample

@@ -6,6 +6,7 @@ export SSH_KEY_NAME=my-caph-ssh-key
 export HCLOUD_REGION=hel1
 export CONTROL_PLANE_MACHINE_COUNT=1
 export WORKER_MACHINE_COUNT=1
+export KUBERNETES_VERSION=v1.33.6
 export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx32
 export HCLOUD_WORKER_MACHINE_TYPE=cpx32
 export SSH_KEY=$HOME/.ssh/my-caph-ssh-key.pub
@@ -14,8 +15,8 @@ export HETZNER_SSH_PRIV_PATH=$HOME/.ssh/my-caph-ssh-key
 export HETZNER_ROBOT_USER=
 export HETZNER_ROBOT_PASSWORD=
 
-HETZNER_SSH_PUB=$(cat "$HETZNER_SSH_PUB_PATH")
-HETZNER_SSH_PRIV=$(cat "$HETZNER_SSH_PRIV_PATH")
+HETZNER_SSH_PUB=$(base64 -w0 "$HETZNER_SSH_PUB_PATH")
+HETZNER_SSH_PRIV=$(base64 -w0 "$HETZNER_SSH_PRIV_PATH")
 export HETZNER_SSH_PUB HETZNER_SSH_PRIV
 
 export PATH="$PWD/hack/tools/bin:$PATH"

.github/workflows/pr-e2e.yaml

@@ -44,8 +44,6 @@ jobs:
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
-    env:
-      BUILD_IN_CONTAINER: "false"
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

.github/workflows/pr-lint.yml

@@ -40,13 +40,14 @@ jobs:
       - name: Verify Golang Modules
         run: make generate-modules-ci
 
-      - name: Restore lychee cache (Link Checker)
-        id: restore-cache
-        uses: actions/cache/restore@v4
+      - name: Cache lychee responses (Link Checker)
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: .lycheecache
-          key: cache-lychee-${{ github.sha }}
-          restore-keys: cache-lychee-
+          key: cache-lychee-${{ runner.os }}-${{ hashFiles('.lychee.toml') }}
+          restore-keys: |
+            cache-lychee-${{ runner.os }}-
+            cache-lychee-
 
       # to ensure we don't miss any files that were supposed to be autogenerated.
       # if there's a diff then the workflow will exit here.

.github/workflows/pr-verify.yml

@@ -61,6 +61,13 @@ jobs:
         run: make verify-starlark
 
       - name: Verify Generated Files of Git Repo
+        env:
+          # Use dummy data.
+          HETZNER_ROBOT_USER: ${{ secrets.HETZNER_ROBOT_USER || 'robot' }}
+          HETZNER_ROBOT_PASSWORD: ${{ secrets.HETZNER_ROBOT_PASSWORD || 'password' }}
+          HETZNER_SSH_PUB: ${{ secrets.HETZNER_SSH_PUB || 'c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUZha2VQdWJsaWNLZXlGb3JDSU9ubHkgdXNlckBjaQ==' }}
+          HETZNER_SSH_PRIV: ${{ secrets.HETZNER_SSH_PRIV || 'LS0tLS1CRUdJTiBPUEVOU1NIIFBSSVZBVEUgS0VZLS0tLS0KZmFrZQotLS0tLUVORCBPUEVOU1NIIFBSSVZBVEUgS0VZLS0tLS0K' }}
+          SSH_KEY_NAME: ${{ secrets.SSH_KEY_NAME || 'ci-key' }}
         run: make verify-generated-files
 
       - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4

.gitignore

@@ -54,7 +54,7 @@ bm-*.yaml
 config/samples
 
 # test results
-_artifacts
+_artifacts*
 test/e2e/config/hetzner.tmp.yaml
 resp.json
 **manifest.json
@@ -88,3 +88,5 @@ watchall-output*
 /.kube
 
 /generated
+
+.vscode