diff --git a/.github/workflows/chart-lint.yml b/.github/workflows/chart-lint.yml index e9e07defc..0ad8eecb6 100644 --- a/.github/workflows/chart-lint.yml +++ b/.github/workflows/chart-lint.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: '0' @@ -20,11 +20,11 @@ jobs: run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV working-directory: ./charts - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -36,7 +36,7 @@ jobs: template: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Render Helm charts run: find charts -type f -name Chart.yaml -exec .github/render-charts.sh {} \; diff --git a/.github/workflows/chart-release.yml b/.github/workflows/chart-release.yml index 5d2bb3197..9c174851f 100644 --- a/.github/workflows/chart-release.yml +++ b/.github/workflows/chart-release.yml @@ -21,18 +21,18 @@ jobs: smoke_test: "${binary} version" - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml index 655c8c0c7..eef5cc10f 100644 --- a/.github/workflows/chart-test.yml +++ b/.github/workflows/chart-test.yml @@ -10,7 +10,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: '0' @@ -18,11 +18,11 @@ jobs: run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV working-directory: ./charts - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml index a17b2dda9..0b57b4d3d 100644 --- a/.github/workflows/docs-lint.yml +++ b/.github/workflows/docs-lint.yml @@ -15,16 +15,16 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 91ffa7d2b..a8a2f7b99 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: ${{ contains(github.ref, 'tags') }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Configure Git diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1620278c2..84b8424cc 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -11,16 +11,16 @@ jobs: e2e-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cf11b5da0..7af5fe4d0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,16 +15,16 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b26eb5ea9..bde656059 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -9,12 +9,12 @@ jobs: dist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} @@ -23,7 +23,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -34,14 +34,14 @@ jobs: run: make docker-build -e IMG_TAG=${GITHUB_REF#refs/heads/} - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: quay.io username: ${{ secrets.QUAY_IO_USERNAME }} password: ${{ secrets.QUAY_IO_PASSWORD }} - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f15f11832..f0d1569c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,14 +9,14 @@ jobs: dist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} @@ -25,7 +25,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -33,14 +33,14 @@ jobs: ${{ runner.os }}-go- - name: Login to quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: quay.io username: ${{ secrets.QUAY_IO_USERNAME }} password: ${{ secrets.QUAY_IO_PASSWORD }} - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index f4cd112ce..2a6e2b38b 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -32,12 +32,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@v2.3.1 + uses: ossf/scorecard-action@v2.4.0 with: results_file: results.sarif results_format: sarif @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: SARIF file path: results.sarif @@ -67,6 +67,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4 + uses: github/codeql-action/upload-sarif@3e0e84636c6f5df46a2cb232ae1dd1384713150d # v2.25.15 with: sarif_file: results.sarif diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 47126912f..d5268ac65 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,16 +18,16 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Determine Go version from go.mod run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} diff --git a/Dockerfile b/Dockerfile index 70889971a..dc623928e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/alpine:3.19 as restic +FROM docker.io/library/alpine:3.20 as restic RUN apk add --update --no-cache \ bash \ @@ -9,7 +9,7 @@ COPY go.mod fetch_restic.sh ./ RUN ./fetch_restic.sh /usr/local/bin/restic \ && /usr/local/bin/restic version -FROM docker.io/library/alpine:3.19 as k8up +FROM docker.io/library/alpine:3.20 as k8up ENTRYPOINT ["k8up"] diff --git a/charts/k8up/Chart.yaml b/charts/k8up/Chart.yaml index abbd68303..e3477eff1 100644 --- a/charts/k8up/Chart.yaml +++ b/charts/k8up/Chart.yaml @@ -6,7 +6,7 @@ keywords: - backup - operator - restic -version: 4.8.0 +version: 4.8.1 sources: - https://github.com/k8up-io/k8up maintainers: diff --git a/charts/k8up/README.gotmpl.md b/charts/k8up/README.gotmpl.md index c83958512..bc05a8f2b 100644 --- a/charts/k8up/README.gotmpl.md +++ b/charts/k8up/README.gotmpl.md @@ -1,5 +1,5 @@ ```bash -kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-{{ template "chart.version" . }}/k8up-crd.yaml +kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-{{ template "chart.version" . }}/k8up-crd.yaml --server-side ```