Skip to content

Commit

Permalink
Merge branch '3.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanjbaxter
ryanjbaxter committed Oct 9, 2023
2 parents 5e315e5 + df6fd5c commit d703431
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 49 deletions.
9 changes: 5 additions & 4 deletions spring-cloud-kubernetes-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,20 @@
</dependencyManagement>

<modules>
<module>spring-cloud-kubernetes-fabric8-istio-it</module>
<module>spring-cloud-kubernetes-fabric8-client-catalog-watcher</module>
<module>spring-cloud-kubernetes-k8s-client-catalog-watcher</module>

<module>spring-cloud-kubernetes-fabric8-client-discovery</module>
<module>spring-cloud-kubernetes-fabric8-client-reload</module>
<module>spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap</module>
<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-event-and-polling-reload</module>
<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-fabric8-client-catalog-watcher</module>
<module>spring-cloud-kubernetes-client-catalog-watcher</module>
<module>spring-cloud-kubernetes-client-discovery-it</module>
<module>spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap</module>
</modules>
</project>
14 changes: 0 additions & 14 deletions ...pring-cloud-kubernetes-client-catalog-watcher/src/test/resources/app/watcher-service.yaml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...kubernetes-client-catalog-watcher/pom.xml → ...rnetes-k8s-client-catalog-watcher/pom.xml
View file
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-client-catalog-watcher</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-catalog-watcher</artifactId>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ubernetes/client/catalog/Application.java → ...s/client/catalog/watcher/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
2 changes: 1 addition & 1 deletion ...alog/EndpointNameAndNamespaceService.java → ...cher/EndpointNameAndNamespaceService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...tes/client/catalog/HeartBeatListener.java → ...nt/catalog/watcher/HeartBeatListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...s/client/catalog/HeartbeatController.java → .../catalog/watcher/HeartbeatController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.util.List;

Expand Down
14 changes: 7 additions & 7 deletions ...talog/KubernetesClientCatalogWatchIT.java → ...tcher/KubernetesClientCatalogWatchIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.time.Duration;
import java.util.List;
Expand Down Expand Up @@ -48,18 +48,18 @@
import org.springframework.web.reactive.function.client.WebClient;

import static org.awaitility.Awaitility.await;
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlices;
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces;
import static org.springframework.cloud.kubernetes.client.catalog.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces;
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.waitForLogStatement;
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlices;
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointSlicesNamespaces;
import static org.springframework.cloud.kubernetes.k8s.client.catalog.watcher.KubernetesClientCatalogWatchUtils.patchForEndpointsNamespaces;

/**
* @author wind57
*/
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class KubernetesClientCatalogWatchIT {

private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher";
private static final String APP_NAME = "spring-cloud-kubernetes-k8s-client-catalog-watcher";

private static final String NAMESPACE = "default";

Expand Down Expand Up @@ -129,12 +129,12 @@ void testCatalogWatchWithEndpointsNamespaces() {
util.busybox(NAMESPACE_A, Phase.CREATE);
util.busybox(NAMESPACE_B, Phase.CREATE);
patchForEndpointsNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE);
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces();
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointsNamespaces(APP_NAME);

util.busybox(NAMESPACE_A, Phase.CREATE);
util.busybox(NAMESPACE_B, Phase.CREATE);
patchForEndpointSlicesNamespaces(APP_NAME, NAMESPACE, DOCKER_IMAGE);
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces();
KubernetesClientCatalogWatchNamespacesDelegate.testCatalogWatchWithEndpointSlicesNamespaces(APP_NAME);
}

/**
Expand Down
12 changes: 5 additions & 7 deletions ...ClientCatalogWatchNamespacesDelegate.java → ...ClientCatalogWatchNamespacesDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.time.Duration;
import java.util.Arrays;
Expand Down Expand Up @@ -47,8 +47,6 @@ private KubernetesClientCatalogWatchNamespacesDelegate() {

}

private static final String APP_NAME = "spring-cloud-kubernetes-client-catalog-watcher";

private static final String NAMESPACE_A = "namespacea";

private static final String NAMESPACE_B = "namespaceb";
Expand All @@ -67,13 +65,13 @@ private KubernetesClientCatalogWatchNamespacesDelegate() {
* - assert that we receive only spring-cloud-kubernetes-client-catalog-watcher pod
* </pre>
*/
static void testCatalogWatchWithEndpointsNamespaces() {
waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, APP_NAME);
static void testCatalogWatchWithEndpointsNamespaces(String deploymentName) {
waitForLogStatement("stateGenerator is of type: KubernetesEndpointsCatalogWatch", K3S, deploymentName);
testForNamespacesFilter();
}

