Merge branch '3.0.x'

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/busybox/deployment.yaml

@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: busybox
-spec:
-  selector:
-    matchLabels:
-      app: busybox
-      version: v1
-  replicas: 2
-  template:
-    metadata:
-      labels:
-        app: busybox
-        version: v1
-    spec:
-      containers:
-        - name: busybox
-          # image: arm64/busybox:latest
-          image: busybox:1.35
-          command: ["/bin/sh"]
-          args: ["-c", "sleep 100000"]

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/resources/busybox/service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: busybox-service
-spec:
-  selector:
-    app: busybox
-  type: ClusterIP
-  ports:
-    - name: busybox-port
-      port: 8080
-      targetPort: 80