Skip to content

Commit b9c3c5b

Browse files
stackit-skedergeberl
stackit-ske
and
dergeberl
authored
[release-v1.36] Fix golangci lint url (#1071)
* Fix golangci-lint download url * make goconst linter happy --------- Co-authored-by: Maximilian Geberl <maximilian.geberl@digits.schwarz>
1 parent 03c6069 commit b9c3c5b

5 files changed

Lines changed: 138 additions & 130 deletions

File tree

‎.golangci.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ linters:
4242
goconst:
4343
min-len: 2
4444
min-occurrences: 5
45+
ignore-string-values:
46+
- 'true'
47+
- 'false'
4548
gocritic:
4649
disabled-checks:
4750
- dupImport

‎hack/tools.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $(GOIMPORTS_REVISER): $(call tool_version_file,$(GOIMPORTS_REVISER),$(GOIMPORTS_
3939

4040
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
4141
$(GOLANGCI_LINT): $(call tool_version_file,$(GOLANGCI_LINT),$(GOLANGCI_LINT_VERSION))
42-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) $(GOLANGCI_LINT_VERSION)
42+
curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) $(GOLANGCI_LINT_VERSION)
4343

4444
MOCKGEN := $(TOOLS_BIN_DIR)/mockgen
4545
$(MOCKGEN): $(call tool_version_file,$(MOCKGEN),$(MOCKGEN_VERSION))

‎pkg/ccm/loadbalancer_spec.go‎

Lines changed: 127 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -69,133 +69,137 @@ const (
6969

7070
const eventReasonYawolAnnotationPresent = "YawolAnnotationPresent"
7171

72-
var availablePlanIDs = []string{"p10", "p50", "p250", "p750"}
72+
const (
73+
p10 = "p10"
74+
p50 = "p50"
75+
p250 = "p250"
76+
p750 = "p750"
77+
)
7378

74-
// the default plan ID when no plan ID annotation is found
75-
var defaultServicePlan = "p10"
79+
var availablePlanIDs = []string{p10, p50, p250, p750}
7680

7781
var flavorsMap = map[string]string{
78-
"85f57dd5-712b-489d-a0e3-4898c3962930": "p10", // t1.2
79-
"cd49f4fd-1e48-497f-91ad-79894c8b95e4": "p50", // s1a.4d
80-
"72f11e14-2825-471d-a237-b1afa775fdad": "p250", // s1a.8d
81-
"53408825-7086-48c2-9126-cafdeb2d35d6": "p750", // s1a.16d
82+
"85f57dd5-712b-489d-a0e3-4898c3962930": p10, // t1.2
83+
"cd49f4fd-1e48-497f-91ad-79894c8b95e4": p50, // s1a.4d
84+
"72f11e14-2825-471d-a237-b1afa775fdad": p250, // s1a.8d
85+
"53408825-7086-48c2-9126-cafdeb2d35d6": p750, // s1a.16d
8286
}
8387

8488
var appoximateFlavorsMap = map[string]string{
85-
"2faeefeb-efe7-4f8b-9e52-3246a5d709f0": "p50", // s1a.2d
86-
"9b6bfa7b-bb80-4da8-aa10-ddd4cfaaa1a1": "p750", // s1a.32d
87-
"8936d6a5-30bb-4012-834c-29c599800e53": "p750", // s1a.60d
88-
89-
"75e8134a-e1de-4052-b3be-75c5157c47c6": "p250", // b1.1
90-
"1493fabc-3e5c-4992-82fc-d43e2c33902a": "p750", // b1.2
91-
"f77046c4-6c41-452c-9983-7264151252fa": "p750", // b1.3
92-
"f778f21f-b0a7-4ae0-88e9-917f01d6fb52": "p750", // b1.4
93-
94-
"49902b99-b428-4e6a-ad34-d8b9e719390f": "p250", // b1a.1d
95-
"ce99338f-afc2-4966-89e2-34e494d89e4b": "p750", // b1a.2d
96-
"2e364c23-ee61-451c-841c-8fa25573ae9d": "p750", // b1a.4d
97-
"c1e2def6-e182-4bf6-a0f9-9b5b453eb55a": "p750", // b1a.8d
98-
"fda4f402-6d43-4db5-bcf1-384596f237bb": "p750", // b1a.16d
99-
"704c07a3-1308-4cdd-b8f3-0892589cb99c": "p750", // b1a.32d
100-
"696d8b7a-6aaa-456c-853b-11a7ba490b66": "p750", // b1a.60d
101-
"8b46ca04-e7ec-4f01-a2ed-67e75e3fe04f": "p750", // b1a.120d
102-
103-
"882a98ba-d47f-4a52-bd85-ccbc2b08f8f8": "p250", // b2i.1d
104-
"6c1b79d7-b344-407e-808d-476187c7dcd6": "p750", // b2i.2d
105-
"013451f5-4c26-4464-84e6-cc5f1c8b0f8a": "p750", // b2i.4d
106-
"2787f539-a8b9-40d3-873d-6db51a2edb41": "p750", // b2i.8d
107-
"7bd9d46f-7c3b-4089-88e5-fca17581295e": "p750", // b2i.16d
108-
"562af0ba-2540-4b49-943e-0beb6c9afa04": "p750", // b2i.30d
109-
"a09e6576-4f74-4a4d-963a-05ec49e27f18": "p750", // b2i.36d
110-
111-
"7d1572e1-11c9-4872-8ce8-4b953cdf6fb3": "p50", // c1.1
112-
"5fe737c2-18d8-43c6-bb11-dc9c97ff9515": "p50", // c1.2
113-
"8512c5f9-4426-47f1-a9dc-5c5a5a798b54": "p250", // c1.3
114-
"ecb39de6-8b6c-431e-8455-9d857639be92": "p750", // c1.4
115-
"442e31fa-654a-4f76-b7c2-4802592f9cc7": "p750", // c1.5
116-
117-
"6f65263f-0902-47ca-8761-6e449648c8f0": "p50", // c1a.1d
118-
"a9704593-dc26-45b7-8b1c-a37bf42d253e": "p50", // c1a.2d
119-
"d04236f9-4740-4058-9695-0a80a9b3a9b0": "p250", // c1a.4d
120-
"cac16b39-a179-43c5-b5e5-ad22eca1c87c": "p750", // c1a.8d
121-
"381b5633-b064-41aa-af78-cd1bd318a0e1": "p750", // c1a.16d
122-
123-
"ef66543f-3225-48b0-ab42-4cfda07668b8": "p50", // c2i.1
124-
"0c69d386-ca5e-4720-8812-225bbf4d4879": "p50", // c2i.2
125-
"a03cf8cd-f5e4-4897-b639-41b4a1a46dc6": "p250", // c2i.4
126-
"cee66b47-8465-469d-bb61-7a23073c3488": "p750", // c2i.8
127-
"5fa8e67c-4259-4353-8e29-dece88c3a394": "p750", // c2i.16
128-
129-
"64d695be-04b8-4f14-b020-712ef0e30a6b": "p50", // g1.1
130-
"3b11b27e-6c73-470d-b595-1d85b95a8cdf": "p250", // g1.2
131-
"028a4cf9-d9de-4706-a6d2-3ec9a456a736": "p250", // g1.3
132-
"21ff0965-d385-4e90-9ae4-e1ac8ca8f569": "p750", // g1.4
133-
"d1f51f86-3fa3-46a1-9e9f-b8b1308f039e": "p750", // g1.5
134-
135-
"17837ed5-515a-457f-b36b-531fdb861b8a": "p50", // g1a.1d
136-
"c6b4adc7-d101-48d4-a2ea-d77cbaa63768": "p250", // g1a.2d
137-
"c995089f-8d81-4085-be7b-dc2f7ad3f05f": "p250", // g1a.4d
138-
"cfd6f5f6-b2da-49db-9f1c-4f2ef4c8e831": "p750", // g1a.8d
139-
"816c3d62-3526-47c6-90b4-7c47318f7526": "p750", // g1a.16d
140-
"84a73cca-db0b-4d56-837f-5e5422520d51": "p750", // g1a.32d
141-
"b9f4c5f0-49d7-48a1-ab41-34000f00664b": "p750", // g1a.60d
142-
143-
"8d811c25-a261-4cbe-aadf-6c2d9667c842": "p50", // g1r.1d
144-
"8a7bd5b4-7ac6-414b-ac62-a6c43229038a": "p250", // g1r.2d
145-
"e3abfbba-b9fe-4973-ac92-2856f489d09a": "p250", // g1r.4d
146-
"f5bfad0d-22d2-4e47-a807-8413e6d0818f": "p750", // g1r.8d
147-
"396a0814-b339-4e9f-8d2f-ccef53937541": "p750", // g1r.16d
148-
"a98b686a-4207-4bc2-902a-6f303da7b043": "p750", // g1r.30d
149-
150-
"474e2367-9c96-4fc0-ac41-eac7f59a1c7b": "p50", // g2i.1
151-
"410cc4c1-0684-47fa-9e72-866f1044a330": "p50", // g2i.1s
152-
"b7aa1635-3726-4924-9d73-18b9683fb67a": "p250", // g2i.2
153-
"79021845-f6de-46f0-be07-17835930d030": "p250", // g2i.2s
154-
"8d705710-c7a8-4e64-aa96-87add166f42d": "p250", // g2i.4
155-
"88883131-9afa-43ad-bc4e-77b79494e89f": "p250", // g2i.4s
156-
"9c0a9d2d-79e9-4b99-a72f-e15c0d987e7d": "p750", // g2i.8
157-
"f6303887-f07c-4976-9198-0eb0dd964b18": "p750", // g2i.8s
158-
"b1ca70ea-4da7-441d-8aef-8337c5f81fb2": "p750", // g2i.16
159-
"901a56b3-4c98-4725-986a-2aa081b9c955": "p750", // g2i.16s
160-
161-
"04b9be2d-afee-4f32-874b-8356b96ebb0b": "p50", // m1.1
162-
"39d1344f-91dc-412a-a3b4-72e61b6c6eaa": "p250", // m1.2
163-
"baa5374c-cb97-47b9-be8c-e79103b3d097": "p750", // m1.3
164-
"ccd8f298-d885-4c8b-bf40-414ee8f39967": "p750", // m1.4
165-
"acd9945a-f94a-4e64-a4a3-81f587b596cf": "p750", // m1.5
166-
167-
"osAyv1W3z2TU5D6h": "p10", // m1.amphora
168-
169-
"a24a1a07-4c66-4030-bbfd-68368e4bb8be": "p50", // m1a.1d
170-
"d61f0a42-a3e0-4723-b78a-d51d3d719ade": "p250", // m1a.2d
171-
"27b97158-43d6-44a1-8cf2-d95989f2cc07": "p750", // m1a.4d
172-
"9d76cf5e-1354-446f-8ca1-0d704bee89ca": "p750", // m1a.8d
173-
"e6897bc6-6a21-451c-b6cb-d80725781446": "p750", // m1a.16d
174-
"6fedeb8b-0536-4fbb-80b3-3791d00346b2": "p750", // m1a.32d
175-
"e772e068-6400-4664-8813-811e835b169e": "p750", // m1a.60d
176-
"ae6ea4bb-f26c-41c1-a974-ff422601c0b6": "p750", // m1a.120d
177-
178-
"aa603f7b-4214-486c-81ce-369535cef8ed": "p50", // m2i.1
179-
"b4be83e0-475c-4255-a5ef-e6876c413a09": "p250", // m2i.2
180-
"79b7b9a7-a062-4aab-9861-ba93c1935a68": "p750", // m2i.4
181-
"309471e2-21e8-4384-8ad9-484bf56372b3": "p750", // m2i.8
182-
"c4d49baf-fcfa-4ec1-8160-9ec7e57123fc": "p750", // m2i.16
183-
184-
"d651f154-7fc9-4bf6-a34a-a32e3dd57c5d": "p50", // s1.2
185-
"8b2c5d9f-e7da-4cd2-a359-e652817845fe": "p50", // s1.3
186-
"709d7f73-41f0-4295-94d5-0f0cf351c93b": "p250", // s1.4
187-
"178cf1ad-abcb-46c2-a045-73bc935f100e": "p750", // s1.5
188-
"482434d3-3604-4f72-98d8-2af2c654d4e9": "p750", // s1.6
189-
190-
"6f04a265-3a9f-4b99-bb66-944ac848af22": "p750", // n1.14d.g1
191-
"4b4891d6-860b-4c70-b48e-d261e9751b56": "p750", // n1.28d.g2
192-
193-
"396671f4-6f19-4531-98d0-127272916cee": "p750", // n2.14d.g1
194-
"0c85bbb2-5c85-465c-abf9-71261b8fbcd4": "p750", // n2.28d.g2
195-
"a7c5c538-aef1-4f40-8c8d-1366c5b80271": "p750", // n2.56d.g4
196-
197-
"25129382-dbe8-43eb-b71b-72253dd69452": "p10", // t1.1
198-
"22b37153-8817-4c85-9805-92426b2f903c": "p10", // t2i.1
89+
"2faeefeb-efe7-4f8b-9e52-3246a5d709f0": p50, // s1a.2d
90+
"9b6bfa7b-bb80-4da8-aa10-ddd4cfaaa1a1": p750, // s1a.32d
91+
"8936d6a5-30bb-4012-834c-29c599800e53": p750, // s1a.60d
92+
93+
"75e8134a-e1de-4052-b3be-75c5157c47c6": p250, // b1.1
94+
"1493fabc-3e5c-4992-82fc-d43e2c33902a": p750, // b1.2
95+
"f77046c4-6c41-452c-9983-7264151252fa": p750, // b1.3
96+
"f778f21f-b0a7-4ae0-88e9-917f01d6fb52": p750, // b1.4
97+
98+
"49902b99-b428-4e6a-ad34-d8b9e719390f": p250, // b1a.1d
99+
"ce99338f-afc2-4966-89e2-34e494d89e4b": p750, // b1a.2d
100+
"2e364c23-ee61-451c-841c-8fa25573ae9d": p750, // b1a.4d
101+
"c1e2def6-e182-4bf6-a0f9-9b5b453eb55a": p750, // b1a.8d
102+
"fda4f402-6d43-4db5-bcf1-384596f237bb": p750, // b1a.16d
103+
"704c07a3-1308-4cdd-b8f3-0892589cb99c": p750, // b1a.32d
104+
"696d8b7a-6aaa-456c-853b-11a7ba490b66": p750, // b1a.60d
105+
"8b46ca04-e7ec-4f01-a2ed-67e75e3fe04f": p750, // b1a.120d
106+
107+
"882a98ba-d47f-4a52-bd85-ccbc2b08f8f8": p250, // b2i.1d
108+
"6c1b79d7-b344-407e-808d-476187c7dcd6": p750, // b2i.2d
109+
"013451f5-4c26-4464-84e6-cc5f1c8b0f8a": p750, // b2i.4d
110+
"2787f539-a8b9-40d3-873d-6db51a2edb41": p750, // b2i.8d
111+
"7bd9d46f-7c3b-4089-88e5-fca17581295e": p750, // b2i.16d
112+
"562af0ba-2540-4b49-943e-0beb6c9afa04": p750, // b2i.30d
113+
"a09e6576-4f74-4a4d-963a-05ec49e27f18": p750, // b2i.36d
114+
115+
"7d1572e1-11c9-4872-8ce8-4b953cdf6fb3": p50, // c1.1
116+
"5fe737c2-18d8-43c6-bb11-dc9c97ff9515": p50, // c1.2
117+
"8512c5f9-4426-47f1-a9dc-5c5a5a798b54": p250, // c1.3
118+
"ecb39de6-8b6c-431e-8455-9d857639be92": p750, // c1.4
119+
"442e31fa-654a-4f76-b7c2-4802592f9cc7": p750, // c1.5
120+
121+
"6f65263f-0902-47ca-8761-6e449648c8f0": p50, // c1a.1d
122+
"a9704593-dc26-45b7-8b1c-a37bf42d253e": p50, // c1a.2d
123+
"d04236f9-4740-4058-9695-0a80a9b3a9b0": p250, // c1a.4d
124+
"cac16b39-a179-43c5-b5e5-ad22eca1c87c": p750, // c1a.8d
125+
"381b5633-b064-41aa-af78-cd1bd318a0e1": p750, // c1a.16d
126+
127+
"ef66543f-3225-48b0-ab42-4cfda07668b8": p50, // c2i.1
128+
"0c69d386-ca5e-4720-8812-225bbf4d4879": p50, // c2i.2
129+
"a03cf8cd-f5e4-4897-b639-41b4a1a46dc6": p250, // c2i.4
130+
"cee66b47-8465-469d-bb61-7a23073c3488": p750, // c2i.8
131+
"5fa8e67c-4259-4353-8e29-dece88c3a394": p750, // c2i.16
132+
133+
"64d695be-04b8-4f14-b020-712ef0e30a6b": p50, // g1.1
134+
"3b11b27e-6c73-470d-b595-1d85b95a8cdf": p250, // g1.2
135+
"028a4cf9-d9de-4706-a6d2-3ec9a456a736": p250, // g1.3
136+
"21ff0965-d385-4e90-9ae4-e1ac8ca8f569": p750, // g1.4
137+
"d1f51f86-3fa3-46a1-9e9f-b8b1308f039e": p750, // g1.5
138+
139+
"17837ed5-515a-457f-b36b-531fdb861b8a": p50, // g1a.1d
140+
"c6b4adc7-d101-48d4-a2ea-d77cbaa63768": p250, // g1a.2d
141+
"c995089f-8d81-4085-be7b-dc2f7ad3f05f": p250, // g1a.4d
142+
"cfd6f5f6-b2da-49db-9f1c-4f2ef4c8e831": p750, // g1a.8d
143+
"816c3d62-3526-47c6-90b4-7c47318f7526": p750, // g1a.16d
144+
"84a73cca-db0b-4d56-837f-5e5422520d51": p750, // g1a.32d
145+
"b9f4c5f0-49d7-48a1-ab41-34000f00664b": p750, // g1a.60d
146+
147+
"8d811c25-a261-4cbe-aadf-6c2d9667c842": p50, // g1r.1d
148+
"8a7bd5b4-7ac6-414b-ac62-a6c43229038a": p250, // g1r.2d
149+
"e3abfbba-b9fe-4973-ac92-2856f489d09a": p250, // g1r.4d
150+
"f5bfad0d-22d2-4e47-a807-8413e6d0818f": p750, // g1r.8d
151+
"396a0814-b339-4e9f-8d2f-ccef53937541": p750, // g1r.16d
152+
"a98b686a-4207-4bc2-902a-6f303da7b043": p750, // g1r.30d
153+
154+
"474e2367-9c96-4fc0-ac41-eac7f59a1c7b": p50, // g2i.1
155+
"410cc4c1-0684-47fa-9e72-866f1044a330": p50, // g2i.1s
156+
"b7aa1635-3726-4924-9d73-18b9683fb67a": p250, // g2i.2
157+
"79021845-f6de-46f0-be07-17835930d030": p250, // g2i.2s
158+
"8d705710-c7a8-4e64-aa96-87add166f42d": p250, // g2i.4
159+
"88883131-9afa-43ad-bc4e-77b79494e89f": p250, // g2i.4s
160+
"9c0a9d2d-79e9-4b99-a72f-e15c0d987e7d": p750, // g2i.8
161+
"f6303887-f07c-4976-9198-0eb0dd964b18": p750, // g2i.8s
162+
"b1ca70ea-4da7-441d-8aef-8337c5f81fb2": p750, // g2i.16
163+
"901a56b3-4c98-4725-986a-2aa081b9c955": p750, // g2i.16s
164+
165+
"04b9be2d-afee-4f32-874b-8356b96ebb0b": p50, // m1.1
166+
"39d1344f-91dc-412a-a3b4-72e61b6c6eaa": p250, // m1.2
167+
"baa5374c-cb97-47b9-be8c-e79103b3d097": p750, // m1.3
168+
"ccd8f298-d885-4c8b-bf40-414ee8f39967": p750, // m1.4
169+
"acd9945a-f94a-4e64-a4a3-81f587b596cf": p750, // m1.5
170+
171+
"osAyv1W3z2TU5D6h": p10, // m1.amphora
172+
173+
"a24a1a07-4c66-4030-bbfd-68368e4bb8be": p50, // m1a.1d
174+
"d61f0a42-a3e0-4723-b78a-d51d3d719ade": p250, // m1a.2d
175+
"27b97158-43d6-44a1-8cf2-d95989f2cc07": p750, // m1a.4d
176+
"9d76cf5e-1354-446f-8ca1-0d704bee89ca": p750, // m1a.8d
177+
"e6897bc6-6a21-451c-b6cb-d80725781446": p750, // m1a.16d
178+
"6fedeb8b-0536-4fbb-80b3-3791d00346b2": p750, // m1a.32d
179+
"e772e068-6400-4664-8813-811e835b169e": p750, // m1a.60d
180+
"ae6ea4bb-f26c-41c1-a974-ff422601c0b6": p750, // m1a.120d
181+
182+
"aa603f7b-4214-486c-81ce-369535cef8ed": p50, // m2i.1
183+
"b4be83e0-475c-4255-a5ef-e6876c413a09": p250, // m2i.2
184+
"79b7b9a7-a062-4aab-9861-ba93c1935a68": p750, // m2i.4
185+
"309471e2-21e8-4384-8ad9-484bf56372b3": p750, // m2i.8
186+
"c4d49baf-fcfa-4ec1-8160-9ec7e57123fc": p750, // m2i.16
187+
188+
"d651f154-7fc9-4bf6-a34a-a32e3dd57c5d": p50, // s1.2
189+
"8b2c5d9f-e7da-4cd2-a359-e652817845fe": p50, // s1.3
190+
"709d7f73-41f0-4295-94d5-0f0cf351c93b": p250, // s1.4
191+
"178cf1ad-abcb-46c2-a045-73bc935f100e": p750, // s1.5
192+
"482434d3-3604-4f72-98d8-2af2c654d4e9": p750, // s1.6
193+
194+
"6f04a265-3a9f-4b99-bb66-944ac848af22": p750, // n1.14d.g1
195+
"4b4891d6-860b-4c70-b48e-d261e9751b56": p750, // n1.28d.g2
196+
197+
"396671f4-6f19-4531-98d0-127272916cee": p750, // n2.14d.g1
198+
"0c85bbb2-5c85-465c-abf9-71261b8fbcd4": p750, // n2.28d.g2
199+
"a7c5c538-aef1-4f40-8c8d-1366c5b80271": p750, // n2.56d.g4
200+
201+
"25129382-dbe8-43eb-b71b-72253dd69452": p10, // t1.1
202+
"22b37153-8817-4c85-9805-92426b2f903c": p10, // t2i.1
199203
}
200204

201205
// proxyProtocolEnableForPort determines whether portNumber should use the TCP proxy protocol (instead of TCP).
@@ -236,7 +240,8 @@ func getPlanID(service *corev1.Service) (planID *string, msgs []string, err erro
236240
msgs = append(msgs, fmt.Sprintf(`Flavors are deprecated in favor of service plans. Picking load balancer service plan %s for flavor %s. Use the annotation lb.stackit.cloud/service-plan-id to explicitly choose a service plan.`, planID, flavorID))
237241
return &planID, msgs, nil
238242
}
239-
return &defaultServicePlan, nil, nil
243+
// default to p10 if no annotation is provided
244+
return new(p10), nil, nil
240245
}
241246

242247
// lbSpecFromService returns a load balancer specification in the form of a create payload matching the specification of the service, nodes and network.

‎pkg/ccm/loadbalancer_spec_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ var _ = Describe("lbSpecFromService", func() {
796796
spec, _, err := lbSpecFromService(&corev1.Service{
797797
ObjectMeta: metav1.ObjectMeta{
798798
Annotations: map[string]string{
799-
"lb.stackit.cloud/service-plan-id": "p250",
799+
"lb.stackit.cloud/service-plan-id": p250,
800800
},
801801
},
802802
Spec: corev1.ServiceSpec{
@@ -810,7 +810,7 @@ var _ = Describe("lbSpecFromService", func() {
810810
},
811811
}, []*corev1.Node{}, lbOpts, nil)
812812
Expect(err).NotTo(HaveOccurred())
813-
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo("p250")))
813+
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo(p250)))
814814
})
815815
It("should not create an LB with a custom plan when service-plan-id annotation is set to an invalid value", func() {
816816
_, _, err := lbSpecFromService(&corev1.Service{
@@ -855,7 +855,7 @@ var _ = Describe("lbSpecFromService", func() {
855855
Expect(events[0].Message).To(Equal(`Flavors are deprecated in favor of service plans. Picking load balancer service plan p250 for flavor 72f11e14-2825-471d-a237-b1afa775fdad. Use the annotation lb.stackit.cloud/service-plan-id to explicitly choose a service plan.`))
856856
Expect(events[0].Type).To(Equal(corev1.EventTypeWarning))
857857
Expect(events[0].Reason).To(Equal(EventReasonSelectedPlanID))
858-
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo("p250")))
858+
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo(p250)))
859859
})
860860

