Merge pull request #2305 from fluxcd/kubectl-1.23.1

Update kubectl to 1.23.1 in flux-cli container image
2026-03-02 11:36:56 +00:00 · 2022-01-18 19:01:09 +02:00 · 2022-01-18 18:34:16 +02:00 · 2022-01-18 18:33:23 +02:00 · 2022-01-18 18:13:59 +02:00 · 2022-01-18 14:56:47 +02:00
8 changed files with 106 additions and 38 deletions
--- a/.github/aur/flux-go/PKGBUILD.template
+++ b/.github/aur/flux-go/PKGBUILD.template
@@ -30,12 +30,20 @@ build() {
  export CGO_CXXFLAGS="$CXXFLAGS"
  export CGO_CPPFLAGS="$CPPFLAGS"
  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  ./manifests/scripts/bundle.sh "${PWD}/manifests" "${PWD}/cmd/flux/manifests"
+  make cmd/flux/.manifests.done
  go build -ldflags "-linkmode=external -X main.VERSION=${pkgver}" -o ${_srcname} ./cmd/flux
 }

 check() {
  cd "flux2-${pkgver}"
+  case $CARCH in
+    aarch64)
+      export ENVTEST_ARCH=arm64
+      ;;
+    armv6h|armv7h)
+      export ENVTEST_ARCH=arm
+      ;;
+  esac
  make test
 }

--- a/.github/aur/flux-scm/PKGBUILD.template
+++ b/.github/aur/flux-scm/PKGBUILD.template
@@ -38,6 +38,14 @@ build() {

 check() {
  cd "flux2"
+  case $CARCH in
+    aarch64)
+      export ENVTEST_ARCH=arm64
+      ;;
+    armv6h|armv7h)
+      export ENVTEST_ARCH=arm
+      ;;
+  esac
  make test
 }

--- a/.github/workflows/bootstrap.yaml
+++ b/.github/workflows/bootstrap.yaml
@@ -103,13 +103,26 @@ jobs:
          /tmp/flux reconcile image repository podinfo
          /tmp/flux reconcile image update flux-system
          /tmp/flux get images all
-          /tmp/flux get images policy podinfo | grep "5.2.1"
-          /tmp/flux get image update flux-system | grep commit
+          
+          retries=10
+          count=0
+          ok=false
+          until ${ok}; do
+              /tmp/flux get image update flux-system | grep 'commit' && ok=true || ok=false
+              count=$(($count + 1))
+              if [[ ${count} -eq ${retries} ]]; then
+                  echo "No more retries left"
+                  exit 1
+              fi
+              sleep 6
+              /tmp/flux reconcile image update flux-system
+          done
        env:
          GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
          GITHUB_REPO_NAME: ${{ steps.vars.outputs.test_repo_name }}
          GITHUB_ORG_NAME: fluxcd-testing
      - name: delete repository
+        if: ${{ always() }}
        run: |
          curl \
            -X DELETE \
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -4,6 +4,11 @@ on:
  push:
    tags: [ 'v*' ]

+permissions:
+  contents: write # needed to write releases
+  id-token: write # needed for keyless signing
+  packages: write # needed for ghcr access
+
 jobs:
  goreleaser:
    runs-on: ubuntu-latest
@@ -18,13 +23,15 @@ jobs:
          go-version: 1.17.x
      - name: Setup QEMU
        uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
      - name: Setup Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@v1
-        with:
-          buildkitd-flags: "--debug"
+      - name: Setup Syft
+        uses: anchore/sbom-action/download-syft@v0
+      - name: Setup Cosign
+        uses: sigstore/cosign-installer@main
+      - name: Setup Kustomize
+        uses: fluxcd/pkg//actions/kustomize@main
      - name: Login to GitHub Container Registry
        uses: docker/login-action@v1
        with:
@@ -36,18 +43,6 @@ jobs:
        with:
          username: fluxcdbot
          password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
-      - name: Download release notes utility
-        env:
-          GH_REL_URL: https://github.com/buchanae/github-release-notes/releases/download/0.2.0/github-release-notes-linux-amd64-0.2.0.tar.gz
-        run: cd /tmp && curl -sSL ${GH_REL_URL} | tar xz && sudo mv github-release-notes /usr/local/bin/
-      - name: Generate release notes
-        run: |
-          echo 'CHANGELOG' > /tmp/release.txt
-          github-release-notes -org fluxcd -repo toolkit -since-latest-release -include-author >> /tmp/release.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup Kustomize
-        uses: fluxcd/pkg//actions/kustomize@main
      - name: Generate manifests
        run: |
          make cmd/flux/.manifests.done
