SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Updating deployment files with new version numbers

Browse Source 
* Pulling images and loading them into kind in order to avoid DockerHub limits on Jenkins
This commit is contained in:
Ryan Baxter
2021-01-08 15:59:25 -05:00
parent 1ec518ef41
commit 65f87238ef
23 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@@ -1039,7 +1039,7 @@ items:
serviceAccount: spring-cloud-kubernetes-configuration-watcher
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
docs/src/main/asciidoc/spring-cloud-kubernetes-configuration-watcher.adoc
View File

@@ -87,7 +87,7 @@ items:
serviceAccount: spring-cloud-kubernetes-configuration-watcher
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/k8s/deployment.yaml
View File

@@ -60,7 +60,7 @@ items:
serviceAccount: spring-cloud-kubernetes-configuration-watcher
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

7
spring-cloud-kubernetes-integration-tests/run.sh
View File

@@ -29,9 +29,7 @@ ALL_INTEGRATION_PROJECTS=(
)
INTEGRATION_PROJECTS=(${INTEGRATION_PROJECTS:-${ALL_INTEGRATION_PROJECTS[@]}})
DEFAULT_PULLING_IMAGES=(
"docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:${MVN_VERSION}"
)
DEFAULT_PULLING_IMAGES=()
PULLING_IMAGES=(${PULLING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}})
CURRENT_DIR="$(pwd)"
@@ -86,6 +84,9 @@ main() {
kubectl cluster-info --context kind-kind
#setup nginx ingress
# Pull this image to avoid DockerHub limits when running on Jenkins
docker pull jettech/kube-webhook-certgen:v1.2.2
"${KIND}" load docker-image jettech/kube-webhook-certgen:v1.2.2
# kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml
kubectl apply -fhttps://raw.githubusercontent.com/kubernetes/ingress-nginx/12150e318b972a03fb49d827e6cabb8ef62247ef/deploy/static/provider/kind/deploy.yaml
sleep 5 # hold 5 sec so that the pods can be created

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-it.yaml
View File

@@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT
- image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: spring-cloud-kubernetes-client-config-it
resources: {}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-polling-it.yaml
View File

@@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT
- image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: spring-cloud-kubernetes-client-config-it
resources: {}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-client-config-it
image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-client-config-it
image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/k8s/deployment-it.yaml
View File

@@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- image: springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT
- image: springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: spring-cloud-kubernetes-client-loadbalancer-it
resources: {}

22
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java
View File

@@ -119,10 +119,10 @@ public class LoadBalancerIT {
private void cleanup() throws ApiException {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null,
null, null);
"metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null,
null, null);
api.deleteNamespacedService(SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME, NAMESPACE, null, null, null, null, null,
null);
null);
networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null);
}
@@ -148,8 +148,8 @@ public class LoadBalancerIT {
// Sometimes the NGINX ingress takes a bit to catch up and realize the service is
// available and we get a 503, we just need to wait a bit
await().timeout(Duration.ofSeconds(60))
.until(() -> rest.getForEntity("http://localhost:80/loadbalancer-it/servicea", String.class)
.getStatusCode().is2xxSuccessful());
.until(() -> rest.getForEntity("http://localhost:80/loadbalancer-it/servicea", String.class)
.getStatusCode().is2xxSuccessful());
Map<String, Object> result = rest.getForObject("http://localhost:80/loadbalancer-it/servicea", Map.class);
assertThat(result.containsKey("mappings")).isTrue();
assertThat(result.containsKey("meta")).isTrue();
@@ -159,7 +159,7 @@ public class LoadBalancerIT {
@After
public void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null);
@@ -180,25 +180,25 @@ public class LoadBalancerIT {
private V1Service getLoadbalancerItService() throws Exception {
V1Service service = (V1Service) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-it-service.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-it-service.yaml");
return service;
}
private V1Deployment getLoadbalancerServiceItDeployment() throws Exception {
V1Deployment deployment = (V1Deployment) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml");
return deployment;
}
private V1Deployment getLoadbalancerPodItDeployment() throws Exception {
V1Deployment deployment = (V1Deployment) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml");
return deployment;
}
private NetworkingV1beta1Ingress getLoadbalancerItIngress() throws Exception {
NetworkingV1beta1Ingress ingress = (NetworkingV1beta1Ingress) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-loadbalancer-it-ingress.yaml");
return ingress;
}
@@ -210,7 +210,7 @@ public class LoadBalancerIT {
private NetworkingV1beta1Ingress getWiremockIngress() throws Exception {
NetworkingV1beta1Ingress ingress = (NetworkingV1beta1Ingress) k8SUtils
.readYamlFromClasspath("wiremock-ingress.yaml");
.readYamlFromClasspath("wiremock-ingress.yaml");
return ingress;
}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml
View File

@@ -17,7 +17,7 @@ spec:
env:
- name: SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE
value: POD
image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml
View File

@@ -17,7 +17,7 @@ spec:
env:
- name: SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE
value: SERVICE
image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/k8s/deployment-it.yaml
View File

@@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- image: springcloud/spring-cloud-kubernetes-client-reactive-discovery-it:2.0.0-SNAPSHOT
- image: springcloud/spring-cloud-kubernetes-client-reactive-discovery-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: spring-cloud-kubernetes-client-reactive-discovery-it
resources: {}

20
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java
View File

@@ -111,10 +111,10 @@ public class ReactiveDiscoveryClientIT {
private void cleanup() throws ApiException {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_DEPLOYMENT_NAME, null, null, null, null, null,
null, null, null);
"metadata.name=" + SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_DEPLOYMENT_NAME, null, null, null, null, null,
null, null, null);
api.deleteNamespacedService(SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_APP_NAME, NAMESPACE, null, null, null, null,
null, null);
null, null);
networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null);
}
@@ -140,8 +140,8 @@ public class ReactiveDiscoveryClientIT {
// Sometimes the NGINX ingress takes a bit to catch up and realize the service is
// available and we get a 503, we just need to wait a bit
await().timeout(Duration.ofSeconds(60))
.until(() -> rest.getForEntity("http://localhost:80/reactive-discovery-it/services", String.class)
.getStatusCode().is2xxSuccessful());
.until(() -> rest.getForEntity("http://localhost:80/reactive-discovery-it/services", String.class)
.getStatusCode().is2xxSuccessful());
String result = rest.getForObject("http://localhost:80/reactive-discovery-it/services", String.class);
assertThat(Arrays.stream(result.split(",")).anyMatch(s -> "servicea-wiremock".equalsIgnoreCase(s))).isTrue();
@@ -150,7 +150,7 @@ public class ReactiveDiscoveryClientIT {
@After
public void after() throws Exception {
appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null,
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
"metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null);
api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null);
networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null);
@@ -165,19 +165,19 @@ public class ReactiveDiscoveryClientIT {
private V1Service getReactiveDiscoveryService() throws Exception {
V1Service service = (V1Service) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-service.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-service.yaml");
return service;
}
private V1Deployment getReactiveDiscoveryItDeployment() throws Exception {
V1Deployment deployment = (V1Deployment) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml");
return deployment;
}
private NetworkingV1beta1Ingress getReactiveDiscoveryItIngress() throws Exception {
NetworkingV1beta1Ingress ingress = (NetworkingV1beta1Ingress) k8SUtils
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-ingress.yaml");
.readYamlFromClasspath("spring-cloud-kubernetes-client-reactive-discovery-it-ingress.yaml");
return ingress;
}
@@ -189,7 +189,7 @@ public class ReactiveDiscoveryClientIT {
private NetworkingV1beta1Ingress getWiremockIngress() throws Exception {
NetworkingV1beta1Ingress ingress = (NetworkingV1beta1Ingress) k8SUtils
.readYamlFromClasspath("wiremock-ingress.yaml");
.readYamlFromClasspath("wiremock-ingress.yaml");
return ingress;
}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/resources/spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-client-reactive-discovery-it
image: docker.io/springcloud/spring-cloud-kubernetes-client-reactive-discovery-client-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-client-reactive-discovery-client-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml
View File

@@ -18,7 +18,7 @@ spec:
app: k8s-demo-app
spec:
containers:
- image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT
- image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT
name: spring-cloud-kubernetes-configuration-watcher-it
resources: {}
env:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-configuration-watcher
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: spring-cloud-kubernetes-configuration-watcher-it
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: spring-cloud-kubernetes-configuration-watcher-it
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
env:
- name: SPRING_PROFILES_ACTIVE

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/k8s/deployment-it.yaml
View File

@@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- image: springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT
- image: springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
name: spring-cloud-kubernetes-core-k8s-client-it
resources: {}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml
View File

@@ -14,7 +14,7 @@ spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-core-k8s-client-it
image: docker.io/springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT
image: docker.io/springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.1-SNAPSHOT
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet: