Mirrors
/
flux2
mirror of https://github.com/fluxcd/flux2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3669 from fluxcd/update-release-workflow

Browse Source 
Update GitHub Action workflows
pull/3672/head
Hidde Beydals 2 years ago committed by GitHub
parent 47867cd80b 26aafa1b6f
commit 4431aa2dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 97 additions and 89 deletions
Show Stats Download Patch File Download Diff File

6
.github/workflows/e2e-arm64.yaml vendored
Unescape Escape View File

@ -16,12 +16,12 @@ jobs:
strategy: strategy:
matrix: matrix:
# Keep this list up-to-date with https://endoflife.date/kubernetes # Keep this list up-to-date with https://endoflife.date/kubernetes
KUBERNETES_VERSION: [ 1.23.13, 1.24.7, 1.25.3 ] KUBERNETES_VERSION: [ 1.24.11, 1.25.7, 1.26.2 ]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Prepare - name: Prepare

6
.github/workflows/e2e-azure.yaml vendored
Unescape Escape View File

@ -15,16 +15,16 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.20- ${{ runner.os }}-go1.20-
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Setup Flux CLI - name: Setup Flux CLI

13
.github/workflows/e2e-bootstrap.yaml vendored
Unescape Escape View File

@ -16,16 +16,16 @@ jobs:
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]' if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.20- ${{ runner.os }}-go1.20-
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Setup Kubernetes - name: Setup Kubernetes
@ -33,9 +33,12 @@ jobs:
with: with:
version: v0.17.0 version: v0.17.0
cluster_name: kind cluster_name: kind
node_image: kindest/node:v1.25.2 # The versions below should target the newest Kubernetes version
# Keep this up-to-date with https://endoflife.date/kubernetes
node_image: kindest/node:v1.26.0
kubectl_version: v1.26.2
- name: Setup Kustomize - name: Setup Kustomize
uses: fluxcd/pkg//actions/kustomize@main uses: fluxcd/pkg/actions/kustomize@main
- name: Build - name: Build
run: | run: |
make cmd/flux/.manifests.done make cmd/flux/.manifests.done

27
.github/workflows/e2e.yaml vendored
Unescape Escape View File

