Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .envrc.sample
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export SSH_KEY_NAME=my-caph-ssh-key
export HCLOUD_REGION=fsn1
export CONTROL_PLANE_MACHINE_COUNT=1
export WORKER_MACHINE_COUNT=1
export KUBERNETES_VERSION=v1.31.6
export KUBERNETES_VERSION=v1.33.6
export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx31
export HCLOUD_WORKER_MACHINE_TYPE=cpx31
export SSH_KEY=$HOME/.ssh/my-caph-ssh-key.pub
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/e2e/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ runs:

- name: Prepull the pre-built image
shell: bash
run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${TAG}
run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${CAPH_CONTAINER_TAG}
env:
TAG: ${{ steps.meta.outputs.version }}
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}

- name: Get HCLOUD_TOKEN # sets env.HCLOUD_TOKEN
uses: hetznercloud/tps-action@dee5dd2546322c28ed8f74b910189066e8b6f31a # main
Expand All @@ -71,14 +71,14 @@ runs:
CI: "true"
REGISTRY: ${{ env.REGISTRY }}
IMAGE_NAME: ${{ env.IMAGE_NAME }}
TAG: ${{ steps.meta.outputs.version }}
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}
HCLOUD_TOKEN: ${{ env.HCLOUD_TOKEN }}
HETZNER_ROBOT_USER: ${{ inputs.e2e_robot_user }}
HETZNER_ROBOT_PASSWORD: ${{ inputs.e2e_robot_password }}
HETZNER_SSH_PUB: ${{ inputs.e2e_ssh_pub }}
HETZNER_SSH_PRIV: ${{ inputs.e2e_ssh_priv }}
SKIP_IMAGE_BUILD: "1"
CAPH_LATEST_VERSION: "v1.0.1"
CAPH_LATEST_VERSION: "v1.0.7"
run: make ${{ inputs.e2e_make_target }}

- name: Upload artifact
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-release/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
- name: Test Release
shell: bash
env:
TAG: ${{ steps.meta.outputs.version }}
CAPH_CONTAINER_TAG: ${{ steps.meta.outputs.version }}
run: make test-release

- name: Upload artifact
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-promote-builder-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
env:
PASSWORD: ${{ secrets.GITHUB_TOKEN }}
USERNAME: ${{ github.actor }}
run: make builder-image-promote-latest
run: make builder-image-promote-latest
2 changes: 1 addition & 1 deletion .github/workflows/schedule-scan-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
env:
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
TRIVY_USERNAME: ${{ github.actor }}
run: make verify-container-images
run: make verify-container-images
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resp.json
# release artifacts
out
_releasenotes
templates/cluster-templates/cluster-template*
/generated/v1*

# Helm
.helm
Expand Down
138 changes: 57 additions & 81 deletions Makefile

Large diffs are not rendered by default.

Loading
Loading