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

e2e: update podinfo to version with newer APIs

Browse Source 
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
pull/3669/head
Hidde Beydals 2 years ago
parent d29f1c062f
commit 26aafa1b6f
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
25 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,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
@ -143,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 \
@ -187,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 \
@ -212,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: |

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