Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: support go1.22 #31

Merged
merged 1 commit into from
Mar 6, 2024
Merged

build: support go1.22 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(GENERATED): $(CRD_TYPE_SOURCE)
bash -x ./hack/update-codegen.sh

$(GENERATED_CRD): go.mod $(GENERATED)
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 paths=./apis/... output:crd:dir=.
go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 crd:crdVersions=v1 paths=./apis/... output:crd:dir=.
# workaround to add pattern to array items. Not supported by controller-gen
# ref: https://github.com/kubernetes-sigs/controller-tools/issues/342
perl -i -p0e 's|(\s*)(hosts:.*?items:)|$$1$$2$$1 pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*\$$"|sg' $(GENERATED_CRD)
Expand Down
2 changes: 1 addition & 1 deletion apis/zalando.org/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ type RouteGroupRouteSpec struct {
// +k8s:deepcopy-gen=true
type RouteGroupTLSSpec struct {
// TLS hosts specify the list of hosts included in the TLS secret.
// The values in this list must match the host name(s) used for
// The values in this list must match the host name(s) used for
// the RouteGroup in order to terminate TLS for the host(s).
// +kubebuilder:validation:MinItems=1
Hosts []string `json:"hosts"`
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ go 1.15

require (
github.com/davecgh/go-spew v1.1.1
github.com/onsi/ginkgo v1.16.5 // indirect
k8s.io/apimachinery v0.25.16
k8s.io/client-go v0.25.16
k8s.io/code-generator v0.25.16
sigs.k8s.io/controller-tools v0.10.0
sigs.k8s.io/yaml v1.3.0 // indirect
)