Update golden files with RFC-0005 revision formats

Signed-off-by: Hidde Beydals <hello@hidde.co>
2 years ago · 7f99655a2b
parent d56844010f
commit 7f99655a2b
18 changed files with 40 additions and 40 deletions
--- a/cmd/flux/testdata/helmrelease/create_source_git.golden
+++ b/cmd/flux/testdata/helmrelease/create_source_git.golden
@ -3,4 +3,4 @@
 ✔ GitRepository source created
 ◎ waiting for GitRepository source reconciliation
 ✔ GitRepository source reconciliation completed
-✔ fetched revision: 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
--- a/cmd/flux/testdata/helmrelease/reconcile_helmrelease_from_git.golden
+++ b/cmd/flux/testdata/helmrelease/reconcile_helmrelease_from_git.golden
@ -1,7 +1,7 @@
 ► annotating GitRepository thrfg in {{ .ns }} namespace
 ✔ GitRepository annotated
 ◎ waiting for GitRepository reconciliation
-✔ fetched revision 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
 ► annotating HelmRelease thrfg in {{ .ns }} namespace
 ✔ HelmRelease annotated
 ◎ waiting for HelmRelease reconciliation
--- a/cmd/flux/testdata/kustomization/create_kustomization_from_git.golden
+++ b/cmd/flux/testdata/kustomization/create_kustomization_from_git.golden
@ -3,4 +3,4 @@
 ✔ Kustomization created
 ◎ waiting for Kustomization reconciliation
 ✔ Kustomization tkfg is ready
-✔ applied revision 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
--- a/cmd/flux/testdata/kustomization/create_source_git.golden
+++ b/cmd/flux/testdata/kustomization/create_source_git.golden
@ -3,4 +3,4 @@
 ✔ GitRepository source created
 ◎ waiting for GitRepository source reconciliation
 ✔ GitRepository source reconciliation completed
-✔ fetched revision: 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision: 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
--- a/cmd/flux/testdata/kustomization/get_kustomization_from_git.golden
+++ b/cmd/flux/testdata/kustomization/get_kustomization_from_git.golden
@ -1,2 +1,2 @@
 NAME	REVISION           	SUSPENDED	READY	MESSAGE                               
-tkfg	6.0.0/627d5c4b	False    	True 	Applied revision: 6.0.0/627d5c4b	
+tkfg	6.0.0@sha1:627d5c4b	False    	True 	Applied revision: 6.0.0@sha1:627d5c4b	
--- a/cmd/flux/testdata/kustomization/reconcile_kustomization_from_git.golden
+++ b/cmd/flux/testdata/kustomization/reconcile_kustomization_from_git.golden
@ -1,8 +1,8 @@
 ► annotating GitRepository tkfg in {{ .ns }} namespace
 ✔ GitRepository annotated
 ◎ waiting for GitRepository reconciliation
-✔ fetched revision 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ fetched revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
 ► annotating Kustomization tkfg in {{ .ns }} namespace
 ✔ Kustomization annotated
 ◎ waiting for Kustomization reconciliation
-✔ applied revision 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
--- a/cmd/flux/testdata/kustomization/resume_kustomization_from_git.golden
+++ b/cmd/flux/testdata/kustomization/resume_kustomization_from_git.golden
@ -2,4 +2,4 @@
 ✔ kustomization resumed
 ◎ waiting for Kustomization reconciliation
 ✔ Kustomization reconciliation completed
-✔ applied revision 6.0.0/627d5c4bb67b77185f37e31d734b085019ff2951
+✔ applied revision 6.0.0@sha1:627d5c4bb67b77185f37e31d734b085019ff2951
--- a/cmd/flux/testdata/oci/create_source_oci.golden
+++ b/cmd/flux/testdata/oci/create_source_oci.golden
@ -2,4 +2,4 @@
 ✔ OCIRepository created
 ◎ waiting for OCIRepository reconciliation
 ✔ OCIRepository reconciliation completed
-✔ fetched revision: 6.1.6/dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision: 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
--- a/cmd/flux/testdata/oci/get_oci.golden
+++ b/cmd/flux/testdata/oci/get_oci.golden
@ -1,2 +1,2 @@
 NAME 	REVISION             	SUSPENDED	READY	MESSAGE                                            
