Skip to content

Commit 7980c08

Browse files
authored
Bump kapp to v0.55.0 (#1125)
* Bump kapp to v0.55.0 Signed-off-by: Praveen Rewar <[email protected]> * Update kapp error message in tests With kapp v0.55.0 we display the usefulErrorMessage as part of the error. Signed-off-by: Praveen Rewar <[email protected]> --------- Signed-off-by: Praveen Rewar <[email protected]>
1 parent 039ce70 commit 7980c08

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

hack/dependencies.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
version: v0.36.4
2323
- checksums:
2424
darwin:
25-
amd64: d3bf8bc733ed781ca5371ee6de008cb7682731995f1a9fb7748d2b21a6e7a9ff
25+
amd64: dcbf6dd9b4cecfc6316391029a6e9a5f3863e6a1f7848eb5fb78bfdbdc06faf8
2626
linux:
27-
amd64: 6b53e0d866fb3cdcb781475c23973eab6c37959e53c22094bc81f998884d74ae
28-
arm64: 9b4c8c0d718a0655acfc37a7df04450a3caa6126facfe301cd479466e20f954f
27+
amd64: 9aaa735985efbe240af0ca1d80adf3b43be6cf4ec6620a053082e31bea25dae7
28+
arm64: 944fdfebfdf1026d318609cc706bad454196f0b1d76e557b56c829b0e6165a9f
2929
dev: true
3030
name: kapp
3131
repo: vmware-tanzu/carvel-kapp
3232
urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}}
33-
version: v0.54.3
33+
version: v0.55.0
3434
- checksums:
3535
darwin:
3636
amd64: 33c9654e6e5e865f45f411bf45ea12e28590fdcb43961f758b6d3b28be4c1caf

test/e2e/kappcontroller/service_account_test.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
1110
"github.com/vmware-tanzu/carvel-kapp-controller/test/e2e"
12-
"sigs.k8s.io/yaml"
1311
)
1412

1513
func TestServiceAccountNotAllowed(t *testing.T) {
@@ -86,23 +84,10 @@ spec:
8684
t.Fatalf("Expected err, but was nil")
8785
}
8886

89-
if !strings.Contains(err.Error(), "Reconcile failed: (message: Deploying: Error (see .status.usefulErrorMessage for details))") {
90-
t.Fatalf("Expected err to contain service account failure, but was: %s", err)
91-
}
92-
93-
out := kapp.Run([]string{"inspect", "-a", name, "--raw", "--tty=false", "--filter-kind=App"})
94-
95-
var cr v1alpha1.App
96-
97-
err = yaml.Unmarshal([]byte(out), &cr)
98-
if err != nil {
99-
t.Fatalf("Failed to unmarshal: %s", err)
100-
}
101-
10287
expectedErr := `cannot get resource "configmaps" in API group "" in the namespace "kube-system" (reason: Forbidden)`
10388

104-
if !strings.Contains(cr.Status.Deploy.Stderr, expectedErr) {
105-
t.Fatalf("Expected forbidden error in deploy output, but was: %#v", cr.Status.Deploy)
89+
if !strings.Contains(err.Error(), expectedErr) {
90+
t.Fatalf("Expected forbidden error in deploy output, but was: %s", err.Error())
10691
}
10792
})
10893

0 commit comments

Comments
 (0)