static void testCatalogWatchWithEndpointSlicesNamespaces() {
waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, APP_NAME);
static void testCatalogWatchWithEndpointSlicesNamespaces(String deploymentName) {
waitForLogStatement("stateGenerator is of type: KubernetesEndpointSlicesCatalogWatch", K3S, deploymentName);
testForNamespacesFilter();
}

Expand Down
10 changes: 5 additions & 5 deletions ...og/KubernetesClientCatalogWatchUtils.java → ...er/KubernetesClientCatalogWatchUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.cloud.kubernetes.client.catalog;
package org.springframework.cloud.kubernetes.k8s.client.catalog.watcher;

import java.util.Map;

Expand All @@ -26,7 +26,7 @@
final class KubernetesClientCatalogWatchUtils {

private static final Map<String, String> POD_LABELS = Map.of("app",
"spring-cloud-kubernetes-client-catalog-watcher");
"spring-cloud-kubernetes-k8s-client-catalog-watcher");

private KubernetesClientCatalogWatchUtils() {

Expand All @@ -38,7 +38,7 @@ private KubernetesClientCatalogWatchUtils() {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-client-catalog-watcher",
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
"image": "image_name_here",
"env": [
{
Expand All @@ -63,7 +63,7 @@ private KubernetesClientCatalogWatchUtils() {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-client-catalog-watcher",
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
"image": "image_name_here",
"env": [
{
Expand Down Expand Up @@ -96,7 +96,7 @@ private KubernetesClientCatalogWatchUtils() {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-client-catalog-watcher",
"name": "spring-cloud-kubernetes-k8s-client-catalog-watcher",
"image": "image_name_here",
"env": [
{
Expand Down
10 changes: 5 additions & 5 deletions ...est/resources/app/watcher-deployment.yaml → ...est/resources/app/watcher-deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: spring-cloud-kubernetes-client-catalog-watcher
name: spring-cloud-kubernetes-k8s-client-catalog-watcher
spec:
selector:
matchLabels:
app: spring-cloud-kubernetes-client-catalog-watcher
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
template:
metadata:
labels:
app: spring-cloud-kubernetes-client-catalog-watcher
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
spec:
serviceAccountName: spring-cloud-kubernetes-serviceaccount
containers:
- name: spring-cloud-kubernetes-client-catalog-watcher
image: docker.io/springcloud/spring-cloud-kubernetes-client-catalog-watcher
- name: spring-cloud-kubernetes-k8s-client-catalog-watcher
image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-catalog-watcher
imagePullPolicy: IfNotPresent
readinessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/resources/app/watcher-ingress.yaml → ...c/test/resources/app/watcher-ingress.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: spring-cloud-kubernetes-client-catalog-watcher-ingress
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-ingress
namespace: default
spec:
rules:
Expand All @@ -11,6 +11,6 @@ spec:
pathType: Prefix
backend:
service:
name: spring-cloud-kubernetes-client-catalog-watcher-service
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service
port:
number: 8080
14 changes: 14 additions & 0 deletions ...g-cloud-kubernetes-k8s-client-catalog-watcher/src/test/resources/app/watcher-service.yaml
View file
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-catalog-watcher-service
name: spring-cloud-kubernetes-k8s-client-catalog-watcher-service
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
app: spring-cloud-kubernetes-k8s-client-catalog-watcher
type: ClusterIP
0 ...tcher/src/test/resources/logback-test.xml → ...tcher/src/test/resources/logback-test.xml
View file
File renamed without changes.

1 comment on commit d703431

@wind57
Copy link
Contributor

@wind57 wind57 commented on d703431 Oct 9, 2023

Choose a reason for hiding this comment

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

I am more and more inclined to think that there is something we miss with github actions or they have issues internally. The build failure is again (though we have not see it in a while) a hang in the same exact place in surefire, something that I really thought I fixed. Granted, it has not happened in some time, but boy this is annoying! I will look at the problem again, but in the meanwhile can I ask for a re-trigger here please? @ryanjbaxter

Please sign in to comment.