Skip to content

Commit 289e412

Browse files
wind57wind57
authored
aling with fabric8 upgrade (#1167)
1 parent 0e0a8ff commit 289e412

File tree

33 files changed

+230
-198
lines changed

33 files changed

+230
-198
lines changed

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void setUpBeforeClass(KubernetesClient mockClient) throws IOExcept
6666
ConfigMap configMap = new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata()
6767
.addToData(data).build();
6868

69-
mockClient.configMaps().inNamespace("test").create(configMap);
69+
mockClient.configMaps().inNamespace("test").resource(configMap).create();
7070
}
7171

7272
@AfterAll

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
5656

5757
HashMap<String, String> data = new HashMap<>();
5858
data.put("bean.greeting", "Hello ConfigMap, %s!");
59-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
60-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
59+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
60+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
6161
}
6262

6363
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
5252

5353
HashMap<String, String> data = new HashMap<>();
5454
data.put("application.yml", readResourceFile("application-with-profiles.yaml"));
55-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
56-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
55+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
56+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
5757

5858
HashMap<String, String> dataWithName = new HashMap<>();
5959
dataWithName.put("application.yml", readResourceFile("application-with-active-profiles-name.yaml"));
60-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
61-
.withName(APPLICATION_NAME + "-development").endMetadata().addToData(dataWithName).build());
60+
mockClient
61+
.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
62+
.withName(APPLICATION_NAME + "-development").endMetadata().addToData(dataWithName).build())
63+
.create();
6264
}
6365

6466
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
4949

5050
HashMap<String, String> data = new HashMap<>();
5151
data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-with-profiles.yaml"));
52-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
53-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
52+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
53+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
5454
}
5555

5656
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
5050

5151
HashMap<String, String> data = new HashMap<>();
5252
data.put("application.yml", readResourceFile("application-with-profiles.yaml"));
53-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
54-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
53+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
54+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
5555
}
5656

5757
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
5151

5252
HashMap<String, String> data = new HashMap<>();
5353
data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-with-profiles.yaml"));
54-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
55-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
54+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
55+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
5656
}
5757

5858
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
4545

4646
HashMap<String, String> data = new HashMap<>();
4747
data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-without-profiles.yaml"));
48-
mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata()
49-
.withName(APPLICATION_NAME).endMetadata().addToData(data).build());
48+
mockClient.configMaps().inNamespace("test").resource(new ConfigMapBuilder().withNewMetadata()
49+
.withName(APPLICATION_NAME).endMetadata().addToData(data).build()).create();
5050
}
5151

5252
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ public static void setUpBeforeClass(KubernetesClient mockClient) {
4444
CoreTest.mockClient = mockClient;
4545
Map<String, String> data1 = new HashMap<>();
4646
data1.put("spring.kubernetes.test.value", "value1");
47-
mockClient.configMaps().inNamespace("testns").create(
48-
new ConfigMapBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data1).build());
47+
mockClient.configMaps().inNamespace("testns").resource(
48+
new ConfigMapBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data1).build())
49+
.create();
4950

5051
Map<String, String> data2 = new HashMap<>();
5152
data2.put("amq.user", "YWRtaW4K");
5253
data2.put("amq.pwd", "MWYyZDFlMmU2N2Rm");
53-
mockClient.secrets().inNamespace("testns").create(
54-
new SecretBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data2).build());
54+
mockClient.secrets().inNamespace("testns").resource(
55+
new SecretBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data2).build())
56+
.create();
5557

5658
// Configure the kubernetes master url to point to the mock server
5759
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl());

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigUtilsTests.java‎

