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.

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

chore(deps): update dependency go to v1.23.2 #388

Merged
merged 5 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
VERSION 0.8
FROM golang:1.22
FROM golang:1.23
ARG --global DOCKER_REPO=ghcr.io/stackitcloud/yawol/
ARG --global BINPATH=/usr/local/bin/
ARG --global GOCACHE=/go-cache

ARG --global ENVOY_VERSION=v1.27.0
ARG --global HELM_VERSION=3.12.3
ARG --global GOLANGCI_LINT_VERSION=v1.54.2
ARG --global GOLANGCI_LINT_VERSION=v1.61.0
ARG --global PACKER_VERSION=1.9
ARG --global TERRAFORM_VERSION=1.4.6

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ var _ = Describe("Check loadbalancer reconcile", Serial, Ordered, func() {
if err != nil {
return err
}
if lb.Spec.Endpoints == nil || len(lb.Spec.Endpoints) == 0 {
if len(lb.Spec.Endpoints) == 0 {
return nil
}
return helper.ErrEndpointsFound
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ var _ = Describe("loadbalancer controller", Serial, Ordered, func() {

It("should up- and downscale loadbalancer machines", func() {
By("waiting for lb and lbset creation")
hopefully(lbNN, func(g Gomega, act LB) error {
hopefully(lbNN, func(g Gomega, _ LB) error {
var lbsetList yawolv1beta1.LoadBalancerSetList
g.Expect(k8sClient.List(ctx, &lbsetList, client.MatchingLabels(lb.Spec.Selector.MatchLabels))).Should(Succeed())
g.Expect(len(lbsetList.Items)).Should(Equal(1))
Expand Down Expand Up @@ -703,29 +703,29 @@ var _ = Describe("loadbalancer controller", Serial, Ordered, func() {
When("openstack is not working", func() {
BeforeEach(func() {
mockClient.GroupClientObj = &testing.CallbackGroupClient{
ListFunc: func(ctx context.Context, opts groups.ListOpts) ([]groups.SecGroup, error) {
ListFunc: func(_ context.Context, _ groups.ListOpts) ([]groups.SecGroup, error) {
return []groups.SecGroup{}, gophercloud.ErrDefault401{
ErrUnexpectedResponseCode: gophercloud.ErrUnexpectedResponseCode{
Body: []byte("Auth failed"),
},
}
},
GetFunc: func(ctx context.Context, id string) (*groups.SecGroup, error) {
GetFunc: func(_ context.Context, _ string) (*groups.SecGroup, error) {
return nil, gophercloud.ErrDefault401{
ErrUnexpectedResponseCode: gophercloud.ErrUnexpectedResponseCode{
Body: []byte("Auth failed"),
},
}
},
CreateFunc: func(ctx context.Context, opts groups.CreateOptsBuilder) (*groups.SecGroup, error) {
CreateFunc: func(_ context.Context, _ groups.CreateOptsBuilder) (*groups.SecGroup, error) {
return nil, gophercloud.ErrDefault401{}
},
DeleteFunc: func(ctx context.Context, id string) error {
DeleteFunc: func(_ context.Context, _ string) error {
return gophercloud.ErrDefault401{}
},
}
mockClient.FipClientObj = &testing.CallbackFipClient{
GetFunc: func(ctx context.Context, id string) (*floatingips.FloatingIP, error) {
GetFunc: func(_ context.Context, _ string) (*floatingips.FloatingIP, error) {
return nil, gophercloud.ErrDefault403{}
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ var _ = Describe("load balancer machine", Serial, Ordered, func() {
When("openstack is not working", func() {
BeforeEach(func() {
client.ServerClientObj = &testing.CallbackServerClient{
CreateFunc: func(ctx context.Context, opts servers.CreateOptsBuilder) (*servers.Server, error) {
CreateFunc: func(_ context.Context, _ servers.CreateOptsBuilder) (*servers.Server, error) {
return &servers.Server{}, gophercloud.ErrDefault403{
ErrUnexpectedResponseCode: gophercloud.ErrUnexpectedResponseCode{
BaseError: gophercloud.BaseError{},
Expand All @@ -207,13 +207,13 @@ var _ = Describe("load balancer machine", Serial, Ordered, func() {
},
}
},
ListFunc: func(ctx context.Context, opts servers.ListOptsBuilder) ([]servers.Server, error) {
ListFunc: func(_ context.Context, _ servers.ListOptsBuilder) ([]servers.Server, error) {
return []servers.Server{{}}, nil
},
GetFunc: func(ctx context.Context, id string) (*servers.Server, error) {
GetFunc: func(_ context.Context, _ string) (*servers.Server, error) {
return &servers.Server{}, nil
},
DeleteFunc: func(ctx context.Context, id string) error {
DeleteFunc: func(_ context.Context, _ string) error {
return nil
},
}
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/stackitcloud/yawol

go 1.22.0

toolchain go1.22.6
go 1.23.2

require (
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78
Expand Down
6 changes: 3 additions & 3 deletions internal/envoystatus/envoystatus.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ func (c *Config) GetCurrentStats() ([]yawolv1beta1.LoadBalancerMachineMetric, er
return []yawolv1beta1.LoadBalancerMachineMetric{}, err
}

return parseEnvoyMetricsToLoadBalancerMachineMetrics(string(body))
return parseEnvoyMetricsToLoadBalancerMachineMetrics(string(body)), nil
}

// parseEnvoyMetricsToLoadBalancerMachineMetrics returns a LoadBalancerMachineMetric for Envoy
func parseEnvoyMetricsToLoadBalancerMachineMetrics(envoyMetrics string) ([]yawolv1beta1.LoadBalancerMachineMetric, error) {
func parseEnvoyMetricsToLoadBalancerMachineMetrics(envoyMetrics string) []yawolv1beta1.LoadBalancerMachineMetric {
var metrics []yawolv1beta1.LoadBalancerMachineMetric
for _, stats := range strings.Split(envoyMetrics, "\n") {
if strings.HasPrefix(stats, "cluster") {
Expand Down Expand Up @@ -126,5 +126,5 @@ func parseEnvoyMetricsToLoadBalancerMachineMetrics(envoyMetrics string) ([]yawol
}
}

return metrics, nil
return metrics
}
3 changes: 1 addition & 2 deletions internal/envoystatus/envoystatus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ func TestEnvoyStats4(t *testing.T) {
var _ = Describe("check envoy status", func() {
When("Envoy stats to LoadBalancerMachine Metrics", func() {
It("should set the correct metrics", func() {
got, err := parseEnvoyMetricsToLoadBalancerMachineMetrics(envoyMetrics)
Expect(err).ToNot(HaveOccurred())
got := parseEnvoyMetricsToLoadBalancerMachineMetrics(envoyMetrics)
fmt.Println(got)
Expect(compareMetrics(got, wanted)).To(BeTrue())

Expand Down
14 changes: 10 additions & 4 deletions internal/helper/yawollet.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ func createEnvoyCluster(lb *yawolv1beta1.LoadBalancer) []envoytypes.Resource {
Protocol: protocol,
Address: address,
PortSpecifier: &envoycore.SocketAddress_PortValue{
//nolint:gosec // both types are given
PortValue: uint32(port.NodePort),
},
},
Expand Down Expand Up @@ -275,9 +276,12 @@ func createEnvoyCluster(lb *yawolv1beta1.LoadBalancer) []envoytypes.Resource {
CircuitBreakers: &envoycluster.CircuitBreakers{
Thresholds: []*envoycluster.CircuitBreakers_Thresholds{
{
Priority: envoycore.RoutingPriority_DEFAULT,
MaxConnections: wrapperspb.UInt32(uint32(10000 * hostmetrics.GetCPUNum())),
MaxRequests: wrapperspb.UInt32(uint32(8000 * hostmetrics.GetCPUNum())),
Priority: envoycore.RoutingPriority_DEFAULT,
//nolint:gosec // both types are given
MaxConnections: wrapperspb.UInt32(uint32(10000 * hostmetrics.GetCPUNum())),
//nolint:gosec // both types are given
MaxRequests: wrapperspb.UInt32(uint32(8000 * hostmetrics.GetCPUNum())),
//nolint:gosec // both types are given
MaxPendingRequests: wrapperspb.UInt32(uint32(2000 * hostmetrics.GetCPUNum())),
},
},
Expand Down Expand Up @@ -333,7 +337,7 @@ func createEnvoyTCPListener(
var filters []*envoylistener.Filter

// ip whitelisting via RBAC according to loadBalancerSourceRanges
if lb.Spec.Options.LoadBalancerSourceRanges != nil && len(lb.Spec.Options.LoadBalancerSourceRanges) > 0 {
if len(lb.Spec.Options.LoadBalancerSourceRanges) > 0 {
lbSourceRangeFilter := createEnvoyRBACRules(r, lb)
if lbSourceRangeFilter != nil {
filters = append(filters, &envoylistener.Filter{
Expand All @@ -353,6 +357,7 @@ func createEnvoyTCPListener(
Protocol: envoycore.SocketAddress_TCP,
Address: listenAddress,
PortSpecifier: &envoycore.SocketAddress_PortValue{
//nolint:gosec // both types are given
PortValue: uint32(port.Port),
},
},
Expand Down Expand Up @@ -421,6 +426,7 @@ func createEnvoyUDPListener(
Protocol: envoycore.SocketAddress_UDP,
Address: listenAddress,
PortSpecifier: &envoycore.SocketAddress_PortValue{
//nolint:gosec // both types are given
PortValue: uint32(port.Port),
},
},
Expand Down
30 changes: 15 additions & 15 deletions internal/openstack/testing/fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func GetFakeClient() *MockClient {
}

client.PortClientObj = &CallbackPortClient{
ListFunc: func(ctx context.Context, optsBuilder ports.ListOptsBuilder) ([]ports.Port, error) {
ListFunc: func(_ context.Context, optsBuilder ports.ListOptsBuilder) ([]ports.Port, error) {
opts := optsBuilder.(ports.ListOpts)
prts := client.StoredValues["ports"].(map[string]*ports.Port)

Expand All @@ -235,7 +235,7 @@ func GetFakeClient() *MockClient {

return items, nil
},
CreateFunc: func(ctx context.Context, optsBuilder ports.CreateOptsBuilder) (*ports.Port, error) {
CreateFunc: func(_ context.Context, optsBuilder ports.CreateOptsBuilder) (*ports.Port, error) {
opts := optsBuilder.(ports.CreateOpts)
var fixedIPs []ports.IP
if opts.FixedIPs != nil {
Expand All @@ -262,7 +262,7 @@ func GetFakeClient() *MockClient {

return port, nil
},
GetFunc: func(ctx context.Context, id string) (*ports.Port, error) {
GetFunc: func(_ context.Context, id string) (*ports.Port, error) {
prts := client.StoredValues["ports"]
port, found := prts.(map[string]*ports.Port)[id]
if !found {
Expand All @@ -271,7 +271,7 @@ func GetFakeClient() *MockClient {

return port, nil
},
DeleteFunc: func(ctx context.Context, id string) error {
DeleteFunc: func(_ context.Context, id string) error {
prts := client.StoredValues["ports"]
_, found := prts.(map[string]*ports.Port)[id]
if !found {
Expand Down Expand Up @@ -299,7 +299,7 @@ func GetFakeClient() *MockClient {
}

client.ServerClientObj = &CallbackServerClient{
ListFunc: func(ctx context.Context, optsBuilder servers.ListOptsBuilder) ([]servers.Server, error) {
ListFunc: func(_ context.Context, optsBuilder servers.ListOptsBuilder) ([]servers.Server, error) {
opts := optsBuilder.(servers.ListOpts)
srvs := client.StoredValues["servers"].(map[string]*servers.Server)

Expand All @@ -315,7 +315,7 @@ func GetFakeClient() *MockClient {

return items, nil
},
CreateFunc: func(ctx context.Context, optsBuilder servers.CreateOptsBuilder) (*servers.Server, error) {
CreateFunc: func(_ context.Context, optsBuilder servers.CreateOptsBuilder) (*servers.Server, error) {
opts := optsBuilder.(*servers.CreateOpts)

addresses := make(map[string]interface{})
Expand All @@ -338,7 +338,7 @@ func GetFakeClient() *MockClient {

return server, nil
},
GetFunc: func(ctx context.Context, id string) (*servers.Server, error) {
GetFunc: func(_ context.Context, id string) (*servers.Server, error) {
srvs := client.StoredValues["servers"]
server, found := srvs.(map[string]*servers.Server)[id]
if !found {
Expand All @@ -347,19 +347,19 @@ func GetFakeClient() *MockClient {

return server, nil
},
DeleteFunc: func(ctx context.Context, id string) error {
DeleteFunc: func(_ context.Context, id string) error {
srvs := client.StoredValues["servers"]
delete(srvs.(map[string]*servers.Server), id)
return nil
},
UpdateFunc: func(ctx context.Context, id string, optsBuilder servers.UpdateOptsBuilder) (*servers.Server, error) {
UpdateFunc: func(_ context.Context, _ string, _ servers.UpdateOptsBuilder) (*servers.Server, error) {
// TODO we do not use it yet
return nil, nil
},
}

client.ServerGroupClientObj = &CallbackServerGroupClient{
ListFunc: func(ctx context.Context, optsBuilder servergroups.ListOptsBuilder) ([]servergroups.ServerGroup, error) {
ListFunc: func(_ context.Context, optsBuilder servergroups.ListOptsBuilder) ([]servergroups.ServerGroup, error) {
_ = optsBuilder.(servergroups.ListOpts)

srvs := client.StoredValues["servergroup"].(map[string]*servergroups.ServerGroup)
Expand All @@ -371,7 +371,7 @@ func GetFakeClient() *MockClient {

return items, nil
},
CreateFunc: func(ctx context.Context, optsBuilder servergroups.CreateOptsBuilder) (*servergroups.ServerGroup, error) {
CreateFunc: func(_ context.Context, optsBuilder servergroups.CreateOptsBuilder) (*servergroups.ServerGroup, error) {
opts := optsBuilder.(servergroups.CreateOpts)

servergroup := &servergroups.ServerGroup{
Expand All @@ -385,7 +385,7 @@ func GetFakeClient() *MockClient {

return servergroup, nil
},
GetFunc: func(ctx context.Context, id string) (*servergroups.ServerGroup, error) {
GetFunc: func(_ context.Context, id string) (*servergroups.ServerGroup, error) {
srvs := client.StoredValues["servergroup"]
server, found := srvs.(map[string]*servergroups.ServerGroup)[id]
if !found {
Expand All @@ -394,7 +394,7 @@ func GetFakeClient() *MockClient {

return server, nil
},
DeleteFunc: func(ctx context.Context, id string) error {
DeleteFunc: func(_ context.Context, id string) error {
srvs := client.StoredValues["servergroup"]
delete(srvs.(map[string]*servergroups.ServerGroup), id)
return nil
Expand All @@ -411,9 +411,9 @@ func getID(client *MockClient) string {
}

func generateIP() string {
min, max := 0, 255
minimum, maximum := 0, 255
gen := func() string {
return strconv.Itoa(rand.Intn(max-min) + min) //nolint:gosec // do not need to be secure
return strconv.Itoa(rand.Intn(maximum-minimum) + minimum) //nolint:gosec // do not need to be secure
}

return strings.Join([]string{gen(), gen(), gen(), gen()}, ".")
Expand Down