diff --git a/pkg/app/app_sync_test.go b/pkg/app/app_sync_test.go index 299a48d1..b138f2fb 100644 --- a/pkg/app/app_sync_test.go +++ b/pkg/app/app_sync_test.go @@ -182,89 +182,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - my-release (incubator/raw) UPDATED - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default/default/external-secrets -2 default/default/my-release - -processing releases in group 1/2: default/default/external-secrets -processing releases in group 2/2: default/default/my-release - -UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s - -changing working directory back to "/path/to" -`, }) }) @@ -321,111 +238,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: hooks: -24: - name: my-release -25: events: -26: - postsync -27: showlogs: true -28: command: sleep -29: args: [5s] -30: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: hooks: -24: - name: my-release -25: events: -26: - postsync -27: showlogs: true -28: command: sleep -29: args: [5s] -30: - -merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - my-release (incubator/raw) UPDATED - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default/default/external-secrets -2 default/default/my-release - -processing releases in group 1/2: default/default/external-secrets -processing releases in group 2/2: default/default/my-release -hook[my-release]: stateFilePath=helmfile.yaml, basePath=. - -hook[my-release]: triggered by event "postsync" - -hook[my-release]: - - -hook[postsync] logs | - -UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 5s - -changing working directory back to "/path/to" -`, }) }) @@ -477,93 +289,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - kubernetes-external-secrets (incubator/raw) UPDATED - my-release (incubator/raw) UPDATED - -processing 3 groups of releases in this order: -GROUP RELEASES -1 default/kube-system/kubernetes-external-secrets -2 default/default/external-secrets -3 default/default/my-release - -processing releases in group 1/3: default/kube-system/kubernetes-external-secrets -processing releases in group 2/3: default/default/external-secrets -processing releases in group 3/3: default/default/my-release - -UPDATED RELEASES: -NAME CHART VERSION DURATION -kubernetes-external-secrets incubator/raw 3.1.0 0s -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s - -changing working directory back to "/path/to" -`, }) }) @@ -611,85 +336,6 @@ serviceA 4 Fri Nov 1 08:40:07 2019 DEPLOYED chart-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: serviceA - 5: chart: my/chart - 6: needs: - 7: - serviceB - 8: - 9: - name: serviceB -10: chart: my/chart -11: needs: -12: - serviceC -13: -14: - name: serviceC -15: chart: my/chart -16: -17: - name: serviceD -18: chart: my/chart -19: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: serviceA - 5: chart: my/chart - 6: needs: - 7: - serviceB - 8: - 9: - name: serviceB -10: chart: my/chart -11: needs: -12: - serviceC -13: -14: - name: serviceC -15: chart: my/chart -16: -17: - name: serviceD -18: chart: my/chart -19: - -merged environment: &{default map[] map[]} -3 release(s) matching name=serviceA found in helmfile.yaml - -Affected releases are: - serviceA (my/chart) UPDATED - serviceB (my/chart) UPDATED - serviceC (my/chart) UPDATED - -processing 3 groups of releases in this order: -GROUP RELEASES -1 default//serviceC -2 default//serviceB -3 default//serviceA - -processing releases in group 1/3: default//serviceC -processing releases in group 2/3: default//serviceB -processing releases in group 3/3: default//serviceA - -UPDATED RELEASES: -NAME CHART VERSION DURATION -serviceC my/chart 3.1.0 0s -serviceB my/chart 3.1.0 0s -serviceA my/chart 3.1.0 0s - -changing working directory back to "/path/to" -`, }) }) @@ -743,104 +389,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: installed: false - 8: - 9: - name: external-secrets -10: chart: incubator/raw -11: namespace: default -12: labels: -13: app: test -14: needs: -15: - kube-system/kubernetes-external-secrets -16: -17: - name: my-release -18: chart: incubator/raw -19: namespace: default -20: labels: -21: app: test -22: needs: -23: - default/external-secrets -24: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: installed: false - 8: - 9: - name: external-secrets -10: chart: incubator/raw -11: namespace: default -12: labels: -13: app: test -14: needs: -15: - kube-system/kubernetes-external-secrets -16: -17: - name: my-release -18: chart: incubator/raw -19: namespace: default -20: labels: -21: app: test -22: needs: -23: - default/external-secrets -24: - -merged environment: &{default map[] map[]} -WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - kubernetes-external-secrets (incubator/raw) DELETED - my-release (incubator/raw) UPDATED - -processing 1 groups of releases in this order: -GROUP RELEASES -1 default/kube-system/kubernetes-external-secrets - -processing releases in group 1/1: default/kube-system/kubernetes-external-secrets -processing 2 groups of releases in this order: -GROUP RELEASES -1 default/default/external-secrets -2 default/default/my-release - -processing releases in group 1/2: default/default/external-secrets -WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs -processing releases in group 2/2: default/default/my-release - -UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s - - -DELETED RELEASES: -NAME DURATION -kubernetes-external-secrets 0s - -changing working directory back to "/path/to" -`, }) }) @@ -893,93 +441,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: installed: false - 8: - 9: - name: external-secrets -10: chart: incubator/raw -11: namespace: default -12: labels: -13: app: test -14: needs: -15: - kube-system/kubernetes-external-secrets -16: -17: - name: my-release -18: chart: incubator/raw -19: namespace: default -20: labels: -21: app: test -22: needs: -23: - default/external-secrets -24: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: installed: false - 8: - 9: - name: external-secrets -10: chart: incubator/raw -11: namespace: default -12: labels: -13: app: test -14: needs: -15: - kube-system/kubernetes-external-secrets -16: -17: - name: my-release -18: chart: incubator/raw -19: namespace: default -20: labels: -21: app: test -22: needs: -23: - default/external-secrets -24: - -merged environment: &{default map[] map[]} -WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - my-release (incubator/raw) UPDATED - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default/default/external-secrets -2 default/default/my-release - -processing releases in group 1/2: default/default/external-secrets -WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs -processing releases in group 2/2: default/default/my-release - -UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s - -changing working directory back to "/path/to" -`, }) }) @@ -1016,72 +477,6 @@ releases: error: "err: no releases found that matches specified selector(app=test_non_existent) and environment(default), in any helmfile", // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -merged environment: &{default map[] map[]} -0 release(s) matching app=test_non_existent found in helmfile.yaml - -changing working directory back to "/path/to" -`, }) }) } diff --git a/pkg/app/destroy_nokubectx_test.go b/pkg/app/destroy_nokubectx_test.go index 6e20c2d2..4f77fe23 100644 --- a/pkg/app/destroy_nokubectx_test.go +++ b/pkg/app/destroy_nokubectx_test.go @@ -127,6 +127,8 @@ func TestDestroy_2(t *testing.T) { actual := bs.String() assert.Equal(t, tc.log, actual) + } else { + assertLogEqualsToSnapshot(t, bs.String()) } } @@ -253,173 +255,6 @@ anotherbackend 4 Fri Nov 1 08:40:07 2019 DEPLOYED anotherbackend-3.1.0 {Name: "front-proxy", Flags: []string{}}, {Name: "logging", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -10 release(s) found in helmfile.yaml - -processing 5 groups of releases in this order: -GROUP RELEASES -1 frontend-v3, frontend-v2, frontend-v1 -2 backend-v2, backend-v1 -3 anotherbackend -4 servicemesh, database -5 front-proxy, logging - -processing releases in group 1/5: frontend-v3, frontend-v2, frontend-v1 -release "frontend-v3" processed -release "frontend-v2" processed -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/5: backend-v2, backend-v1 -release "backend-v2" processed -release "backend-v1" processed -processing releases in group 3/5: anotherbackend -release "anotherbackend" processed -processing releases in group 4/5: servicemesh, database -release "servicemesh" processed -release "database" processed -processing releases in group 5/5: front-proxy, logging -release "front-proxy" processed -release "logging" processed - -DELETED RELEASES: -NAME DURATION -frontend-v3 0s -frontend-v2 0s -frontend-v1 0s -backend-v2 0s -backend-v1 0s -anotherbackend 0s -servicemesh 0s -database 0s -front-proxy 0s -logging 0s - -changing working directory back to "/path/to" -`, }) }) @@ -467,146 +302,6 @@ anotherbackend 4 Fri Nov 1 08:40:07 2019 DEPLOYED anotherbackend-3.1.0 deleted: []exectest.Release{ {Name: "logging", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -1 release(s) matching name=logging found in helmfile.yaml - -processing 1 groups of releases in this order: -GROUP RELEASES -1 logging - -processing releases in group 1/1: logging -release "logging" processed - -DELETED RELEASES: -NAME DURATION -logging 0s - -changing working directory back to "/path/to" -`, }) }) @@ -626,61 +321,6 @@ changing working directory back to "/path/to" deleted: []exectest.Release{ {Name: "frontend-v1", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -2 release(s) found in helmfile.yaml - -processing 2 groups of releases in this order: -GROUP RELEASES -1 frontend-v1 -2 backend-v1 - -processing releases in group 1/2: frontend-v1 -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/2: backend-v1 -release "backend-v1" processed - -DELETED RELEASES: -NAME DURATION -frontend-v1 0s -backend-v1 0s - -changing working directory back to "/path/to" -`, }) }) @@ -700,61 +340,6 @@ changing working directory back to "/path/to" deleted: []exectest.Release{ {Name: "frontend-v1", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -2 release(s) found in helmfile.yaml - -processing 2 groups of releases in this order: -GROUP RELEASES -1 frontend-v1 -2 backend-v1 - -processing releases in group 1/2: frontend-v1 -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/2: backend-v1 -release "backend-v1" processed - -DELETED RELEASES: -NAME DURATION -frontend-v1 0s -backend-v1 0s - -changing working directory back to "/path/to" -`, }) }) } diff --git a/pkg/app/destroy_test.go b/pkg/app/destroy_test.go index 228a945e..4f815469 100644 --- a/pkg/app/destroy_test.go +++ b/pkg/app/destroy_test.go @@ -196,6 +196,8 @@ func TestDestroy(t *testing.T) { actual := bs.String() assert.Equal(t, tc.log, actual) + } else { + assertLogEqualsToSnapshot(t, bs.String()) } } @@ -325,173 +327,6 @@ anotherbackend 4 Fri Nov 1 08:40:07 2019 DEPLOYED anotherbackend-3.1.0 {Name: "front-proxy", Flags: []string{}}, {Name: "logging", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -10 release(s) found in helmfile.yaml - -processing 5 groups of releases in this order: -GROUP RELEASES -1 default//frontend-v3, default//frontend-v2, default//frontend-v1 -2 default//backend-v2, default//backend-v1 -3 default//anotherbackend -4 default//servicemesh, default//database -5 default//front-proxy, default//logging - -processing releases in group 1/5: default//frontend-v3, default//frontend-v2, default//frontend-v1 -release "frontend-v3" processed -release "frontend-v2" processed -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/5: default//backend-v2, default//backend-v1 -release "backend-v2" processed -release "backend-v1" processed -processing releases in group 3/5: default//anotherbackend -release "anotherbackend" processed -processing releases in group 4/5: default//servicemesh, default//database -release "servicemesh" processed -release "database" processed -processing releases in group 5/5: default//front-proxy, default//logging -release "front-proxy" processed -release "logging" processed - -DELETED RELEASES: -NAME DURATION -frontend-v3 0s -frontend-v2 0s -frontend-v1 0s -backend-v2 0s -backend-v1 0s -anotherbackend 0s -servicemesh 0s -database 0s -front-proxy 0s -logging 0s - -changing working directory back to "/path/to" -`, }) }) @@ -536,146 +371,6 @@ anotherbackend 4 Fri Nov 1 08:40:07 2019 DEPLOYED anotherbackend-3.1.0 deleted: []exectest.Release{ {Name: "logging", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: database - 3: chart: charts/mysql - 4: needs: - 5: - logging - 6: - name: frontend-v1 - 7: chart: charts/frontend - 8: installed: false - 9: needs: -10: - servicemesh -11: - logging -12: - backend-v1 -13: - name: frontend-v2 -14: chart: charts/frontend -15: needs: -16: - servicemesh -17: - logging -18: - backend-v2 -19: - name: frontend-v3 -20: chart: charts/frontend -21: needs: -22: - servicemesh -23: - logging -24: - backend-v2 -25: - name: backend-v1 -26: chart: charts/backend -27: installed: false -28: needs: -29: - servicemesh -30: - logging -31: - database -32: - anotherbackend -33: - name: backend-v2 -34: chart: charts/backend -35: needs: -36: - servicemesh -37: - logging -38: - database -39: - anotherbackend -40: - name: anotherbackend -41: chart: charts/anotherbackend -42: needs: -43: - servicemesh -44: - logging -45: - database -46: - name: servicemesh -47: chart: charts/istio -48: needs: -49: - logging -50: - name: logging -51: chart: charts/fluent-bit -52: - name: front-proxy -53: chart: stable/envoy -54: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -1 release(s) matching name=logging found in helmfile.yaml - -processing 1 groups of releases in this order: -GROUP RELEASES -1 default//logging - -processing releases in group 1/1: default//logging -release "logging" processed - -DELETED RELEASES: -NAME DURATION -logging 0s - -changing working directory back to "/path/to" -`, }) }) @@ -695,61 +390,6 @@ changing working directory back to "/path/to" deleted: []exectest.Release{ {Name: "frontend-v1", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -2 release(s) found in helmfile.yaml - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default//frontend-v1 -2 default//backend-v1 - -processing releases in group 1/2: default//frontend-v1 -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/2: default//backend-v1 -release "backend-v1" processed - -DELETED RELEASES: -NAME DURATION -frontend-v1 0s -backend-v1 0s - -changing working directory back to "/path/to" -`, }) }) @@ -772,61 +412,6 @@ changing working directory back to "/path/to" deleted: []exectest.Release{ {Name: "frontend-v1", Flags: []string{}}, }, - log: `processing file "helmfile.yaml" in directory "." -changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: backend-v1 - 3: chart: charts/backend - 4: installed: false - 5: - name: frontend-v1 - 6: chart: charts/frontend - 7: needs: - 8: - backend-v1 - 9: - -merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -2 release(s) found in helmfile.yaml - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default//frontend-v1 -2 default//backend-v1 - -processing releases in group 1/2: default//frontend-v1 -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs -release "frontend-v1" processed -processing releases in group 2/2: default//backend-v1 -release "backend-v1" processed - -DELETED RELEASES: -NAME DURATION -frontend-v1 0s -backend-v1 0s - -changing working directory back to "/path/to" -`, }) }) } diff --git a/pkg/app/testdata/testapply/delete_bar_when_bar_needs_foo/log b/pkg/app/testdata/testapply/delete_bar_when_bar_needs_foo/log index 295644d7..3ee09b86 100644 --- a/pkg/app/testdata/testapply/delete_bar_when_bar_needs_foo/log +++ b/pkg/app/testdata/testapply/delete_bar_when_bar_needs_foo/log @@ -57,12 +57,12 @@ GROUP RELEASES processing releases in group 1/1: default//foo UPDATED RELEASES: -NAME CHART VERSION DURATION -foo stable/mychart1 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo stable/mychart1 3.1.0 0s DELETED RELEASES: -NAME DURATION -bar 0s +NAME NAMESPACE DURATION +bar 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/delete_bar_when_foo_needs_bar/log b/pkg/app/testdata/testapply/delete_bar_when_foo_needs_bar/log index 21ee48f6..02d852b3 100644 --- a/pkg/app/testdata/testapply/delete_bar_when_foo_needs_bar/log +++ b/pkg/app/testdata/testapply/delete_bar_when_foo_needs_bar/log @@ -60,12 +60,12 @@ processing releases in group 1/1: default//foo WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs UPDATED RELEASES: -NAME CHART VERSION DURATION -foo stable/mychart1 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo stable/mychart1 3.1.0 0s DELETED RELEASES: -NAME DURATION -bar 0s +NAME NAMESPACE DURATION +bar 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log b/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log index 9da786e8..f3377bd1 100644 --- a/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log +++ b/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log @@ -57,8 +57,8 @@ processing releases in group 1/2: default//bar processing releases in group 2/2: default//foo DELETED RELEASES: -NAME DURATION -bar 0s -foo 0s +NAME NAMESPACE DURATION +bar 0s +foo 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log b/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log index bdf61a9e..e8850438 100644 --- a/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log +++ b/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log @@ -57,8 +57,8 @@ processing releases in group 1/2: default//foo processing releases in group 2/2: default//bar DELETED RELEASES: -NAME DURATION -foo 0s -bar 0s +NAME NAMESPACE DURATION +foo 0s +bar 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/delete_foo_when_bar_needs_foo/log b/pkg/app/testdata/testapply/delete_foo_when_bar_needs_foo/log index c1e86135..25bb1eef 100644 --- a/pkg/app/testdata/testapply/delete_foo_when_bar_needs_foo/log +++ b/pkg/app/testdata/testapply/delete_foo_when_bar_needs_foo/log @@ -60,12 +60,12 @@ processing releases in group 1/1: default//bar WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs UPDATED RELEASES: -NAME CHART VERSION DURATION -bar stable/mychart2 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +bar stable/mychart2 3.1.0 0s DELETED RELEASES: -NAME DURATION -foo 0s +NAME NAMESPACE DURATION +foo 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/delete_foo_when_foo_needs_bar/log b/pkg/app/testdata/testapply/delete_foo_when_foo_needs_bar/log index 3ad14826..38541ce3 100644 --- a/pkg/app/testdata/testapply/delete_foo_when_foo_needs_bar/log +++ b/pkg/app/testdata/testapply/delete_foo_when_foo_needs_bar/log @@ -57,12 +57,12 @@ GROUP RELEASES processing releases in group 1/1: default//bar UPDATED RELEASES: -NAME CHART VERSION DURATION -bar stable/mychart2 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +bar stable/mychart2 3.1.0 0s DELETED RELEASES: -NAME DURATION -foo 0s +NAME NAMESPACE DURATION +foo 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log index 7701e86e..e309756f 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log @@ -64,9 +64,9 @@ processing releases in group 2/2: default//foo getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: -NAME CHART VERSION DURATION -baz stable/mychart3 3.1.0 0s -bar stable/mychart2 3.1.0 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +baz stable/mychart3 3.1.0 0s +bar stable/mychart2 3.1.0 0s +foo stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log b/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log index 7701e86e..e309756f 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log @@ -64,9 +64,9 @@ processing releases in group 2/2: default//foo getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: -NAME CHART VERSION DURATION -baz stable/mychart3 3.1.0 0s -bar stable/mychart2 3.1.0 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +baz stable/mychart3 3.1.0 0s +bar stable/mychart2 3.1.0 0s +foo stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/install/log b/pkg/app/testdata/testapply/install/log index f5b2efc4..288e71a2 100644 --- a/pkg/app/testdata/testapply/install/log +++ b/pkg/app/testdata/testapply/install/log @@ -60,9 +60,9 @@ processing releases in group 2/2: default//foo getting deployed release version failed: unexpected list key: listkey(filter=^foo$,flags=--kube-context default --uninstalling --deployed --failed --pending) not found in UPDATED RELEASES: -NAME CHART VERSION DURATION -baz stable/mychart3 0s -bar stable/mychart2 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +baz stable/mychart3 0s +bar stable/mychart2 0s +foo stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/smoke/log b/pkg/app/testdata/testapply/smoke/log index cc88d88a..6ef2316c 100644 --- a/pkg/app/testdata/testapply/smoke/log +++ b/pkg/app/testdata/testapply/smoke/log @@ -171,19 +171,19 @@ processing releases in group 4/5: default//backend-v2 processing releases in group 5/5: default//frontend-v3 UPDATED RELEASES: -NAME CHART VERSION DURATION -logging charts/fluent-bit 3.1.0 0s -front-proxy stable/envoy 3.1.0 0s -database charts/mysql 3.1.0 0s -servicemesh charts/istio 3.1.0 0s -anotherbackend charts/anotherbackend 3.1.0 0s -backend-v2 charts/backend 3.1.0 0s -frontend-v3 charts/frontend 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +logging charts/fluent-bit 3.1.0 0s +front-proxy stable/envoy 3.1.0 0s +database charts/mysql 3.1.0 0s +servicemesh charts/istio 3.1.0 0s +anotherbackend charts/anotherbackend 3.1.0 0s +backend-v2 charts/backend 3.1.0 0s +frontend-v3 charts/frontend 3.1.0 0s DELETED RELEASES: -NAME DURATION -frontend-v1 0s -backend-v1 0s +NAME NAMESPACE DURATION +frontend-v1 0s +backend-v1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo,_with_ns_override/log b/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo,_with_ns_override/log index 2a2ffdaa..75c0b4ce 100644 --- a/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo,_with_ns_override/log +++ b/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo,_with_ns_override/log @@ -54,8 +54,8 @@ processing releases in group 2/2: default/testNamespace/bar getting deployed release version failed: Failed to get the version for: mychart2 UPDATED RELEASES: -NAME CHART VERSION DURATION -foo stable/mychart1 0s -bar stable/mychart2 0s +NAME NAMESPACE CHART VERSION DURATION +foo testNamespace stable/mychart1 0s +bar testNamespace stable/mychart2 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo/log b/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo/log index 8e990a5e..0854f6f9 100644 --- a/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo/log +++ b/pkg/app/testdata/testapply/upgrade_when_bar_needs_foo/log @@ -54,8 +54,8 @@ processing releases in group 2/2: default//bar getting deployed release version failed: Failed to get the version for: mychart2 UPDATED RELEASES: -NAME CHART VERSION DURATION -foo stable/mychart1 0s -bar stable/mychart2 0s +NAME NAMESPACE CHART VERSION DURATION +foo stable/mychart1 0s +bar stable/mychart2 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar,_with_ns_override/log b/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar,_with_ns_override/log index 43998afa..18819452 100644 --- a/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar,_with_ns_override/log +++ b/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar,_with_ns_override/log @@ -54,8 +54,8 @@ processing releases in group 2/2: default/testNamespace/foo getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: -NAME CHART VERSION DURATION -bar stable/mychart2 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +bar testNamespace stable/mychart2 0s +foo testNamespace stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar/log b/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar/log index c5b79d8d..38252743 100644 --- a/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar/log +++ b/pkg/app/testdata/testapply/upgrade_when_foo_needs_bar/log @@ -54,8 +54,8 @@ processing releases in group 2/2: default//foo getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: -NAME CHART VERSION DURATION -bar stable/mychart2 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +bar stable/mychart2 0s +foo stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_ns1/foo_needs_ns2/bar/log b/pkg/app/testdata/testapply/upgrade_when_ns1/foo_needs_ns2/bar/log index 8054e2f1..6f129537 100644 --- a/pkg/app/testdata/testapply/upgrade_when_ns1/foo_needs_ns2/bar/log +++ b/pkg/app/testdata/testapply/upgrade_when_ns1/foo_needs_ns2/bar/log @@ -58,8 +58,8 @@ processing releases in group 2/2: default/ns1/foo getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: -NAME CHART VERSION DURATION -bar stable/mychart2 0s -foo stable/mychart1 0s +NAME NAMESPACE CHART VERSION DURATION +bar ns2 stable/mychart2 0s +foo ns1 stable/mychart1 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrade_when_ns2/bar_needs_ns1/foo/log b/pkg/app/testdata/testapply/upgrade_when_ns2/bar_needs_ns1/foo/log index 42af0239..76015ef1 100644 --- a/pkg/app/testdata/testapply/upgrade_when_ns2/bar_needs_ns1/foo/log +++ b/pkg/app/testdata/testapply/upgrade_when_ns2/bar_needs_ns1/foo/log @@ -58,8 +58,8 @@ processing releases in group 2/2: default/ns2/bar getting deployed release version failed: Failed to get the version for: mychart2 UPDATED RELEASES: -NAME CHART VERSION DURATION -foo stable/mychart1 0s -bar stable/mychart2 0s +NAME NAMESPACE CHART VERSION DURATION +foo ns1 stable/mychart1 0s +bar ns2 stable/mychart2 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/upgrades_with_good_selector_with_--skip-needs=true/log b/pkg/app/testdata/testapply/upgrades_with_good_selector_with_--skip-needs=true/log index 2dc7d066..d1a55a90 100644 --- a/pkg/app/testdata/testapply/upgrades_with_good_selector_with_--skip-needs=true/log +++ b/pkg/app/testdata/testapply/upgrades_with_good_selector_with_--skip-needs=true/log @@ -82,8 +82,8 @@ processing releases in group 1/2: default/default/external-secrets processing releases in group 2/2: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/deduplicate_by_--selector/log b/pkg/app/testdata/testapply_2/deduplicate_by_--selector/log index 37a3336e..dfde4bdd 100644 --- a/pkg/app/testdata/testapply_2/deduplicate_by_--selector/log +++ b/pkg/app/testdata/testapply_2/deduplicate_by_--selector/log @@ -65,7 +65,7 @@ GROUP RELEASES processing releases in group 1/1: default/default/foo UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/include-transitive-needs=true/log b/pkg/app/testdata/testapply_2/include-transitive-needs=true/log index 819500c9..80fe6952 100644 --- a/pkg/app/testdata/testapply_2/include-transitive-needs=true/log +++ b/pkg/app/testdata/testapply_2/include-transitive-needs=true/log @@ -79,9 +79,9 @@ processing releases in group 2/3: default//serviceB processing releases in group 3/3: default//serviceA UPDATED RELEASES: -NAME CHART VERSION DURATION -serviceC my/chart 3.1.0 0s -serviceB my/chart 3.1.0 0s -serviceA my/chart 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +serviceC my/chart 3.1.0 0s +serviceB my/chart 3.1.0 0s +serviceA my/chart 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/select_single_release_from_helmfile_with_two_duplicates/log b/pkg/app/testdata/testapply_2/select_single_release_from_helmfile_with_two_duplicates/log index e7fee5f7..5aad40b2 100644 --- a/pkg/app/testdata/testapply_2/select_single_release_from_helmfile_with_two_duplicates/log +++ b/pkg/app/testdata/testapply_2/select_single_release_from_helmfile_with_two_duplicates/log @@ -69,7 +69,7 @@ GROUP RELEASES processing releases in group 1/1: default/default/foo UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log index 843004d5..0350fb56 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true/log @@ -87,9 +87,9 @@ processing releases in group 2/3: default/default/external-secrets processing releases in group 3/3: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -kubernetes-external-secrets incubator/raw 3.1.0 0s -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +kubernetes-external-secrets kube-system incubator/raw 3.1.0 0s +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log index 44a03326..2f1fa1f1 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log @@ -84,8 +84,8 @@ processing releases in group 1/2: default/default/external-secrets processing releases in group 2/2: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log index 11df52e6..c6a51f3c 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log @@ -95,13 +95,13 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne processing releases in group 2/2: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s DELETED RELEASES: -NAME DURATION -kubernetes-external-secrets 0s +NAME NAMESPACE DURATION +kubernetes-external-secrets kube-system 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log index dc8c1886..13ca54dd 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log @@ -89,8 +89,8 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne processing releases in group 2/2: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=true/log b/pkg/app/testdata/testapply_2/skip-needs=true/log index 2dc7d066..d1a55a90 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=true/log +++ b/pkg/app/testdata/testapply_2/skip-needs=true/log @@ -82,8 +82,8 @@ processing releases in group 1/2: default/default/external-secrets processing releases in group 2/2: default/default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log b/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log index 4b29fbd5..26968c1e 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=true_with_no_diff_on_a_release/log @@ -79,7 +79,7 @@ GROUP RELEASES processing releases in group 1/1: default/default/external-secrets UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log index a0bd7136..4193cc54 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true/log @@ -87,9 +87,9 @@ processing releases in group 2/3: default/external-secrets processing releases in group 3/3: default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -kubernetes-external-secrets incubator/raw 3.1.0 0s -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +kubernetes-external-secrets kube-system incubator/raw 3.1.0 0s +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log index 43131c53..1b585c5b 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log @@ -84,8 +84,8 @@ processing releases in group 1/2: default/external-secrets processing releases in group 2/2: default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log index 05f13848..84e5b96e 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log @@ -95,13 +95,13 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne processing releases in group 2/2: default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s DELETED RELEASES: -NAME DURATION -kubernetes-external-secrets 0s +NAME NAMESPACE DURATION +kubernetes-external-secrets kube-system 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log index 6bd806a6..3018fdfa 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log @@ -89,8 +89,8 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne processing releases in group 2/2: default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=true/log b/pkg/app/testdata/testapply_3/skip-needs=true/log index d3679939..e7200b58 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=true/log +++ b/pkg/app/testdata/testapply_3/skip-needs=true/log @@ -82,8 +82,8 @@ processing releases in group 1/2: default/external-secrets processing releases in group 2/2: default/my-release UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s -my-release incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s +my-release default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log b/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log index 5ecba242..0bb7dd4b 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=true_with_no_diff_on_a_release/log @@ -79,7 +79,7 @@ GROUP RELEASES processing releases in group 1/1: default/external-secrets UPDATED RELEASES: -NAME CHART VERSION DURATION -external-secrets incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +external-secrets default incubator/raw 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#01/log b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#01/log index fcb78684..fb797d3c 100644 --- a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#01/log +++ b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#01/log @@ -9,6 +9,6 @@ hook[presync] logs | foo hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 0s diff --git a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#02/log b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#02/log index 0910c2c2..fcd71882 100644 --- a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#02/log +++ b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook#02/log @@ -3,6 +3,6 @@ hook[presync] logs | foo hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 0s diff --git a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook/log b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook/log index 63f9f602..6eb18713 100644 --- a/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook/log +++ b/pkg/app/testdata/testapply_hooks/apply_release_with_preapply_hook/log @@ -3,6 +3,6 @@ hook[preapply] logs | foo hook[preapply] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 0s diff --git a/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_alreadyd_uninstalled_release/log b/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_alreadyd_uninstalled_release/log index 0a8b01ae..1b743d1b 100644 --- a/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_alreadyd_uninstalled_release/log +++ b/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_alreadyd_uninstalled_release/log @@ -12,6 +12,6 @@ hook[presync] logs | foo hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 3.1.0 0s diff --git a/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_disabled_release/log b/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_disabled_release/log index fcb78684..fb797d3c 100644 --- a/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_disabled_release/log +++ b/pkg/app/testdata/testapply_hooks/hooks_are_not_run_on_disabled_release/log @@ -9,6 +9,6 @@ hook[presync] logs | foo hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 0s diff --git a/pkg/app/testdata/testapply_hooks/hooks_are_run_on_enabled_release/log b/pkg/app/testdata/testapply_hooks/hooks_are_run_on_enabled_release/log index 06f6a1da..8f04cb37 100644 --- a/pkg/app/testdata/testapply_hooks/hooks_are_run_on_enabled_release/log +++ b/pkg/app/testdata/testapply_hooks/hooks_are_run_on_enabled_release/log @@ -18,7 +18,7 @@ hook[presync] logs | bar hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 0s -bar incubator/raw 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 0s +bar default incubator/raw 0s diff --git a/pkg/app/testdata/testapply_hooks/hooks_are_run_on_to-be-uninstalled_release/log b/pkg/app/testdata/testapply_hooks/hooks_are_run_on_to-be-uninstalled_release/log index be54e3f5..66c1277b 100644 --- a/pkg/app/testdata/testapply_hooks/hooks_are_run_on_to-be-uninstalled_release/log +++ b/pkg/app/testdata/testapply_hooks/hooks_are_run_on_to-be-uninstalled_release/log @@ -15,11 +15,11 @@ hook[presync] logs | foo hook[presync] logs | UPDATED RELEASES: -NAME CHART VERSION DURATION -foo incubator/raw 3.1.0 0s +NAME NAMESPACE CHART VERSION DURATION +foo default incubator/raw 3.1.0 0s DELETED RELEASES: -NAME DURATION -bar 0s +NAME NAMESPACE DURATION +bar default 0s diff --git a/pkg/app/testdata/testdestroy/destroy_installed_but_disabled_release/log b/pkg/app/testdata/testdestroy/destroy_installed_but_disabled_release/log new file mode 100644 index 00000000..e7d3352d --- /dev/null +++ b/pkg/app/testdata/testdestroy/destroy_installed_but_disabled_release/log @@ -0,0 +1,54 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +2 release(s) found in helmfile.yaml + +processing 2 groups of releases in this order: +GROUP RELEASES +1 default//frontend-v1 +2 default//backend-v1 + +processing releases in group 1/2: default//frontend-v1 +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/2: default//backend-v1 +release "backend-v1" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v1 0s +backend-v1 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log b/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log new file mode 100644 index 00000000..b3ea59f1 --- /dev/null +++ b/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log @@ -0,0 +1,139 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +1 release(s) matching name=logging found in helmfile.yaml + +processing 1 groups of releases in this order: +GROUP RELEASES +1 default//logging + +processing releases in group 1/1: default//logging +release "logging" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +logging 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy/helm3/log b/pkg/app/testdata/testdestroy/helm3/log new file mode 100644 index 00000000..e7d3352d --- /dev/null +++ b/pkg/app/testdata/testdestroy/helm3/log @@ -0,0 +1,54 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +2 release(s) found in helmfile.yaml + +processing 2 groups of releases in this order: +GROUP RELEASES +1 default//frontend-v1 +2 default//backend-v1 + +processing releases in group 1/2: default//frontend-v1 +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/2: default//backend-v1 +release "backend-v1" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v1 0s +backend-v1 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy/smoke/log b/pkg/app/testdata/testdestroy/smoke/log new file mode 100644 index 00000000..13a80305 --- /dev/null +++ b/pkg/app/testdata/testdestroy/smoke/log @@ -0,0 +1,166 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +10 release(s) found in helmfile.yaml + +processing 5 groups of releases in this order: +GROUP RELEASES +1 default//frontend-v3, default//frontend-v2, default//frontend-v1 +2 default//backend-v2, default//backend-v1 +3 default//anotherbackend +4 default//servicemesh, default//database +5 default//front-proxy, default//logging + +processing releases in group 1/5: default//frontend-v3, default//frontend-v2, default//frontend-v1 +release "frontend-v3" processed +release "frontend-v2" processed +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/5: default//backend-v2, default//backend-v1 +release "backend-v2" processed +release "backend-v1" processed +processing releases in group 3/5: default//anotherbackend +release "anotherbackend" processed +processing releases in group 4/5: default//servicemesh, default//database +release "servicemesh" processed +release "database" processed +processing releases in group 5/5: default//front-proxy, default//logging +release "front-proxy" processed +release "logging" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v3 0s +frontend-v2 0s +frontend-v1 0s +backend-v2 0s +backend-v1 0s +anotherbackend 0s +servicemesh 0s +database 0s +front-proxy 0s +logging 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy_2/destroy_installed_but_disabled_release/log b/pkg/app/testdata/testdestroy_2/destroy_installed_but_disabled_release/log new file mode 100644 index 00000000..04b1ccfd --- /dev/null +++ b/pkg/app/testdata/testdestroy_2/destroy_installed_but_disabled_release/log @@ -0,0 +1,54 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +2 release(s) found in helmfile.yaml + +processing 2 groups of releases in this order: +GROUP RELEASES +1 frontend-v1 +2 backend-v1 + +processing releases in group 1/2: frontend-v1 +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/2: backend-v1 +release "backend-v1" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v1 0s +backend-v1 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log b/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log new file mode 100644 index 00000000..917d5684 --- /dev/null +++ b/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log @@ -0,0 +1,139 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +1 release(s) matching name=logging found in helmfile.yaml + +processing 1 groups of releases in this order: +GROUP RELEASES +1 logging + +processing releases in group 1/1: logging +release "logging" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +logging 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy_2/helm3/log b/pkg/app/testdata/testdestroy_2/helm3/log new file mode 100644 index 00000000..04b1ccfd --- /dev/null +++ b/pkg/app/testdata/testdestroy_2/helm3/log @@ -0,0 +1,54 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: backend-v1 + 3: chart: charts/backend + 4: installed: false + 5: - name: frontend-v1 + 6: chart: charts/frontend + 7: needs: + 8: - backend-v1 + 9: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +2 release(s) found in helmfile.yaml + +processing 2 groups of releases in this order: +GROUP RELEASES +1 frontend-v1 +2 backend-v1 + +processing releases in group 1/2: frontend-v1 +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/2: backend-v1 +release "backend-v1" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v1 0s +backend-v1 0s + +changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testdestroy_2/smoke/log b/pkg/app/testdata/testdestroy_2/smoke/log new file mode 100644 index 00000000..d4fd6427 --- /dev/null +++ b/pkg/app/testdata/testdestroy_2/smoke/log @@ -0,0 +1,166 @@ +processing file "helmfile.yaml" in directory "." +changing working directory to "/path/to" +first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= +first-pass uses: &{default map[] map[]} +first-pass rendering output of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +first-pass produced: &{default map[] map[]} +first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} +vals: +map[] +defaultVals:[] +second-pass rendering result of "helmfile.yaml.part.0": + 0: + 1: releases: + 2: - name: database + 3: chart: charts/mysql + 4: needs: + 5: - logging + 6: - name: frontend-v1 + 7: chart: charts/frontend + 8: installed: false + 9: needs: +10: - servicemesh +11: - logging +12: - backend-v1 +13: - name: frontend-v2 +14: chart: charts/frontend +15: needs: +16: - servicemesh +17: - logging +18: - backend-v2 +19: - name: frontend-v3 +20: chart: charts/frontend +21: needs: +22: - servicemesh +23: - logging +24: - backend-v2 +25: - name: backend-v1 +26: chart: charts/backend +27: installed: false +28: needs: +29: - servicemesh +30: - logging +31: - database +32: - anotherbackend +33: - name: backend-v2 +34: chart: charts/backend +35: needs: +36: - servicemesh +37: - logging +38: - database +39: - anotherbackend +40: - name: anotherbackend +41: chart: charts/anotherbackend +42: needs: +43: - servicemesh +44: - logging +45: - database +46: - name: servicemesh +47: chart: charts/istio +48: needs: +49: - logging +50: - name: logging +51: chart: charts/fluent-bit +52: - name: front-proxy +53: chart: stable/envoy +54: + +merged environment: &{default map[] map[]} +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +10 release(s) found in helmfile.yaml + +processing 5 groups of releases in this order: +GROUP RELEASES +1 frontend-v3, frontend-v2, frontend-v1 +2 backend-v2, backend-v1 +3 anotherbackend +4 servicemesh, database +5 front-proxy, logging + +processing releases in group 1/5: frontend-v3, frontend-v2, frontend-v1 +release "frontend-v3" processed +release "frontend-v2" processed +WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs +release "frontend-v1" processed +processing releases in group 2/5: backend-v2, backend-v1 +release "backend-v2" processed +release "backend-v1" processed +processing releases in group 3/5: anotherbackend +release "anotherbackend" processed +processing releases in group 4/5: servicemesh, database +release "servicemesh" processed +release "database" processed +processing releases in group 5/5: front-proxy, logging +release "front-proxy" processed +release "logging" processed + +DELETED RELEASES: +NAME NAMESPACE DURATION +frontend-v3 0s +frontend-v2 0s +frontend-v1 0s +backend-v2 0s +backend-v1 0s +anotherbackend 0s +servicemesh 0s +database 0s +front-proxy 0s +logging 0s + +changing working directory back to "/path/to" diff --git a/pkg/state/state.go b/pkg/state/state.go index 6829def0..45d28017 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -3282,6 +3282,7 @@ func (ar *AffectedReleases) DisplayAffectedReleases(logger *zap.SugaredLogger) { if ar.Upgraded != nil && len(ar.Upgraded) > 0 { logger.Info("\nUPDATED RELEASES:") tbl, _ := prettytable.NewTable(prettytable.Column{Header: "NAME"}, + prettytable.Column{Header: "NAMESPACE", MinWidth: 6}, prettytable.Column{Header: "CHART", MinWidth: 6}, prettytable.Column{Header: "VERSION", MinWidth: 6}, prettytable.Column{Header: "DURATION", AlignRight: true}, @@ -3293,7 +3294,7 @@ func (ar *AffectedReleases) DisplayAffectedReleases(logger *zap.SugaredLogger) { logger.Warn("Could not modify chart credentials, %v", modErr) continue } - err := tbl.AddRow(release.Name, modifiedChart, release.installedVersion, release.duration.Round(time.Second)) + err := tbl.AddRow(release.Name, release.Namespace, modifiedChart, release.installedVersion, release.duration.Round(time.Second)) if err != nil { logger.Warn("Could not add row, %v", err) } @@ -3303,11 +3304,12 @@ func (ar *AffectedReleases) DisplayAffectedReleases(logger *zap.SugaredLogger) { if ar.Deleted != nil && len(ar.Deleted) > 0 { logger.Info("\nDELETED RELEASES:") tbl, _ := prettytable.NewTable(prettytable.Column{Header: "NAME"}, + prettytable.Column{Header: "NAMESPACE", MinWidth: 6}, prettytable.Column{Header: "DURATION", AlignRight: true}, ) tbl.Separator = " " for _, release := range ar.Deleted { - err := tbl.AddRow(release.Name, release.duration.Round(time.Second)) + err := tbl.AddRow(release.Name, release.Namespace, release.duration.Round(time.Second)) if err != nil { logger.Warn("Could not add row, %v", err) } @@ -3317,13 +3319,14 @@ func (ar *AffectedReleases) DisplayAffectedReleases(logger *zap.SugaredLogger) { if ar.Failed != nil && len(ar.Failed) > 0 { logger.Info("\nFAILED RELEASES:") tbl, _ := prettytable.NewTable(prettytable.Column{Header: "NAME"}, + prettytable.Column{Header: "NAMESPACE", MinWidth: 6}, prettytable.Column{Header: "CHART", MinWidth: 6}, prettytable.Column{Header: "VERSION", MinWidth: 6}, prettytable.Column{Header: "DURATION", AlignRight: true}, ) tbl.Separator = " " for _, release := range ar.Failed { - err := tbl.AddRow(release.Name, release.Chart, release.installedVersion, release.duration.Round(time.Second)) + err := tbl.AddRow(release.Name, release.Namespace, release.Chart, release.installedVersion, release.duration.Round(time.Second)) if err != nil { logger.Warn("Could not add row, %v", err) }