Skip to content

Commit 610d0b0

Browse files
committed
BUILD/MINOR: update client native and config parser
1 parent 6af4ea7 commit 610d0b0

File tree

9 files changed

+55
-72
lines changed

9 files changed

+55
-72
lines changed

crs/api/ingress/v1/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// +genclient
2424
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
25-
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
25+
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.2"
2626

2727
// Backend is a specification for a Backend resource
2828
type Backend struct {

crs/api/ingress/v1/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// +genclient
2424
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
25-
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
25+
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.2"
2626

2727
// Defaults is a specification for a Defaults resource
2828
type Defaults struct {

crs/api/ingress/v1/global.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
// +genclient
2424
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
25-
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
25+
// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.1.2"
2626
// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.default_path)", message="spec.config.default_path is set by ingress controller internally"
2727
// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.master__dash__worker)", message="spec.config.master-worker is set by ingress controller internally"
2828
// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.pidfile)", message="spec.config.pidfile is set by ingress controller internally"

crs/code-generator.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ set -o errexit
44
set -o nounset
55
set -o pipefail
66

7+
# set client native version
8+
client_native_version=$(go list -m -f "{{.Version}}" github.com/haproxytech/client-native/v5)
9+
echo "Client Native Version: $client_native_version"
10+
for file in crs/api/ingress/v1/*.go; do
11+
echo "$file"
12+
# Use sed to replace the version string in Go files with the new version
13+
sed -i "s@// +kubebuilder:metadata:annotations=\"haproxy.org/client-native=.*\"@// +kubebuilder:metadata:annotations=\"haproxy.org/client-native=$client_native_version\"@" $file
14+
done
15+
716
# code-generator build native, versioned clients, informers and other helpers
817
# via Kubernetes code generators from k8s.oi/code-generator
918

crs/definition/ingress.v1.haproxy.org_backends.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.14.0
7-
haproxy.org/client-native: v5.0.3
7+
haproxy.org/client-native: v5.1.2
88
name: backends.ingress.v1.haproxy.org
99
spec:
1010
group: ingress.v1.haproxy.org

crs/definition/ingress.v1.haproxy.org_defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.14.0
7-
haproxy.org/client-native: v5.0.3
7+
haproxy.org/client-native: v5.1.2
88
name: defaults.ingress.v1.haproxy.org
99
spec:
1010
group: ingress.v1.haproxy.org

crs/definition/ingress.v1.haproxy.org_globals.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.14.0
7-
haproxy.org/client-native: v5.0.3
7+
haproxy.org/client-native: v5.1.2
88
name: globals.ingress.v1.haproxy.org
99
spec:
1010
group: ingress.v1.haproxy.org

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ require (
99
github.com/google/renameio v1.0.1
1010
github.com/haproxytech/client-native/v2 v2.5.2-0.20220126142624-4a2781a21376
1111
github.com/haproxytech/client-native/v3 v3.1.2-0.20230607075433-231591da68ed
12-
github.com/haproxytech/client-native/v5 v5.0.1-0.20231214070453-941d3ccaf919
13-
github.com/haproxytech/config-parser/v5 v5.0.1-0.20231205133436-67d880c8f163
12+
github.com/haproxytech/client-native/v5 v5.1.2
13+
github.com/haproxytech/config-parser/v5 v5.1.0
1414
github.com/jessevdk/go-flags v1.4.0
1515
github.com/pires/go-proxyproto v0.7.0
1616
github.com/prometheus/client_golang v1.17.0
1717
github.com/stretchr/testify v1.8.4
1818
github.com/valyala/fasthttp v1.50.0
1919
go.uber.org/automaxprocs v1.5.3
20-
gopkg.in/yaml.v2 v2.4.0
2120
k8s.io/api v0.29.1
2221
k8s.io/apiextensions-apiserver v0.29.1
2322
k8s.io/apimachinery v0.29.1
@@ -38,22 +37,22 @@ require (
3837
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3938
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
4039
github.com/go-logr/logr v1.3.0 // indirect
41-
github.com/go-openapi/analysis v0.21.4 // indirect
42-
github.com/go-openapi/errors v0.20.4 // indirect
43-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
44-
github.com/go-openapi/jsonreference v0.20.2 // indirect
45-
github.com/go-openapi/loads v0.21.2 // indirect
46-
github.com/go-openapi/spec v0.20.11 // indirect
47-
github.com/go-openapi/strfmt v0.21.8 // indirect
48-
github.com/go-openapi/swag v0.22.4 // indirect
49-
github.com/go-openapi/validate v0.22.3 // indirect
40+
github.com/go-openapi/analysis v0.22.0 // indirect
41+
github.com/go-openapi/errors v0.21.0 // indirect
42+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
43+
github.com/go-openapi/jsonreference v0.20.4 // indirect
44+
github.com/go-openapi/loads v0.21.3 // indirect
45+
github.com/go-openapi/spec v0.20.13 // indirect
46+
github.com/go-openapi/strfmt v0.21.10 // indirect
47+
github.com/go-openapi/swag v0.22.6 // indirect
48+
github.com/go-openapi/validate v0.22.4 // indirect
5049
github.com/gofrs/flock v0.8.1 // indirect
5150
github.com/gogo/protobuf v1.3.2 // indirect
5251
github.com/golang/protobuf v1.5.3 // indirect
5352
github.com/google/gnostic-models v0.6.8 // indirect
5453
github.com/google/go-cmp v0.6.0 // indirect
5554
github.com/google/gofuzz v1.2.0 // indirect
56-
github.com/google/uuid v1.4.0 // indirect
55+
github.com/google/uuid v1.5.0 // indirect
5756
github.com/haproxytech/go-logger v1.1.0 // indirect
5857
github.com/imdario/mergo v0.3.16 // indirect
5958
github.com/josharian/intern v1.0.0 // indirect
@@ -75,7 +74,7 @@ require (
7574
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
7675
github.com/spf13/pflag v1.0.5 // indirect
7776
github.com/valyala/bytebufferpool v1.0.0 // indirect
78-
go.mongodb.org/mongo-driver v1.13.0 // indirect
77+
go.mongodb.org/mongo-driver v1.13.1 // indirect
7978
go.uber.org/zap v1.26.0 // indirect
8079
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
8180
golang.org/x/net v0.19.0 // indirect
@@ -87,6 +86,7 @@ require (
8786
google.golang.org/appengine v1.6.8 // indirect
8887
google.golang.org/protobuf v1.31.0 // indirect
8988
gopkg.in/inf.v0 v0.9.1 // indirect
89+
gopkg.in/yaml.v2 v2.4.0 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
9191
k8s.io/klog/v2 v2.110.1 // indirect
9292
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect

0 commit comments

Comments
 (0)