From be88a79b6ab7fd304c86d1bc2fc205bfe503bd6b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 2 Jan 2024 08:08:07 -0500 Subject: [PATCH] Remove unused csi-hostpath-testing.yaml This yaml file uses `docker.io/alpine/socat:1.7.4.3-r0`, either we figure out how to replace the image or just eliminate the yaml itself if it is not being used for testing anything in this repository. Found this when we run `e2e.test --list-images`, the dockerhub image reference above shows up which gives a false impression that we depend on this image for our testing purposes. Also we should NOT depend on a dockerhub image anyways! Signed-off-by: Davanum Srinivas --- .../hostpath/csi-hostpath-testing.yaml | 83 ------------------- test/utils/image/csi_manifests_test.go | 1 - 2 files changed, 84 deletions(-) delete mode 100644 test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-testing.yaml diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-testing.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-testing.yaml deleted file mode 100644 index 7253a70a9d4..00000000000 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-testing.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# WARNING: this is only for testing purposes. Do not install in a production -# cluster. -# -# This exposes the hostpath's Unix domain csi.sock as a TCP port to the -# outside world. The mapping from Unix domain socket to TCP is done -# by socat. -# -# This is useful for testing with csi-sanity or csc. - -apiVersion: v1 -kind: Service -metadata: - name: hostpath-service - labels: - app.kubernetes.io/instance: hostpath.csi.k8s.io - app.kubernetes.io/part-of: csi-driver-host-path - app.kubernetes.io/name: csi-hostpath-socat - app.kubernetes.io/component: socat -spec: - type: NodePort - selector: - app.kubernetes.io/instance: hostpath.csi.k8s.io - app.kubernetes.io/part-of: csi-driver-host-path - app.kubernetes.io/name: csi-hostpath-socat - app.kubernetes.io/component: socat - ports: - - port: 10000 # fixed port inside the pod, dynamically allocated port outside ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-socat - labels: - app.kubernetes.io/instance: hostpath.csi.k8s.io - app.kubernetes.io/part-of: csi-driver-host-path - app.kubernetes.io/name: csi-hostpath-socat - app.kubernetes.io/component: socat -spec: - serviceName: "csi-hostpath-socat" - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/instance: hostpath.csi.k8s.io - app.kubernetes.io/part-of: csi-driver-host-path - app.kubernetes.io/name: csi-hostpath-socat - app.kubernetes.io/component: socat - template: - metadata: - labels: - app.kubernetes.io/instance: hostpath.csi.k8s.io - app.kubernetes.io/part-of: csi-driver-host-path - app.kubernetes.io/name: csi-hostpath-socat - app.kubernetes.io/component: socat - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app.kubernetes.io/instance - operator: In - values: - - hostpath.csi.k8s.io - topologyKey: kubernetes.io/hostname - containers: - - name: socat - image: docker.io/alpine/socat:1.7.4.3-r0 - args: - - tcp-listen:10000,fork,reuseaddr - - unix-connect:/csi/csi.sock - securityContext: - # This is necessary only for systems with SELinux, where - # non-privileged sidecar containers cannot access unix domain socket - # created by privileged CSI driver container. - privileged: true - volumeMounts: - - mountPath: /csi - name: socket-dir - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/test/utils/image/csi_manifests_test.go b/test/utils/image/csi_manifests_test.go index d2ab19560ca..26c317d4637 100644 --- a/test/utils/image/csi_manifests_test.go +++ b/test/utils/image/csi_manifests_test.go @@ -48,7 +48,6 @@ func TestCSIImageConfigs(t *testing.T) { "gcp-compute-persistent-disk-csi-driver", // For some hostpath tests. - "socat", "busybox", // For AnyVolumeDataSource feature tests.