Lines changed: 59 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ class Fabric8ConfigUtilsTests {
4747
// "color=red" and do not find it.
4848
@Test
4949
void testSecretDataByLabelsSecretNotFound() {
50-
client.secrets().inNamespace("spring-k8s").create(
51-
new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build()).build());
50+
client.secrets().inNamespace("spring-k8s")
51+
.resource(
52+
new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build()).build())
53+
.create();
5254
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
5355
Map.of("color", "red"), new MockEnvironment(), Set.of());
5456
Assertions.assertEquals(Map.of(), result.data());
@@ -59,9 +61,10 @@ void testSecretDataByLabelsSecretNotFound() {
5961
// label and find it.
6062
@Test
6163
void testSecretDataByLabelsSecretFound() {
62-
client.secrets().inNamespace("spring-k8s").create(new SecretBuilder()
64+
client.secrets().inNamespace("spring-k8s").resource(new SecretBuilder()
6365
.withMetadata(new ObjectMetaBuilder().withName("my-secret").withLabels(Map.of("color", "pink")).build())
64-
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build());
66+
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build())
67+
.create();
6568

6669
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
6770
Map.of("color", "pink"), new MockEnvironment(), Set.of());
@@ -74,10 +77,10 @@ void testSecretDataByLabelsSecretFound() {
7477
// it gets some special treatment.
7578
@Test
7679
void testSecretDataByLabelsSecretFoundWithPropertyFile() {
77-
client.secrets().inNamespace("spring-k8s").create(new SecretBuilder()
80+
client.secrets().inNamespace("spring-k8s").resource(new SecretBuilder()
7881
.withMetadata(new ObjectMetaBuilder().withName("my-secret").withLabels(Map.of("color", "pink")).build())
7982
.addToData(Map.of("application.yaml", Base64.getEncoder().encodeToString("key1: value1".getBytes())))
80-
.build());
83+
.build()).create();
8184

8285
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
8386
Map.of("color", "pink"), new MockEnvironment(), Set.of());
@@ -89,14 +92,16 @@ void testSecretDataByLabelsSecretFoundWithPropertyFile() {
8992
// we search for them by same label and find them.
9093
@Test
9194
void testSecretDataByLabelsTwoSecretsFound() {
92-
client.secrets().inNamespace("spring-k8s").create(new SecretBuilder()
95+
client.secrets().inNamespace("spring-k8s").resource(new SecretBuilder()
9396
.withMetadata(new ObjectMetaBuilder().withName("my-secret").withLabels(Map.of("color", "pink")).build())
94-
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build());
97+
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build())
98+
.create();
9599

96-
client.secrets().inNamespace("spring-k8s").create(new SecretBuilder()
100+
client.secrets().inNamespace("spring-k8s").resource(new SecretBuilder()
97101
.withMetadata(
98102
new ObjectMetaBuilder().withName("my-secret-2").withLabels(Map.of("color", "pink")).build())
99-
.addToData(Map.of("property-2", Base64.getEncoder().encodeToString("value-2".getBytes()))).build());
103+
.addToData(Map.of("property-2", Base64.getEncoder().encodeToString("value-2".getBytes()))).build())
104+
.create();
100105

101106
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
102107
Map.of("color", "pink"), new MockEnvironment(), Set.of());
@@ -124,28 +129,32 @@ void testSecretDataByLabelsTwoSecretsFound() {
124129
@Test
125130
void testSecretDataByLabelsThreeSecretsFound() {
126131
client.secrets().inNamespace("spring-k8s")
127-
.create(new SecretBuilder()
132+
.resource(new SecretBuilder()
128133
.withMetadata(new ObjectMetaBuilder().withName("blue-circle-secret")
129134
.withLabels(Map.of("color", "blue", "shape", "circle", "tag", "fit")).build())
130-
.addToData(Map.of("one", Base64.getEncoder().encodeToString("1".getBytes()))).build());
135+
.addToData(Map.of("one", Base64.getEncoder().encodeToString("1".getBytes()))).build())
136+
.create();
131137

132138
client.secrets().inNamespace("spring-k8s")
133-
.create(new SecretBuilder()
139+
.resource(new SecretBuilder()
134140
.withMetadata(new ObjectMetaBuilder().withName("blue-square-secret")
135141
.withLabels(Map.of("color", "blue", "shape", "square", "tag", "fit")).build())
136-
.addToData(Map.of("two", Base64.getEncoder().encodeToString("2".getBytes()))).build());
142+
.addToData(Map.of("two", Base64.getEncoder().encodeToString("2".getBytes()))).build())
143+
.create();
137144

138145
client.secrets().inNamespace("spring-k8s")
139-
.create(new SecretBuilder()
146+
.resource(new SecretBuilder()
140147
.withMetadata(new ObjectMetaBuilder().withName("blue-triangle-secret")
141148
.withLabels(Map.of("color", "blue", "shape", "triangle", "tag", "no-fit")).build())
142-
.addToData(Map.of("three", Base64.getEncoder().encodeToString("3".getBytes()))).build());
149+
.addToData(Map.of("three", Base64.getEncoder().encodeToString("3".getBytes()))).build())
150+
.create();
143151

144152
client.secrets().inNamespace("spring-k8s")
145-
.create(new SecretBuilder()
153+
.resource(new SecretBuilder()
146154
.withMetadata(new ObjectMetaBuilder().withName("blue-square-secret-k8s")
147155
.withLabels(Map.of("color", "blue", "shape", "triangle", "tag", "no-fit")).build())
148-
.addToData(Map.of("four", Base64.getEncoder().encodeToString("4".getBytes()))).build());
156+
.addToData(Map.of("four", Base64.getEncoder().encodeToString("4".getBytes()))).build())
157+
.create();
149158

150159
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
151160
Map.of("tag", "fit", "color", "blue"), new MockEnvironment(), Set.of("k8s"));
@@ -163,8 +172,10 @@ void testSecretDataByLabelsThreeSecretsFound() {
163172
// secret "my-secret" is deployed; we search for it by name and do not find it.
164173
@Test
165174
void testSecretDataByNameSecretNotFound() {
166-
client.secrets().inNamespace("spring-k8s").create(
167-
new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build()).build());
175+
client.secrets().inNamespace("spring-k8s")
176+
.resource(
177+
new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build()).build())
178+
.create();
168179
LinkedHashSet<String> names = new LinkedHashSet<>();
169180
names.add("nope");
170181
MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByName(client, "spring-k8s", names,
@@ -177,8 +188,9 @@ void testSecretDataByNameSecretNotFound() {
177188
@Test
178189
void testSecretDataByNameSecretFound() {
179190
client.secrets().inNamespace("spring-k8s")
180-
.create(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build())
181-
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build());
191+
.resource(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build())
192+
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build())
193+
.create();
182194
LinkedHashSet<String> names = new LinkedHashSet<>();
183195
names.add("my-secret");
184196

@@ -193,13 +205,15 @@ void testSecretDataByNameSecretFound() {
193205
@Test
194206
void testSecretDataByNameTwoSecretsFound() {
195207
client.secrets().inNamespace("spring-k8s")
196-
.create(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build())
197-
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build());
208+
.resource(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret").build())
209+
.addToData(Map.of("property", Base64.getEncoder().encodeToString("value".getBytes()))).build())
210+
.create();
198211

199212
client.secrets().inNamespace("spring-k8s")
200-
.create(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret-2").build())
213+
.resource(new SecretBuilder().withMetadata(new ObjectMetaBuilder().withName("my-secret-2").build())
201214
.addToData(Map.of("property-2", Base64.getEncoder().encodeToString("value-2".getBytes())))
202-
.build());
215+
.build())
216+
.create();
203217
LinkedHashSet<String> names = new LinkedHashSet<>();
204218
names.add("my-secret");
205219
names.add("my-secret-2");
@@ -218,8 +232,9 @@ void testSecretDataByNameTwoSecretsFound() {
218232
// and find it; but it has no data.
219233
@Test
220234
void testConfigMapsDataByNameFoundNoData() {
221-
client.configMaps().inNamespace("spring-k8s").create(
222-
new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build()).build());
235+
client.configMaps().inNamespace("spring-k8s").resource(
236+
new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build()).build())
237+
.create();
223238
LinkedHashSet<String> names = new LinkedHashSet<>();
224239
names.add("my-config-map");
225240

@@ -232,8 +247,9 @@ void testConfigMapsDataByNameFoundNoData() {
232247
// config-map "my-config-map" is deployed; we search for it and do not find it.
233248
@Test
234249
void testConfigMapsDataByNameNotFound() {
235-
client.configMaps().inNamespace("spring-k8s").create(
236-
new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build()).build());
250+
client.configMaps().inNamespace("spring-k8s").resource(
251+
new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build()).build())
252+
.create();
237253
LinkedHashSet<String> names = new LinkedHashSet<>();
238254
names.add("my-config-map-not-found");
239255
MultipleSourcesContainer result = Fabric8ConfigUtils.configMapsDataByName(client, "spring-k8s", names,
@@ -246,8 +262,9 @@ void testConfigMapsDataByNameNotFound() {
246262
@Test
247263
void testConfigMapDataByNameFound() {
248264
client.configMaps().inNamespace("spring-k8s")
249-
.create(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
250-
.addToData(Map.of("property", "value")).build());
265+
.resource(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
266+
.addToData(Map.of("property", "value")).build())
267+
.create();
251268

252269
LinkedHashSet<String> names = new LinkedHashSet<>();
253270
names.add("my-config-map");
@@ -263,8 +280,9 @@ void testConfigMapDataByNameFound() {
263280
@Test
264281
void testConfigMapDataByNameFoundWithPropertyFile() {
265282
client.configMaps().inNamespace("spring-k8s")
266-
.create(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
267-
.addToData(Map.of("application.yaml", "key1: value1")).build());
283+
.resource(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
284+
.addToData(Map.of("application.yaml", "key1: value1")).build())
285+
.create();
268286

269287
LinkedHashSet<String> names = new LinkedHashSet<>();
270288
names.add("my-config-map");
@@ -280,12 +298,15 @@ void testConfigMapDataByNameFoundWithPropertyFile() {
280298
@Test
281299
void testConfigMapDataByNameTwoFound() {
282300
client.configMaps().inNamespace("spring-k8s")
283-
.create(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
284-
.addToData(Map.of("property", "value")).build());
301+
.resource(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map").build())
302+
.addToData(Map.of("property", "value")).build())
303+
.create();
285304

286305
client.configMaps().inNamespace("spring-k8s")
287-
.create(new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map-2").build())
288-
.addToData(Map.of("property-2", "value-2")).build());
306+
.resource(
307+
new ConfigMapBuilder().withMetadata(new ObjectMetaBuilder().withName("my-config-map-2").build())
308+
.addToData(Map.of("property-2", "value-2")).build())
309+
.create();
289310

290311
LinkedHashSet<String> names = new LinkedHashSet<>();
291312
names.add("my-config-map");

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void setUpBeforeClass(KubernetesClient mockClient) {
5656
Secret secret = new SecretBuilder().withNewMetadata().withName("test-secret")
5757
.withLabels(singletonMap("foo", "bar")).endMetadata()
5858
.addToData("secretName", Base64.getEncoder().encodeToString(SECRET_VALUE.getBytes())).build();
59-
mockClient.secrets().inNamespace(NAMESPACE).create(secret);
59+
mockClient.secrets().inNamespace(NAMESPACE).resource(secret).create();
6060

6161
}
6262

0 commit comments

Comments
 (0)