@ -20,16 +20,16 @@ jobs:
- 5000:5000 - 5000:5000
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.20-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.20- ${{ runner.os }}-go1.20-
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Setup Kubernetes - name: Setup Kubernetes
@ -38,13 +38,16 @@ jobs:
version: v0.17.0 version: v0.17.0
cluster_name: kind cluster_name: kind
config: .github/kind/config.yaml # disable KIND-net config: .github/kind/config.yaml # disable KIND-net
node_image: kindest/node:v1.23.13 # The versions below should target the newest Kubernetes version
# Keep this up-to-date with https://endoflife.date/kubernetes
node_image: kindest/node:v1.26.0
kubectl_version: v1.26.2
- name: Setup Calico for network policy - name: Setup Calico for network policy
run: | run: |
kubectl apply -f https://docs.projectcalico.org/v3.20/manifests/calico.yaml kubectl apply -f https://docs.projectcalico.org/v3.25/manifests/calico.yaml
kubectl -n kube-system set env daemonset/calico-node FELIX_IGNORELOOSERPF=true kubectl -n kube-system set env daemonset/calico-node FELIX_IGNORELOOSERPF=true
- name: Setup Kustomize - name: Setup Kustomize
uses: fluxcd/pkg//actions/kustomize@main uses: fluxcd/pkg/actions/kustomize@main
- name: Run tests - name: Run tests
run: make test run: make test
- name: Run e2e tests - name: Run e2e tests
@ -78,12 +81,12 @@ jobs:
run: | run: |
/tmp/flux create source git podinfo \ /tmp/flux create source git podinfo \
--url https://github.com/stefanprodan/podinfo \ --url https://github.com/stefanprodan/podinfo \
--tag-semver=">=3.2.3" --tag-semver=">=6.3.5"
- name: flux create source git export apply - name: flux create source git export apply
run: | run: |
/tmp/flux create source git podinfo-export \ /tmp/flux create source git podinfo-export \
--url https://github.com/stefanprodan/podinfo \ --url https://github.com/stefanprodan/podinfo \
--tag-semver=">=3.2.3" \ --tag-semver=">=6.3.5" \
--export | kubectl apply -f - --export | kubectl apply -f -
/tmp/flux delete source git podinfo-export --silent /tmp/flux delete source git podinfo-export --silent
- name: flux get sources git - name: flux get sources git
@ -140,7 +143,7 @@ jobs:
--target-namespace=default \ --target-namespace=default \
--source=HelmRepository/podinfo.flux-system \ --source=HelmRepository/podinfo.flux-system \
--chart=podinfo \ --chart=podinfo \
--chart-version=">4.0.0 <5.0.0" --chart-version=">6.0.0 <7.0.0"
- name: flux create helmrelease --source=GitRepository/podinfo - name: flux create helmrelease --source=GitRepository/podinfo
run: | run: |
/tmp/flux create hr podinfo-git \ /tmp/flux create hr podinfo-git \
@ -184,11 +187,11 @@ jobs:
run: | run: |
/tmp/flux create source oci podinfo-oci \ /tmp/flux create source oci podinfo-oci \
--url oci://ghcr.io/stefanprodan/manifests/podinfo \ --url oci://ghcr.io/stefanprodan/manifests/podinfo \
--tag-semver 6.1.x \ --tag-semver 6.3.x \
--interval 10m --interval 10m
/tmp/flux create kustomization podinfo-oci \ /tmp/flux create kustomization podinfo-oci \
--source=OCIRepository/podinfo-oci \ --source=OCIRepository/podinfo-oci \
--path="./kustomize" \ --path="./" \
--prune=true \ --prune=true \
--interval=5m \ --interval=5m \
--target-namespace=default \ --target-namespace=default \
@ -209,7 +212,7 @@ jobs:
/tmp/flux -n apps create hr podinfo-helm \ /tmp/flux -n apps create hr podinfo-helm \
--source=HelmRepository/podinfo \ --source=HelmRepository/podinfo \
--chart=podinfo \ --chart=podinfo \
--chart-version="5.0.x" \ --chart-version="6.3.x" \
--service-account=dev-team --service-account=dev-team
- name: flux2-kustomize-helm-example - name: flux2-kustomize-helm-example
run: | run: |

32
.github/workflows/release.yaml vendored
Unescape Escape View File