@@ -66,11 +61,22 @@ jobs:
      - name: Archive the OpenAPI JSON schemas
        run: |
          tar -czvf ./output/crd-schemas.tar.gz -C schemas .
+      - name: Download release notes utility
+        env:
+          GH_REL_URL: https://github.com/buchanae/github-release-notes/releases/download/0.2.0/github-release-notes-linux-amd64-0.2.0.tar.gz
+        run: cd /tmp && curl -sSL ${GH_REL_URL} | tar xz && sudo mv github-release-notes /usr/local/bin/
+      - name: Generate release notes
+        run: |
+          NOTES="./output/notes.md"
+          echo '## CLI Changelog' > ${NOTES}
+          github-release-notes -org fluxcd -repo flux2 -since-latest-release -include-author >> ${NOTES}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Run GoReleaser
        uses: goreleaser/goreleaser-action@v1
        with:
          version: latest
-          args: release --release-notes=/tmp/release.txt --skip-validate
+          args: release --release-notes=output/notes.md --skip-validate
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -40,6 +40,36 @@ archives:
    format: zip
    files:
      - none*
+source:
+  enabled: true
+  name_template: '{{ .ProjectName }}_{{ .Version }}_source_code'
+sboms:
+  - id: source
+    artifacts: source
+    documents:
+      - "{{ .ProjectName }}_{{ .Version }}_sbom.spdx.json"
+release:
+  extra_files:
+    - glob: output/crd-schemas.tar.gz
+    - glob: output/manifests.tar.gz
+    - glob: output/install.yaml
+checksum:
+  extra_files:
+    - glob: output/crd-schemas.tar.gz
+    - glob: output/manifests.tar.gz
+    - glob: output/install.yaml
+signs:
+  - cmd: cosign
+    env:
+      - COSIGN_EXPERIMENTAL=1
+    certificate: '${artifact}.pem'
+    args:
+      - sign-blob
+      - '--output-certificate=${certificate}'
+      - '--output-signature=${signature}'
+      - '${artifact}'
+    artifacts: checksum
+    output: true
 brews:
  - name: flux
    tap:
@@ -78,17 +108,12 @@ publishers:
      - AUR_BOT_SSH_PRIVATE_KEY={{ .Env.AUR_BOT_SSH_PRIVATE_KEY }}
    cmd: |
      .github/aur/flux-go/publish.sh {{ .Version }}
-release:
-  extra_files:
-    - glob: ./output/crd-schemas.tar.gz
-    - glob: ./output/manifests.tar.gz
-    - glob: ./output/install.yaml
 dockers:
 - image_templates:
    - 'fluxcd/flux-cli:{{ .Tag }}-amd64'
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-amd64'
  dockerfile: Dockerfile
-  use_buildx: true
+  use: buildx
  goos: linux
  goarch: amd64
  build_flag_templates:
@@ -104,7 +129,7 @@ dockers:
    - 'fluxcd/flux-cli:{{ .Tag }}-arm64'
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-arm64'
  dockerfile: Dockerfile
-  use_buildx: true
+  use: buildx
  goos: linux
  goarch: arm64
  build_flag_templates:
@@ -120,7 +145,7 @@ dockers:
    - 'fluxcd/flux-cli:{{ .Tag }}-arm'
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-arm'
  dockerfile: Dockerfile
-  use_buildx: true
+  use: buildx
  goos: linux
  goarch: arm
  goarm: 7
@@ -144,3 +169,12 @@ docker_manifests:
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-amd64'
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-arm64'
    - 'ghcr.io/fluxcd/flux-cli:{{ .Tag }}-arm'
+docker_signs:
+  - cmd: cosign
+    env:
+      - COSIGN_EXPERIMENTAL=1
+    args:
+      - sign
+      - '${artifact}'
+    artifacts: all
+    output: true
--- a/2
+++ b/2
@@ -3,7 +3,7 @@ FROM alpine:3.15 as builder
 RUN apk add --no-cache ca-certificates curl

 ARG ARCH=linux/amd64
