Skip to content

Commit abd60fc

Browse files
authored
🌱 Tooling Update. No changes to Go Code (pre capi v1.11 (beta2)) (#1771)
1 parent 25ebf3c commit abd60fc

92 files changed

Lines changed: 1221 additions & 535 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.envrc.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export SSH_KEY_NAME=my-caph-ssh-key
55
export HCLOUD_REGION=fsn1
66
export CONTROL_PLANE_MACHINE_COUNT=1
77
export WORKER_MACHINE_COUNT=1
8-
export KUBERNETES_VERSION=v1.31.6
8+
export KUBERNETES_VERSION=v1.33.6
99
export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx31
1010
export HCLOUD_WORKER_MACHINE_TYPE=cpx31
1111
export SSH_KEY=$HOME/.ssh/my-caph-ssh-key.pub

.github/actions/e2e/action.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ runs:
5858

5959
- name: Prepull the pre-built image
6060
shell: bash
61-
run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${TAG}
61+
run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${CAPH_CONTAINER_TAG}
6262
env:
63-
TAG: ${{ steps.meta.outputs.version }}
63+
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}
6464

6565
- name: Get HCLOUD_TOKEN # sets env.HCLOUD_TOKEN
6666
uses: hetznercloud/tps-action@dee5dd2546322c28ed8f74b910189066e8b6f31a # main
@@ -71,14 +71,14 @@ runs:
7171
CI: "true"
7272
REGISTRY: ${{ env.REGISTRY }}
7373
IMAGE_NAME: ${{ env.IMAGE_NAME }}
74-
TAG: ${{ steps.meta.outputs.version }}
74+
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}
7575
HCLOUD_TOKEN: ${{ env.HCLOUD_TOKEN }}
7676
HETZNER_ROBOT_USER: ${{ inputs.e2e_robot_user }}
7777
HETZNER_ROBOT_PASSWORD: ${{ inputs.e2e_robot_password }}
7878
HETZNER_SSH_PUB: ${{ inputs.e2e_ssh_pub }}
7979
HETZNER_SSH_PRIV: ${{ inputs.e2e_ssh_priv }}
8080
SKIP_IMAGE_BUILD: "1"
81-
CAPH_LATEST_VERSION: "v1.0.1"
81+
CAPH_LATEST_VERSION: "v1.0.7"
8282
run: make ${{ inputs.e2e_make_target }}
8383

8484
- name: Upload artifact

.github/actions/test-release/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
- name: Test Release
2626
shell: bash
2727
env:
28-
TAG: ${{ steps.meta.outputs.version }}
28+
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}
2929
run: make test-release
3030

3131
- name: Upload artifact

.github/workflows/main-promote-builder-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
env:
2626
PASSWORD: ${{ secrets.GITHUB_TOKEN }}
2727
USERNAME: ${{ github.actor }}
28-
run: make builder-image-promote-latest
28+
run: make builder-image-promote-latest

.github/workflows/schedule-scan-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
env:
2626
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
2727
TRIVY_USERNAME: ${{ github.actor }}
28-
run: make verify-container-images
28+
run: make verify-container-images

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ resp.json
6262
# release artifacts
6363
out
6464
_releasenotes
65-
templates/cluster-templates/cluster-template*
65+
/generated/v1*
6666

6767
# Helm
6868
.helm

Makefile

Lines changed: 57 additions & 81 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)