@ -16,32 +16,32 @@ jobs:
packages: write # needed for ghcr access packages: write # needed for ghcr access
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Unshallow - name: Unshallow
run: git fetch --prune --unshallow run: git fetch --prune --unshallow
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Setup QEMU - name: Setup QEMU
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2 uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
- name: Setup Docker Buildx - name: Setup Docker Buildx
id: buildx id: buildx
uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2 uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2.4.1
- name: Setup Syft - name: Setup Syft
uses: anchore/sbom-action/download-syft@07978da4bdb4faa726e52dfc6b1bed63d4b56479 # v0.13.3 uses: anchore/sbom-action/download-syft@07978da4bdb4faa726e52dfc6b1bed63d4b56479 # v0.13.3
- name: Setup Cosign - name: Setup Cosign
uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # v2.8.1 uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v3.0.1
- name: Setup Kustomize - name: Setup Kustomize
uses: fluxcd/pkg//actions/kustomize@main uses: fluxcd/pkg/actions/kustomize@main
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
with: with:
registry: ghcr.io registry: ghcr.io
username: fluxcdbot username: fluxcdbot
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Docker Hub - name: Login to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
with: with:
username: fluxcdbot username: fluxcdbot
password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }} password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
@ -54,7 +54,7 @@ jobs:
run: | run: |
kustomize build manifests/crds > all-crds.yaml kustomize build manifests/crds > all-crds.yaml
- name: Generate OpenAPI JSON schemas from CRDs - name: Generate OpenAPI JSON schemas from CRDs
uses: fluxcd/pkg//actions/crdjsonschema@main uses: fluxcd/pkg/actions/crdjsonschema@main
with: with:
crd: all-crds.yaml crd: all-crds.yaml
output: schemas output: schemas
@ -73,7 +73,7 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run GoReleaser - name: Run GoReleaser
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v3 uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4.2.0
with: with:
version: latest version: latest
args: release --release-notes=output/notes.md --skip-validate args: release --release-notes=output/notes.md --skip-validate
@ -88,7 +88,7 @@ jobs:
id-token: write id-token: write
packages: write packages: write
steps: steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Setup Kustomize - name: Setup Kustomize
uses: fluxcd/pkg/actions/kustomize@main uses: fluxcd/pkg/actions/kustomize@main
- name: Setup Flux CLI - name: Setup Flux CLI
@ -99,13 +99,13 @@ jobs:
VERSION=$(flux version --client | awk '{ print $NF }') VERSION=$(flux version --client | awk '{ print $NF }')
echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "version=${VERSION}" >> $GITHUB_OUTPUT
- name: Login to GHCR - name: Login to GHCR
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
with: with:
registry: ghcr.io registry: ghcr.io
username: fluxcdbot username: fluxcdbot
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2 uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
with: with:
username: fluxcdbot username: fluxcdbot
password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }} password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
@ -133,13 +133,13 @@ jobs:
--path="./flux-system" \ --path="./flux-system" \
--source=${{ github.repositoryUrl }} \ --source=${{ github.repositoryUrl }} \
--revision="${{ github.ref_name }}@sha1:${{ github.sha }}" --revision="${{ github.ref_name }}@sha1:${{ github.sha }}"
- uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # v2.8.1 - uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 # v3.0.1
- name: Sign manifests - name: Sign manifests
env: env:
COSIGN_EXPERIMENTAL: 1 COSIGN_EXPERIMENTAL: 1
run: | run: |
cosign sign ghcr.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }} cosign sign --yes ghcr.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }}
cosign sign docker.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }} cosign sign --yes docker.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }}
- name: Tag manifests - name: Tag manifests
run: | run: |
flux tag artifact oci://ghcr.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }} \ flux tag artifact oci://ghcr.io/fluxcd/flux-manifests:${{ steps.prep.outputs.version }} \

22
.github/workflows/scan.yaml vendored
Unescape Escape View File

@ -17,9 +17,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]' if: github.actor != 'dependabot[bot]'
steps: steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Run FOSSA scan and upload build data - name: Run FOSSA scan and upload build data
uses: fossa-contrib/fossa-action@6728dc6fe9a068c648d080c33829ffbe56565023 # v1 uses: fossa-contrib/fossa-action@6728dc6fe9a068c648d080c33829ffbe56565023 # v2.0.0
with: with:
# FOSSA Push-Only API Token # FOSSA Push-Only API Token
fossa-api-key: 5ee8bf422db1471e0bcf2bcb289185de fossa-api-key: 5ee8bf422db1471e0bcf2bcb289185de
@ -31,11 +31,11 @@ jobs:
security-events: write security-events: write
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]' if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
steps: steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Setup Kustomize - name: Setup Kustomize
uses: fluxcd/pkg//actions/kustomize@main uses: fluxcd/pkg/actions/kustomize@main
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Download modules and build manifests - name: Download modules and build manifests
@ -50,7 +50,7 @@ jobs:
env: env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Upload result to GitHub Code Scanning - name: Upload result to GitHub Code Scanning
uses: github/codeql-action/upload-sarif@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 uses: github/codeql-action/upload-sarif@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5
with: with:
sarif_file: snyk.sarif sarif_file: snyk.sarif
@ -61,16 +61,16 @@ jobs:
if: github.actor != 'dependabot[bot]' if: github.actor != 'dependabot[bot]'
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Set up Go - name: Set up Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5
with: with:
languages: go languages: go
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2 uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5