-ARG KUBECTL_VER=1.22.2
+ARG KUBECTL_VER=1.23.1

 RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/${ARCH}/kubectl \
    -o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl && \
--- a/tests/azure/go.mod
+++ b/tests/azure/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/fluxcd/helm-controller/api v0.15.0
 	github.com/fluxcd/image-automation-controller/api v0.19.0
 	github.com/fluxcd/image-reflector-controller/api v0.15.0
-	github.com/fluxcd/kustomize-controller/api v0.19.0
-	github.com/fluxcd/notification-controller/api v0.20.0
-	github.com/fluxcd/pkg/apis/meta v0.11.0-rc.3
+	github.com/fluxcd/kustomize-controller/api v0.19.1
+	github.com/fluxcd/notification-controller/api v0.20.1
+	github.com/fluxcd/pkg/apis/meta v0.10.2
 	github.com/fluxcd/pkg/runtime v0.12.3
 	github.com/fluxcd/source-controller/api v0.20.1
 	github.com/hashicorp/terraform-exec v0.14.0
--- a/tests/azure/go.sum
+++ b/tests/azure/go.sum
@@ -204,17 +204,16 @@ github.com/fluxcd/image-automation-controller/api v0.19.0 h1:XR2yBR3RxB6i1mS6Zpq
 github.com/fluxcd/image-automation-controller/api v0.19.0/go.mod h1:e9hAvFZT5y1X6NaSNUHXkabpMkPA3Z1bDr3yea8gMzE=
 github.com/fluxcd/image-reflector-controller/api v0.15.0 h1:2XUKXLhWjbS7X8k1Ur/LJaIv2C8kbpErB46yw4Xmf4U=
 github.com/fluxcd/image-reflector-controller/api v0.15.0/go.mod h1:SPUqO4kodOglDFpZ+GhW/XBhKo71mWIqFRc+oT0jCfc=
-github.com/fluxcd/kustomize-controller/api v0.19.0 h1:ZmLGk9y0UmAg/g2eiSpi+aaIiXuH5i3nXYgiUp17wJQ=
-github.com/fluxcd/kustomize-controller/api v0.19.0/go.mod h1:q0AA6fxVlm8fvXZEaqSMMw8ANPharpywBve7dlcARhk=
-github.com/fluxcd/notification-controller/api v0.20.0 h1:7wDvGrQEzNnFAMj77FOrRGyPxuCqVYhSQXmmehGENrI=
-github.com/fluxcd/notification-controller/api v0.20.0/go.mod h1:aYpoha7GxqLP2jyzCB6FOPyDO7drDuo/4oCB2AzmrC0=
+github.com/fluxcd/kustomize-controller/api v0.19.1 h1:71E9/7WNQN7aNVhTvfweyOEPwOLVnohAhcR0qMnA67g=
+github.com/fluxcd/kustomize-controller/api v0.19.1/go.mod h1:q0AA6fxVlm8fvXZEaqSMMw8ANPharpywBve7dlcARhk=
+github.com/fluxcd/notification-controller/api v0.20.1 h1:iK1+icG0ESuSUki6O9tL/4uxPx6eymYwaFxGprlKSQA=
+github.com/fluxcd/notification-controller/api v0.20.1/go.mod h1:YFW/YQ6kScEzpnuKgvOJWak+9zGyF3FJ73kKsSQ4LDk=
 github.com/fluxcd/pkg/apis/acl v0.0.3 h1:Lw0ZHdpnO4G7Zy9KjrzwwBmDZQuy4qEjaU/RvA6k1lc=
 github.com/fluxcd/pkg/apis/acl v0.0.3/go.mod h1:XPts6lRJ9C9fIF9xVWofmQwftvhY25n1ps7W9xw0XLU=
 github.com/fluxcd/pkg/apis/kustomize v0.3.1 h1:wmb5D9e1+Rr3/5O3235ERuj+h2VKUArVfYYk68QKP+w=
 github.com/fluxcd/pkg/apis/kustomize v0.3.1/go.mod h1:k2HSRd68UwgNmOYBPOd6WbX6a2MH2X/Jeh7e3s3PFPc=
