Skip to content

fix lbm hash change due to addition of proxy_url #432

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

Merged
maboehm merged 3 commits into from
Oct 31, 2024
Merged

fix lbm hash change due to addition of proxy_url #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2aea128
fix lbm hash change due to addition of proxy_url
MichaelEischer Oct 31, 2024
58907ac
add test to detect lb hash changes
MichaelEischer Oct 31, 2024
b482886
add testcase with additional fields set but same hash
MichaelEischer Oct 31, 2024
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
2 changes: 1 addition & 1 deletion api/v1beta1/loadbalancer_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ type LoadBalancerLogForward struct {
LokiURL string `json:"lokiUrl"`
// ProxyUrl defines the http proxy url to use for connection to loki
// +optional
ProxyURL string `json:"proxyUrl"`
ProxyURL string `json:"proxyUrl,omitempty"`
// Labels define extra labels for loki.
// +optional
Labels map[string]string `json:"labels"`
Expand Down
59 changes: 59 additions & 0 deletions internal/helper/loadbalancermachine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"

yawolv1beta1 "github.com/stackitcloud/yawol/api/v1beta1"
)
Expand Down Expand Up @@ -310,3 +311,61 @@ makestep 1 3
`))
})
})

var _ = DescribeTable("GetHashForLoadBalancerMachineSet",
func(lb *yawolv1beta1.LoadBalancer, expectedHash string) {
hash, err := GetHashForLoadBalancerMachineSet(lb)
Expect(err).ToNot(HaveOccurred())
Expect(hash).To(Equal(expectedHash))
},
Entry("empty config", &yawolv1beta1.LoadBalancer{}, "ogwzb3hasmo2o2tj"),
Entry("basic config", &yawolv1beta1.LoadBalancer{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
Namespace: "testspace",
},
Spec: yawolv1beta1.LoadBalancerSpec{
DebugSettings: yawolv1beta1.LoadBalancerDebugSettings{
Enabled: true,
SshkeyName: "key",
},
Options: yawolv1beta1.LoadBalancerOptions{
LogForward: yawolv1beta1.LoadBalancerLogForward{
Enabled: true,
LokiURL: "url",
},
ServerGroupPolicy: "affinity",
},
},
Status: yawolv1beta1.LoadBalancerStatus{
PortID: ptr.To("port"),
ServerGroupName: ptr.To("group-name"),
},
}, "5h3dhrkdncr5csa7"),
Entry("basic config with extra fields but same hash", &yawolv1beta1.LoadBalancer{
ObjectMeta: metav1.ObjectMeta{
Name: "test",
Namespace: "testspace",
},
Spec: yawolv1beta1.LoadBalancerSpec{
DebugSettings: yawolv1beta1.LoadBalancerDebugSettings{
Enabled: true,
SshkeyName: "key",
},
Options: yawolv1beta1.LoadBalancerOptions{
LogForward: yawolv1beta1.LoadBalancerLogForward{
Enabled: true,
LokiURL: "url",
},
ServerGroupPolicy: "affinity",
InternalLB: true, // extra
},
Replicas: 3, // extra
},
Status: yawolv1beta1.LoadBalancerStatus{
PortID: ptr.To("port"),
ServerGroupName: ptr.To("group-name"),
ExternalIP: ptr.To("1.2.3.4"), // extra
},
}, "5h3dhrkdncr5csa7"),
)