6
.github/workflows/update.yaml vendored
Unescape Escape View File

@ -18,9 +18,9 @@ jobs:
pull-requests: write pull-requests: write
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- name: Setup Go - name: Setup Go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with: with:
go-version: 1.20.x go-version: 1.20.x
- name: Update component versions - name: Update component versions
@ -81,7 +81,7 @@ jobs:
- name: Create Pull Request - name: Create Pull Request
id: cpr id: cpr
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4 uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
with: with:
token: ${{ secrets.BOT_GITHUB_TOKEN }} token: ${{ secrets.BOT_GITHUB_TOKEN }}
commit-message: | commit-message: |

2
.goreleaser.yml
Unescape Escape View File

@ -65,6 +65,7 @@ signs:
certificate: '${artifact}.pem' certificate: '${artifact}.pem'
args: args:
- sign-blob - sign-blob
- "--yes"
- '--output-certificate=${certificate}' - '--output-certificate=${certificate}'
- '--output-signature=${signature}' - '--output-signature=${signature}'
- '${artifact}' - '${artifact}'
@ -175,6 +176,7 @@ docker_signs:
- COSIGN_EXPERIMENTAL=1 - COSIGN_EXPERIMENTAL=1
args: args:
- sign - sign
- "--yes"
- '${artifact}' - '${artifact}'
artifacts: all artifacts: all
output: true output: true

4
cmd/flux/create_source_oci_test.go
Unescape Escape View File

@ -38,12 +38,12 @@ func TestCreateSourceOCI(t *testing.T) {
}, },
{ {
name: "export manifest", name: "export manifest",
args: "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m --export", args: "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m --export",
assertFunc: assertGoldenFile("./testdata/oci/export.golden"), assertFunc: assertGoldenFile("./testdata/oci/export.golden"),
}, },
{ {
name: "export manifest with secret", name: "export manifest with secret",
args: "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m --secret-ref=creds --export", args: "create source oci podinfo --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m --secret-ref=creds --export",
assertFunc: assertGoldenFile("./testdata/oci/export_with_secret.golden"), assertFunc: assertGoldenFile("./testdata/oci/export_with_secret.golden"),
}, },
} }

2
cmd/flux/helmrelease_test.go
Unescape Escape View File

