Skip to content

Fabric8 it part 13 #1483

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
merged 4 commits into from
Oct 20, 2023
Merged

Fabric8 it part 13 #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70f5c76
first commit
wind57 Oct 14, 2023
6e853fe
fix
wind57 Oct 18, 2023
047442a
Merge branch '3.0.x' into fabric8-it-part-13
wind57 Oct 19, 2023
f875bbc
fix
wind57 Oct 20, 2023
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
5 changes: 4 additions & 1 deletion spring-cloud-kubernetes-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@
<module>spring-cloud-kubernetes-fabric8-client-reload</module>
<module>spring-cloud-kubernetes-k8s-client-reload</module>

<!-- discovery using discovery server -->
<!-- since discovery controller is based on k8s-client, we do not have a fabric8 module -->
<module>spring-cloud-kubernetes-k8s-client-discovery-server</module>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a rename in this PR really.


<module>spring-cloud-kubernetes-fabric8-istio-it</module>

<module>spring-cloud-kubernetes-discoveryclient-it</module>
<module>spring-cloud-kubernetes-client-loadbalancer-it</module>
<module>spring-cloud-kubernetes-configuration-watcher-it</module>
<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
Expand Down
14 changes: 0 additions & 14 deletions ...ient-it/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-service.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...oud-kubernetes-discoveryclient-it/pom.xml → ...netes-k8s-client-discovery-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-cloud-kubernetes-discoveryclient-it</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-discovery-server</artifactId>

<dependencies>
<dependency>
Expand Down
0 ...bernetesDiscoveryClientApplicationIt.java → ...bernetesDiscoveryClientApplicationIt.java
View file
Open in desktop
File renamed without changes.
0 ...nt-it/src/main/resources/application.yaml → ...erver/src/main/resources/application.yaml
View file
Open in desktop
File renamed without changes.
0 ...scoveryClientFilterNamespaceDelegate.java → ...scoveryClientFilterNamespaceDelegate.java
View file
Open in desktop
File renamed without changes.
13 changes: 7 additions & 6 deletions ...discoveryclient/it/DiscoveryClientIT.java → ...discoveryclient/it/DiscoveryClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class DiscoveryClientIT {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-discoveryclient-it",
"name": "spring-cloud-kubernetes-k8s-client-discovery-server",
"image": "image_name_here",
"env": [
{
Expand All @@ -77,7 +77,7 @@ class DiscoveryClientIT {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-discoveryserver",
"name": "spring-cloud-kubernetes-k8s-client-discovery-server",
"image": "image_name_here",
"env": [
{
Expand All @@ -92,7 +92,8 @@ class DiscoveryClientIT {
}
""";

private static final Map<String, String> POD_LABELS = Map.of("app", "spring-cloud-kubernetes-discoveryclient-it");
private static final Map<String, String> POD_LABELS = Map.of("app",
"spring-cloud-kubernetes-k8s-client-discovery-server");

private static final Map<String, String> POD_LABELS_DISCOVERY = Map.of("app",
"spring-cloud-kubernetes-discoveryserver");
Expand All @@ -101,7 +102,7 @@ class DiscoveryClientIT {

private static final String DISCOVERY_SERVER_APP_NAME = "spring-cloud-kubernetes-discoveryserver";

private static final String SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME = "spring-cloud-kubernetes-discoveryclient-it";
private static final String SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME = "spring-cloud-kubernetes-k8s-client-discovery-server";

private static final String NAMESPACE = "default";

Expand Down Expand Up @@ -170,8 +171,8 @@ void testDiscoveryClient() {
testHealth();

patchForNamespaceFilter(
"docker.io/springcloud/spring-cloud-kubernetes-discoveryclient-it:" + Commons.pomVersion(),
"spring-cloud-kubernetes-discoveryclient-it-deployment", NAMESPACE);
"docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery-server:" + Commons.pomVersion(),
"spring-cloud-kubernetes-k8s-client-discovery-server-deployment", NAMESPACE);
patchForAllNamespaces("docker.io/springcloud/spring-cloud-kubernetes-discoveryserver:" + Commons.pomVersion(),
"spring-cloud-kubernetes-discoveryserver-deployment", NAMESPACE);
testNamespaceDiscoveryClient();
Expand Down
10 changes: 5 additions & 5 deletions ...rnetes-discoveryclient-it-deployment.yaml → ...rnetes-discoveryclient-it-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: spring-cloud-kubernetes-discoveryclient-it-deployment
name: spring-cloud-kubernetes-k8s-client-discovery-server-deployment
spec:
selector:
matchLabels:
app: spring-cloud-kubernetes-discoveryclient-it
app: spring-cloud-kubernetes-k8s-client-discovery-server
template:
metadata:
labels:
app: spring-cloud-kubernetes-discoveryclient-it
app: spring-cloud-kubernetes-k8s-client-discovery-server
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-discoveryclient-it
image: docker.io/springcloud/spring-cloud-kubernetes-discoveryclient-it
- name: spring-cloud-kubernetes-k8s-client-discovery-server
image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery-server
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...ubernetes-discoveryclient-it-ingress.yaml → ...ubernetes-discoveryclient-it-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ spec:
pathType: Prefix
backend:
service:
name: spring-cloud-kubernetes-discoveryclient-it
name: spring-cloud-kubernetes-k8s-client-discovery-server
port:
number: 8080
14 changes: 14 additions & 0 deletions ...-server/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: v1
kind: Service
metadata:
labels:
app: spring-cloud-kubernetes-k8s-client-discovery-server
name: spring-cloud-kubernetes-k8s-client-discovery-server
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
app: spring-cloud-kubernetes-k8s-client-discovery-server
type: ClusterIP
0 ...nt-it/src/test/resources/logback-test.xml → ...erver/src/test/resources/logback-test.xml
View file
Open in desktop
File renamed without changes.
0 ...er/cluster-admin-serviceaccount-role.yaml → ...er/cluster-admin-serviceaccount-role.yaml
View file
Open in desktop
File renamed without changes.
0 ...ubernetes-discoveryserver-deployment.yaml → ...ubernetes-discoveryserver-deployment.yaml
View file
Open in desktop
File renamed without changes.
0 ...d-kubernetes-discoveryserver-ingress.yaml → ...d-kubernetes-discoveryserver-ingress.yaml
View file
Open in desktop
File renamed without changes.
0 ...d-kubernetes-discoveryserver-service.yaml → ...d-kubernetes-discoveryserver-service.yaml
View file
Open in desktop
File renamed without changes.