Skip to content

Commit 1e49ba6

Browse files
authored
Merge pull request #594 from fluxcd/docker-sbom
build: Enable SBOM and SLSA Provenance
2 parents 6f0b7cd + 8f1592a commit 1e49ba6

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

.github/workflows/e2e.yaml

+5-14
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v3
1919
- name: Setup QEMU
20-
uses: docker/setup-qemu-action@v1
20+
uses: docker/setup-qemu-action@v2
2121
with:
2222
platforms: all
2323
- name: Setup Docker Buildx
2424
id: buildx
25-
uses: docker/setup-buildx-action@v1
25+
uses: docker/setup-buildx-action@v2
2626
with:
2727
buildkitd-flags: "--debug"
2828
- name: Restore Go cache
@@ -45,22 +45,16 @@ jobs:
4545
with:
4646
go-version: 1.19.x
4747
- name: Setup Kubernetes
48-
uses: engineerd/setup-kind@v0.5.0
48+
uses: helm/kind-action@v1.5.0
4949
with:
50-
version: v0.11.1
51-
image: kindest/node:v1.23.13
50+
version: v0.17.0
51+
cluster_name: kind
5252
- name: Setup Helm
5353
uses: fluxcd/pkg/actions/helm@main
5454
- name: Setup Kustomize
5555
uses: fluxcd/pkg/actions/kustomize@main
56-
- name: Setup Kubebuilder
57-
uses: fluxcd/pkg/actions/kubebuilder@main
58-
- name: Setup Kubectl
59-
uses: fluxcd/pkg/actions/kubectl@main
6056
- name: Run tests
6157
run: make test
62-
env:
63-
KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
6458
- name: Check if working tree is dirty
6559
run: |
6660
if [[ $(git diff --stat) != '' ]]; then
@@ -594,9 +588,6 @@ jobs:
594588
- name: Debug failure
595589
if: failure()
596590
run: |
597-
which kubectl
598-
kubectl version
599-
helm version
600591
kubectl -n helm-system get helmrepositories -oyaml || true
601592
kubectl -n helm-system get helmcharts -oyaml || true
602593
kubectl -n helm-system get helmreleases -oyaml || true

.github/workflows/nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818
- name: Setup QEMU
19-
uses: docker/setup-qemu-action@v1
19+
uses: docker/setup-qemu-action@v2
2020
with:
2121
platforms: all
2222
- name: Setup Docker Buildx

.github/workflows/release.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
if [[ $GITHUB_REF == refs/tags/* ]]; then
3333
VERSION=${GITHUB_REF/refs\/tags\//}
3434
fi
35-
echo ::set-output name=BUILD_DATE::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
36-
echo ::set-output name=VERSION::${VERSION}
35+
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
36+
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
3737
- name: Setup QEMU
3838
uses: docker/setup-qemu-action@v2
3939
- name: Setup Docker Buildx
@@ -62,6 +62,8 @@ jobs:
6262
- name: Publish images
6363
uses: docker/build-push-action@v3
6464
with:
65+
sbom: true
66+
provenance: true
6567
push: true
6668
builder: ${{ steps.buildx.outputs.name }}
6769
context: .

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY internal/ internal/
3232
ENV CGO_ENABLED=0
3333
RUN xx-go build -trimpath -a -o helm-controller main.go
3434

35-
FROM alpine:3.16
35+
FROM alpine:3.17
3636

3737
# link repo to the GitHub Container Registry image
3838
LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller"

0 commit comments

Comments
 (0)