+github.com/fluxcd/pkg/apis/meta v0.10.2 h1:pnDBBEvfs4HaKiVAYgz+e/AQ8dLvcgmVfSeBroZ/KKI=
 github.com/fluxcd/pkg/apis/meta v0.10.2/go.mod h1:KQ2er9xa6koy7uoPMZjIjNudB5p4tXs+w0GO6fRcy7I=
-github.com/fluxcd/pkg/apis/meta v0.11.0-rc.3 h1:YY6RlaHIMXawgEOJhJbSrm4NpD9fJTCWFGKgtNfQ0/g=
-github.com/fluxcd/pkg/apis/meta v0.11.0-rc.3/go.mod h1:ki5wJE4nuFOZt78q0RSYkrKwINgIBPynuswZhnTOSoI=
 github.com/fluxcd/pkg/runtime v0.12.3 h1:h21AZ3YG5MAP7DxFF9hfKrP+vFzys2L7CkUbPFjbP/0=
 github.com/fluxcd/pkg/runtime v0.12.3/go.mod h1:imJ2xYy/d4PbSinX2IefmZk+iS2c1P5fY0js8mCE4SM=
 github.com/fluxcd/source-controller/api v0.20.1 h1:BfYw1gNHykiCVFNtDz3atcf3Vph+arfuveKmouI98wE=
Author	SHA1	Message	Date
Stefan Prodan	5d95a6e750	Merge pull request #2305 from fluxcd/kubectl-1.23.1 Update kubectl to 1.23.1 in flux-cli container image	2022-01-18 19:01:09 +02:00
Stefan Prodan	af00610a61	Update kubectl to 1.23.1 in flux-cli container image Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-18 18:34:16 +02:00
Stefan Prodan	809cb79828	Merge pull request #2304 from fluxcd/fix-release-notes-gen ci: Fix release notes generator	2022-01-18 18:33:23 +02:00
Stefan Prodan	e44a58cba0	ci: Fix release notes generator Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-18 18:13:59 +02:00
Stefan Prodan	10046187a6	Merge pull request #2301 from fluxcd/cosign Sign the release artifacts checksums and images	2022-01-18 14:56:47 +02:00
Stefan Prodan	a402461f9c	Sign the release artifacts checksums and images - add the Flux manifests and API schemas to checksums - sign the checksum.txt with Cosign and GitHub OIDC - sign the flux-cli container images with Cosign and GitHub OIDC Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-18 14:31:37 +02:00
Stefan Prodan	8a6771c9a9	Merge pull request #2300 from fluxcd/ci-fixes Fix Azure e2e tests and GoReleaser buildx directive	2022-01-17 11:03:05 +02:00
Stefan Prodan	7173bd5945	Fix GoReleaser buildx directive Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-17 10:37:31 +02:00
Stefan Prodan	8e09ade41c	Fix Azure e2e tests Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-17 10:36:03 +02:00
Stefan Prodan	6ceb8d8338	Merge pull request #2295 from fluxcd/sbom-spdx Publish Flux Software Bill of Materials (SBOM)	2022-01-17 10:33:02 +02:00
Stefan Prodan	11296cd94f	Publish Flux Software Bill of Materials (SBOM) in SPDX format - generate SBOM for Flux Go modules with Syft - publish the SBOM SPDX JSON files to GitHub releases with GoReleaser Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-14 16:36:49 +02:00
Aurel Canciu	677dca0bc4	Merge pull request #2296 from fluxcd/fix-pkgbuild-envtest Fix Archlinux PKGBUILD check() run on ARM	2022-01-14 13:55:26 +01:00
Aurel Canciu	8e7b957164	Fix Archlinux PKGBUILD check() run on ARM The check() run started to fail after #2288 since ENVTEST_ARCH was not set correctly on ARM/ARM64. This should fix the problem for the flux-go and flux-scm AUR packages. Signed-off-by: Aurel Canciu <aurelcanciu@gmail.com>	2022-01-14 13:20:19 +01:00
Stefan Prodan	8f93e2a9d4	Merge pull request #2294 from fluxcd/ci-del-repo Improve the bootstrap e2e test workflow	2022-01-14 11:48:22 +02:00
Stefan Prodan	62755b4b75	Wait 60s for image automation before failing the test Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-14 10:30:36 +02:00
Stefan Prodan	dcfb745b1f	Improve the bootstrap e2e cleanup Delete the repository regardless of the bootstrap test exit code. Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>	2022-01-13 20:44:02 +02:00