-thrfg	6.1.6/dbdb1097	False    	True 	stored artifact for digest '6.1.6/dbdb1097'	
+thrfg	6.1.6@sha256:dbdb1097	False    	True 	stored artifact for digest '6.1.6@sha256:dbdb1097'	
--- a/cmd/flux/testdata/oci/reconcile_oci.golden
+++ b/cmd/flux/testdata/oci/reconcile_oci.golden
@ -1,4 +1,4 @@
 ► annotating OCIRepository thrfg in {{ .ns }} namespace
 ✔ OCIRepository annotated
 ◎ waiting for OCIRepository reconciliation
-✔ fetched revision 6.1.6/dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
--- a/cmd/flux/testdata/oci/resume_oci.golden
+++ b/cmd/flux/testdata/oci/resume_oci.golden
@ -2,4 +2,4 @@
 ✔ source oci resumed
 ◎ waiting for OCIRepository reconciliation
 ✔ OCIRepository reconciliation completed
-✔ fetched revision 6.1.6/dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+✔ fetched revision 6.1.6@sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
--- a/cmd/flux/testdata/trace/deployment.golden
+++ b/cmd/flux/testdata/trace/deployment.golden
@ -20,6 +20,6 @@ Message:        Fetched revision: 6.0.0
 HelmRepository: podinfo
 Namespace:      {{ .fluxns }}
 URL:            https://stefanprodan.github.io/podinfo
-Revision:       8411f23d07d3701f0e96e7d9e503b7936d7e1d56
+Revision:       sha1:8411f23d07d3701f0e96e7d9e503b7936d7e1d56
 Status:         Last reconciled at {{ .helmRepositoryLastReconcile }}
-Message:        Fetched revision: 8411f23d07d3701f0e96e7d9e503b7936d7e1d56
+Message:        Fetched revision: main@sha1:8411f23d07d3701f0e96e7d9e503b7936d7e1d56
--- a/cmd/flux/testdata/trace/deployment.yaml
+++ b/cmd/flux/testdata/trace/deployment.yaml
@ -106,12 +106,12 @@ status:
  artifact:
    checksum: 8411f23d07d3701f0e96e7d9e503b7936d7e1d56
    lastUpdateTime: "2021-07-11T00:25:46Z"
-    revision: 8411f23d07d3701f0e96e7d9e503b7936d7e1d56
+    revision: sha1:8411f23d07d3701f0e96e7d9e503b7936d7e1d56
    path: "example"
    url: "example"
  conditions:
  - lastTransitionTime: "2021-07-11T00:25:46Z"
-    message: 'Fetched revision: 8411f23d07d3701f0e96e7d9e503b7936d7e1d56'
+    message: 'Fetched revision: main@sha1:8411f23d07d3701f0e96e7d9e503b7936d7e1d56'
    reason: IndexationSucceed
    status: "True"
    type: Ready
@ -132,7 +132,7 @@ spec:
 status:
  conditions:
  - lastTransitionTime: "2021-08-01T04:52:56Z"
-    message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+    message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
    reason: ReconciliationSucceeded
    status: "True"
    type: Ready
--- a/cmd/flux/testdata/trace/helmrelease-oci.golden
+++ b/cmd/flux/testdata/trace/helmrelease-oci.golden
@ -6,16 +6,16 @@ Status:          Managed by Flux
 Kustomization:   infrastructure
 Namespace:       {{ .fluxns }}
 Path:            ./infrastructure
-Revision:        main/696f056df216eea4f9401adbee0ff744d4df390f
+Revision:        main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 Status:          Last reconciled at {{ .kustomizationLastReconcile }}
-Message:         Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f
+Message:         Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 ---
 OCIRepository:   flux-system
 Namespace:       {{ .fluxns }}
 URL:             oci://ghcr.io/example/repo
 Tag:             1.2.3
-Revision:        dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
-Origin Revision: 6.1.6/450796ddb2ab6724ee1cc32a4be56da032d1cca0
+Revision:        sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+Origin Revision: 6.1.6@sha1:450796ddb2ab6724ee1cc32a4be56da032d1cca0
 Origin Source:   https://github.com/stefanprodan/podinfo.git
 Status:          Last reconciled at {{ .ociRepositoryLastReconcile }}
-Message:         stored artifact for digest 'dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3'
+Message:         stored artifact for digest 'sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3'
--- a/cmd/flux/testdata/trace/helmrelease-oci.yaml
+++ b/cmd/flux/testdata/trace/helmrelease-oci.yaml
@ -54,11 +54,11 @@ spec:
 status:
  conditions:
  - lastTransitionTime: "2021-08-01T04:52:56Z"
