Skip to content

Commit

Permalink
Merge pull request #17 from six-group/upgarde-to-haproxy-parser-v5
Browse files Browse the repository at this point in the history 
Upgrade to haproxy parser/client v5
  • Loading branch information
@snorwin
snorwin committed Jan 2, 2024
2 parents ed3b047 + 9f6dff0 commit bd6f652
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 137 deletions.
6 changes: 3 additions & 3 deletions apis/config/v1alpha1/backend_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strings"

"github.com/go-openapi/strfmt"
"github.com/haproxytech/client-native/v4/configuration"
"github.com/haproxytech/client-native/v4/models"
parser "github.com/haproxytech/config-parser/v4"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
parser "github.com/haproxytech/config-parser/v5"
"github.com/six-group/haproxy-operator/pkg/hash"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
Expand Down
2 changes: 1 addition & 1 deletion apis/config/v1alpha1/backend_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"k8s.io/utils/ptr"

parser "github.com/haproxytech/config-parser/v4"
parser "github.com/haproxytech/config-parser/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
Expand Down
6 changes: 3 additions & 3 deletions apis/config/v1alpha1/common_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

"github.com/go-openapi/strfmt"
"github.com/haproxytech/client-native/v4/configuration"
"github.com/haproxytech/client-native/v4/models"
parser "github.com/haproxytech/config-parser/v4"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
parser "github.com/haproxytech/config-parser/v5"
"github.com/six-group/haproxy-operator/pkg/defaults"
"github.com/six-group/haproxy-operator/pkg/hash"
corev1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions apis/config/v1alpha1/frontend_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strings"

"github.com/go-openapi/strfmt"
"github.com/haproxytech/client-native/v4/configuration"
"github.com/haproxytech/client-native/v4/models"
parser "github.com/haproxytech/config-parser/v4"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
parser "github.com/haproxytech/config-parser/v5"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
Expand Down
2 changes: 1 addition & 1 deletion apis/config/v1alpha1/frontend_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

parser "github.com/haproxytech/config-parser/v4"
parser "github.com/haproxytech/config-parser/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion apis/config/v1alpha1/listen_types.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
parser "github.com/haproxytech/config-parser/v4"
parser "github.com/haproxytech/config-parser/v5"
"go.uber.org/multierr"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/config/v1alpha1/listen_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1_test
import (
"time"

parser "github.com/haproxytech/config-parser/v4"
parser "github.com/haproxytech/config-parser/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
Expand Down
6 changes: 3 additions & 3 deletions apis/config/v1alpha1/resolver_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package v1alpha1

import (
"github.com/go-openapi/strfmt"
"github.com/haproxytech/client-native/v4/configuration"
"github.com/haproxytech/client-native/v4/models"
parser "github.com/haproxytech/config-parser/v4"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
parser "github.com/haproxytech/config-parser/v5"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/config/v1alpha1/resolver_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1_test
import (
"time"

parser "github.com/haproxytech/config-parser/v4"
parser "github.com/haproxytech/config-parser/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
Expand Down
8 changes: 4 additions & 4 deletions apis/proxy/v1alpha1/instance_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"time"

"github.com/go-openapi/strfmt"
"github.com/haproxytech/client-native/v4/configuration"
"github.com/haproxytech/client-native/v4/models"
parser "github.com/haproxytech/config-parser/v4"
"github.com/haproxytech/config-parser/v4/options"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
parser "github.com/haproxytech/config-parser/v5"
"github.com/haproxytech/config-parser/v5/options"
routev1 "github.com/openshift/api/route/v1"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions controllers/instance/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"strings"

haproxy "github.com/haproxytech/client-native/v4/configuration/options"
parser "github.com/haproxytech/config-parser/v4"
haproxy "github.com/haproxytech/client-native/v5/configuration/options"
parser "github.com/haproxytech/config-parser/v5"
configv1alpha1 "github.com/six-group/haproxy-operator/apis/config/v1alpha1"
proxyv1alpha1 "github.com/six-group/haproxy-operator/apis/proxy/v1alpha1"
"github.com/six-group/haproxy-operator/pkg/defaults"
Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21
require (
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/strfmt v0.22.0
github.com/haproxytech/client-native/v4 v4.1.7
github.com/haproxytech/config-parser/v4 v4.1.2
github.com/haproxytech/client-native/v5 v5.1.0
github.com/haproxytech/config-parser/v5 v5.1.0
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.30.0
github.com/openshift/api v0.0.0-20231117205818-971e4ba78c9a // latest commit of branch https://github.com/openshift/api/tree/release-4.14
Expand Down Expand Up @@ -34,12 +34,12 @@ require (
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.21.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.21.2 // indirect
github.com/go-openapi/spec v0.20.8 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
github.com/go-openapi/spec v0.20.11 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/validate v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand Down Expand Up @@ -71,13 +71,13 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.mongodb.org/mongo-driver v1.13.1 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.0 // indirect
golang.org/x/tools v0.16.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
Expand Down
Loading

0 comments on commit bd6f652

Please sign in to comment.