@ -37,7 +37,7 @@ func TestHelmReleaseFromGit(t *testing.T) {
tmpl map[string]string tmpl map[string]string
}{ }{
{ {
"create source git thrfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.0.0", "create source git thrfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.3.5",
"testdata/helmrelease/create_source_git.golden", "testdata/helmrelease/create_source_git.golden",
nil, nil,
}, },

2
cmd/flux/kustomization_test.go
Unescape Escape View File

@ -37,7 +37,7 @@ func TestKustomizationFromGit(t *testing.T) {
tmpl map[string]string tmpl map[string]string
}{ }{
{ {
"create source git tkfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.0.0", "create source git tkfg --url=https://github.com/stefanprodan/podinfo --branch=main --tag=6.3.5",
"testdata/kustomization/create_source_git.golden", "testdata/kustomization/create_source_git.golden",
nil, nil,
}, },

2
cmd/flux/source_oci_test.go
Unescape Escape View File

@ -39,7 +39,7 @@ func TestSourceOCI(t *testing.T) {
tmpl map[string]string tmpl map[string]string
}{ }{
{ {
"create source oci thrfg --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.1.6 --interval 10m", "create source oci thrfg --url=oci://ghcr.io/stefanprodan/manifests/podinfo --tag=6.3.5 --interval 10m",
"testdata/oci/create_source_oci.golden", "testdata/oci/create_source_oci.golden",
nil, nil,
}, },

2
cmd/flux/testdata/helmrelease/create_helmrelease_from_git.golden vendored
Unescape Escape View File

@ -3,4 +3,4 @@
✔ HelmRelease created ✔ HelmRelease created
◎ waiting for HelmRelease reconciliation ◎ waiting for HelmRelease reconciliation
✔ HelmRelease thrfg is ready ✔ HelmRelease thrfg is ready
✔ applied revision 6.0.0 ✔ applied revision 6.3.5

2
cmd/flux/testdata/helmrelease/create_source_git.golden vendored
Unescape Escape View File

@ -3,4 +3,4 @@
✔ GitRepository source created ✔ GitRepository source created
◎ waiting for GitRepository source reconciliation ◎ waiting for GitRepository source reconciliation
✔ GitRepository source reconciliation completed ✔ GitRepository source reconciliation completed
✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ fetched revision: 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

2
cmd/flux/testdata/helmrelease/get_helmrelease_from_git.golden vendored
Unescape Escape View File

@ -1,2 +1,2 @@
NAME REVISION SUSPENDED READY MESSAGE NAME REVISION SUSPENDED READY MESSAGE
thrfg 6.0.0 False True Release reconciliation succeeded thrfg 6.3.5 False True Release reconciliation succeeded

4
cmd/flux/testdata/helmrelease/reconcile_helmrelease_from_git.golden vendored
Unescape Escape View File

@ -1,8 +1,8 @@
► annotating GitRepository thrfg in {{ .ns }} namespace ► annotating GitRepository thrfg in {{ .ns }} namespace
✔ GitRepository annotated ✔ GitRepository annotated
◎ waiting for GitRepository reconciliation ◎ waiting for GitRepository reconciliation
✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ fetched revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9
► annotating HelmRelease thrfg in {{ .ns }} namespace ► annotating HelmRelease thrfg in {{ .ns }} namespace
✔ HelmRelease annotated ✔ HelmRelease annotated
◎ waiting for HelmRelease reconciliation ◎ waiting for HelmRelease reconciliation
✔ applied revision 6.0.0 ✔ applied revision 6.3.5

2
cmd/flux/testdata/helmrelease/resume_helmrelease_from_git.golden vendored
Unescape Escape View File

@ -2,4 +2,4 @@
✔ helmrelease resumed ✔ helmrelease resumed
◎ waiting for HelmRelease reconciliation ◎ waiting for HelmRelease reconciliation
✔ HelmRelease reconciliation completed ✔ HelmRelease reconciliation completed
✔ applied revision 6.0.0 ✔ applied revision 6.3.5

2
cmd/flux/testdata/kustomization/create_kustomization_from_git.golden vendored
Unescape Escape View File

@ -3,4 +3,4 @@
✔ Kustomization created ✔ Kustomization created
◎ waiting for Kustomization reconciliation ◎ waiting for Kustomization reconciliation
✔ Kustomization tkfg is ready ✔ Kustomization tkfg is ready
✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

2
cmd/flux/testdata/kustomization/create_source_git.golden vendored
Unescape Escape View File

@ -3,4 +3,4 @@
✔ GitRepository source created ✔ GitRepository source created
◎ waiting for GitRepository source reconciliation ◎ waiting for GitRepository source reconciliation
✔ GitRepository source reconciliation completed ✔ GitRepository source reconciliation completed
✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ fetched revision: 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

2
cmd/flux/testdata/kustomization/get_kustomization_from_git.golden vendored
Unescape Escape View File

@ -1,2 +1,2 @@
NAME REVISION SUSPENDED READY MESSAGE NAME REVISION SUSPENDED READY MESSAGE
tkfg 6.0.0@sha1:627d5c4b False True Applied revision: 6.0.0@sha1:627d5c4b tkfg 6.3.5@sha1:67e2c98a False True Applied revision: 6.3.5@sha1:67e2c98a

4
cmd/flux/testdata/kustomization/reconcile_kustomization_from_git.golden vendored
Unescape Escape View File

@ -1,8 +1,8 @@
► annotating GitRepository tkfg in {{ .ns }} namespace ► annotating GitRepository tkfg in {{ .ns }} namespace
✔ GitRepository annotated ✔ GitRepository annotated
◎ waiting for GitRepository reconciliation ◎ waiting for GitRepository reconciliation
✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ fetched revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9
► annotating Kustomization tkfg in {{ .ns }} namespace ► annotating Kustomization tkfg in {{ .ns }} namespace
✔ Kustomization annotated ✔ Kustomization annotated
◎ waiting for Kustomization reconciliation ◎ waiting for Kustomization reconciliation
✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

2
cmd/flux/testdata/kustomization/resume_kustomization_from_git.golden vendored
Unescape Escape View File

@ -2,4 +2,4 @@
✔ kustomization resumed ✔ kustomization resumed
◎ waiting for Kustomization reconciliation ◎ waiting for Kustomization reconciliation
✔ Kustomization reconciliation completed ✔ Kustomization reconciliation completed
✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951 ✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9

2
cmd/flux/testdata/oci/create_source_oci.golden vendored
Unescape Escape View File

@ -2,4 +2,4 @@
✔ OCIRepository created ✔ OCIRepository created
◎ waiting for OCIRepository reconciliation ◎ waiting for OCIRepository reconciliation
✔ OCIRepository reconciliation completed ✔ OCIRepository reconciliation completed
✔ fetched revision: 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3 ✔ fetched revision: 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

2
cmd/flux/testdata/oci/export.golden vendored
Unescape Escape View File

@ -7,6 +7,6 @@ metadata:
spec: spec:
interval: 10m0s interval: 10m0s
ref: ref:
tag: 6.1.6 tag: 6.3.5
url: oci://ghcr.io/stefanprodan/manifests/podinfo url: oci://ghcr.io/stefanprodan/manifests/podinfo

2
cmd/flux/testdata/oci/export_with_secret.golden vendored
Unescape Escape View File

@ -7,7 +7,7 @@ metadata:
spec: spec:
interval: 10m0s interval: 10m0s
ref: ref:
tag: 6.1.6 tag: 6.3.5
secretRef: secretRef:
name: creds name: creds
url: oci://ghcr.io/stefanprodan/manifests/podinfo url: oci://ghcr.io/stefanprodan/manifests/podinfo

2
cmd/flux/testdata/oci/get_oci.golden vendored
Unescape Escape View File

@ -1,2 +1,2 @@
NAME REVISION SUSPENDED READY MESSAGE NAME REVISION SUSPENDED READY MESSAGE
thrfg 6.1.6@sha256:dbdb1097 False True stored artifact for digest '6.1.6@sha256:dbdb1097' thrfg 6.3.5@sha256:6c959c51 False True stored artifact for digest '6.3.5@sha256:6c959c51'

2
cmd/flux/testdata/oci/reconcile_oci.golden vendored
Unescape Escape View File

@ -1,4 +1,4 @@
► annotating OCIRepository thrfg in {{ .ns }} namespace ► annotating OCIRepository thrfg in {{ .ns }} namespace
✔ OCIRepository annotated ✔ OCIRepository annotated
◎ waiting for OCIRepository reconciliation ◎ waiting for OCIRepository reconciliation
✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3 ✔ fetched revision 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

2
cmd/flux/testdata/oci/resume_oci.golden vendored
Unescape Escape View File

@ -2,4 +2,4 @@
✔ source oci resumed ✔ source oci resumed
◎ waiting for OCIRepository reconciliation ◎ waiting for OCIRepository reconciliation
✔ OCIRepository reconciliation completed ✔ OCIRepository reconciliation completed
✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3 ✔ fetched revision 6.3.5@sha256:6c959c51ccbb952e5fe4737563338a0aaf975675dcf812912cf09e5463181871

8
cmd/flux/testdata/trace/deployment.golden vendored
Unescape Escape View File

@ -5,17 +5,17 @@ Status: Managed by Flux
--- ---
HelmRelease: podinfo HelmRelease: podinfo
Namespace: {{ .ns }} Namespace: {{ .ns }}
Revision: 6.0.0 Revision: 6.3.5
Status: Last reconciled at {{ .helmReleaseLastReconcile }} Status: Last reconciled at {{ .helmReleaseLastReconcile }}
Message: Release reconciliation succeeded Message: Release reconciliation succeeded
--- ---
HelmChart: podinfo-podinfo HelmChart: podinfo-podinfo
Namespace: {{ .fluxns }} Namespace: {{ .fluxns }}
Chart: podinfo Chart: podinfo
Version: 6.0.0 Version: 6.3.5
Revision: 6.0.0 Revision: 6.3.5
Status: Last reconciled at {{ .helmChartLastReconcile }} Status: Last reconciled at {{ .helmChartLastReconcile }}
Message: Fetched revision: 6.0.0 Message: Fetched revision: 6.3.5
--- ---
HelmRepository: podinfo HelmRepository: podinfo
Namespace: {{ .fluxns }} Namespace: {{ .fluxns }}

10
cmd/flux/testdata/trace/deployment.yaml vendored
Unescape Escape View File

@ -59,8 +59,8 @@ status:
status: "True" status: "True"
type: Ready type: Ready
helmChart: {{ .fluxns }}/podinfo-podinfo helmChart: {{ .fluxns }}/podinfo-podinfo
lastAppliedRevision: 6.0.0 lastAppliedRevision: 6.3.5
lastAttemptedRevision: 6.0.0 lastAttemptedRevision: 6.3.5
lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531 lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
--- ---
apiVersion: source.toolkit.fluxcd.io/v1beta1 apiVersion: source.toolkit.fluxcd.io/v1beta1
@ -73,18 +73,18 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: podinfo name: podinfo
version: 6.0.0 version: 6.3.5
interval: 5m interval: 5m
status: status:
artifact: artifact:
checksum: cf13ba96773d9a879cd052c86e73199b3f96c854 checksum: cf13ba96773d9a879cd052c86e73199b3f96c854
lastUpdateTime: "2021-08-01T04:42:55Z" lastUpdateTime: "2021-08-01T04:42:55Z"
revision: 6.0.0 revision: 6.3.5
path: "example" path: "example"
url: "example" url: "example"
conditions: conditions:
- lastTransitionTime: "2021-07-16T15:32:09Z" - lastTransitionTime: "2021-07-16T15:32:09Z"
message: 'Fetched revision: 6.0.0' message: 'Fetched revision: 6.3.5'
reason: ChartPullSucceeded reason: ChartPullSucceeded
status: "True" status: "True"
type: Ready type: Ready

4
cmd/flux/testdata/trace/helmrelease-oci.yaml vendored
Unescape Escape View File

@ -34,8 +34,8 @@ status:
status: "True" status: "True"
type: Ready type: Ready
helmChart: {{ .fluxns }}/podinfo-podinfo helmChart: {{ .fluxns }}/podinfo-podinfo
lastAppliedRevision: 6.0.0 lastAppliedRevision: 6.3.5
lastAttemptedRevision: 6.0.0 lastAttemptedRevision: 6.3.5
lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531 lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2

4
cmd/flux/testdata/trace/helmrelease.yaml vendored
Unescape Escape View File

@ -34,8 +34,8 @@ status:
status: "True" status: "True"
type: Ready type: Ready
helmChart: {{ .fluxns }}/podinfo-podinfo helmChart: {{ .fluxns }}/podinfo-podinfo
lastAppliedRevision: 6.0.0 lastAppliedRevision: 6.3.5
lastAttemptedRevision: 6.0.0 lastAttemptedRevision: 6.3.5
lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531 lastAttemptedValuesChecksum: c31db75d05b7515eba2eef47bd71038c74b2e531
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1

Write Preview
Loading…
Cancel
Save