861861
It("should create an LB with a custom plan when flavor ID annotation is set to a valid value but doesn't match a service plan ID", func() {
@@ -881,7 +881,7 @@ var _ = Describe("lbSpecFromService", func() {
881881
Expect(events[0].Message).To(Equal(`Flavors are deprecated in favor of service plans. Picking load balancer service plan p50 for flavor aa603f7b-4214-486c-81ce-369535cef8ed. Use the annotation lb.stackit.cloud/service-plan-id to explicitly choose a service plan.`))
882882
Expect(events[0].Type).To(Equal(corev1.EventTypeWarning))
883883
Expect(events[0].Reason).To(Equal(EventReasonSelectedPlanID))
884-
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo("p50")))
884+
Expect(spec.PlanId).To(HaveValue(BeEquivalentTo(p50)))
885885
})
886886
It("should not create an LB with a custom plan when flavorId annotation is set to an invalid value", func() {
887887
_, _, err := lbSpecFromService(&corev1.Service{
@@ -1305,13 +1305,13 @@ var _ = DescribeTable("compareLBwithSpec",
13051305
wantFulfilled: false,
13061306
wantImmutabledChanged: nil,
13071307
lb: &loadbalancer.LoadBalancer{
1308-
PlanId: new("p10"),
1308+
PlanId: new(p10),
13091309
Options: &loadbalancer.LoadBalancerOptions{
13101310
EphemeralAddress: new(true),
13111311
},
13121312
},
13131313
spec: &loadbalancer.CreateLoadBalancerPayload{
1314-
PlanId: new("p250"),
1314+
PlanId: new(p250),
13151315
Options: &loadbalancer.LoadBalancerOptions{
13161316
EphemeralAddress: new(true),
13171317
},

‎pkg/ccm/loadbalancer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ var _ = Describe("LoadBalancer", func() {
242242
Status: new(lbwait.LOADBALANCERSTATUS_READY),
243243
TargetPools: spec.TargetPools,
244244
Version: new("current-version"),
245-
PlanId: new("p10"),
245+
PlanId: new(p10),
246246
}
247247

248248
mockClient.EXPECT().GetLoadBalancer(gomock.Any(), projectID, gomock.Any()).Return(myLb, nil)

0 commit comments

Comments
 (0)