-    message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+    message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
    reason: ReconciliationSucceeded
    status: "True"
    type: Ready
-  lastAppliedRevision: main/696f056df216eea4f9401adbee0ff744d4df390f
+  lastAppliedRevision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: OCIRepository
@ -79,14 +79,14 @@ status:
  artifact:
    lastUpdateTime: "2022-08-10T10:07:59Z"
    metadata:
-      org.opencontainers.image.revision: 6.1.6/450796ddb2ab6724ee1cc32a4be56da032d1cca0
+      org.opencontainers.image.revision: 6.1.6@sha1:450796ddb2ab6724ee1cc32a4be56da032d1cca0
      org.opencontainers.image.source: https://github.com/stefanprodan/podinfo.git
    path: "example"
-    revision: dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
+    revision: sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3
    url: "example"
  conditions:
  - lastTransitionTime: "2021-07-20T00:48:16Z"
-    message: "stored artifact for digest 'dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3'"
+    message: "stored artifact for digest 'sha256:dbdb109711ffb3be77504d2670dbe13c24dd63d8d7f1fb489d350e5bfe930dd3'"
    reason: Succeed
    status: "True"
    type: Ready
--- a/cmd/flux/testdata/trace/helmrelease.golden
+++ b/cmd/flux/testdata/trace/helmrelease.golden
@ -6,14 +6,14 @@ Status:          Managed by Flux
 Kustomization:   infrastructure
 Namespace:       {{ .fluxns }}
 Path:            ./infrastructure
-Revision:        main/696f056df216eea4f9401adbee0ff744d4df390f
+Revision:        main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 Status:          Last reconciled at {{ .kustomizationLastReconcile }}
-Message:         Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f
+Message:         Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 ---
 GitRepository:   flux-system
 Namespace:       {{ .fluxns }}
 URL:             ssh://git@github.com/example/repo
 Branch:          main
-Revision:        main/696f056df216eea4f9401adbee0ff744d4df390f
+Revision:        main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 Status:          Last reconciled at {{ .gitRepositoryLastReconcile }}
-Message:         Fetched revision: main/696f056df216eea4f9401adbee0ff744d4df390f
+Message:         Fetched revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
--- a/cmd/flux/testdata/trace/helmrelease.yaml
+++ b/cmd/flux/testdata/trace/helmrelease.yaml
@ -54,11 +54,11 @@ spec:
 status:
  conditions:
  - lastTransitionTime: "2021-08-01T04:52:56Z"
-    message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+    message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
    reason: ReconciliationSucceeded
    status: "True"
    type: Ready
-  lastAppliedRevision: main/696f056df216eea4f9401adbee0ff744d4df390f
+  lastAppliedRevision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
@ -79,12 +79,12 @@ spec:
 status:
  artifact:
    lastUpdateTime: "2021-08-01T04:28:42Z"
-    revision: main/696f056df216eea4f9401adbee0ff744d4df390f
+    revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f
    path: "example"
    url: "example"
  conditions:
  - lastTransitionTime: "2021-07-20T00:48:16Z"
-    message: 'Fetched revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+    message: 'Fetched revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
    reason: GitOperationSucceed
    status: "True"
    type: Ready
--- a/cmd/flux/testdata/tree/kustomizations.yaml
+++ b/cmd/flux/testdata/tree/kustomizations.yaml
@ -19,7 +19,7 @@ spec:
 status:
  conditions:
  - lastTransitionTime: "2021-08-01T04:52:56Z"
-    message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+    message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
    reason: ReconciliationSucceeded
    status: "True"
    type: Ready
@ -55,7 +55,7 @@ spec:
 status:
  conditions:
    - lastTransitionTime: "2021-08-01T04:52:56Z"
-      message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+      message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
      reason: ReconciliationSucceeded
      status: "True"
      type: Ready
@ -81,7 +81,7 @@ spec:
 status:
  conditions:
    - lastTransitionTime: "2021-08-01T04:52:56Z"
-      message: 'Applied revision: main/696f056df216eea4f9401adbee0ff744d4df390f'
+      message: 'Applied revision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f'
      reason: ReconciliationSucceeded
      status: "True"
      type: Ready