kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 10:15:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Go 1.18 compatibility updates

Browse Source
This commit is contained in:
Katrina Verey
2022-03-28 17:35:38 -04:00
parent c94b5d8f25
commit 5c359bda28
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -55,17 +55,17 @@ verify-kustomize-e2e: test-examples-e2e-kustomize
# This installs what kustomize wants to use.
$(MYGOBIN)/golangci-lint-kustomize:
rm -f $(CURDIR)/hack/golangci-lint
GOBIN=$(CURDIR)/hack go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8
GOBIN=$(CURDIR)/hack go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
mv $(CURDIR)/hack/golangci-lint $(MYGOBIN)/golangci-lint-kustomize
$(MYGOBIN)/mdrip:
go install github.com/monopole/mdrip@v1.0.2
$(MYGOBIN)/stringer:
go get golang.org/x/tools/cmd/stringer
go install golang.org/x/tools/cmd/stringer@latest
$(MYGOBIN)/goimports:
go get golang.org/x/tools/cmd/goimports
go install golang.org/x/tools/cmd/goimports@latest
# Build from local source.
$(MYGOBIN)/gorepomod:

12
api/krusty/disablenamesuffix_test.go
View File

@@ -82,8 +82,7 @@ metadata:
secret := findSecret(m, "")
if secret == nil {
t.Errorf("Expected to find a Secret")
}
if secret.GetName() != "foo-secret-bar-82c2g5f8f6" {
} else if secret.GetName() != "foo-secret-bar-82c2g5f8f6" {
t.Errorf("unexpected secret resource name: %s", secret.GetName())
}
@@ -95,8 +94,7 @@ metadata:
secret = findSecret(m, "")
if secret == nil {
t.Errorf("Expected to find a Secret")
}
if secret.GetName() != "foo-secret-bar" { // No hash at end.
} else if secret.GetName() != "foo-secret-bar" { // No hash at end.
t.Errorf("unexpected secret resource name: %s", secret.GetName())
}
}
@@ -131,16 +129,14 @@ secretGenerator:
secret := findSecret(m, "nohash")
if secret == nil {
t.Errorf("Expected to find a Secret")
}
if secret.GetName() != "nohash" {
} else if secret.GetName() != "nohash" {
t.Errorf("unexpected secret resource name: %s", secret.GetName())
}
secret = findSecret(m, "yeshash")
if secret == nil {
t.Errorf("Expected to find a Secret")
}
if secret.GetName() != "yeshash-82c2g5f8f6" {
} else if secret.GetName() != "yeshash-82c2g5f8f6" {
t.Errorf("unexpected secret resource name: %s", secret.GetName())
}
}

2
hack/testExamplesAgainstKustomize.sh
View File

@@ -22,7 +22,7 @@ rm -f $MYGOBIN/kustomize
if [ "$version" == "HEAD" ]; then
(cd kustomize; go install .)
else
GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/${version}
GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/${version}
fi
# TODO: change the label?