deploy: remove differences between 1.18 and 1.20 deployment

The manual editing as part of 03204df
caused the two deployments to diverge (different label selectors,
service defined with old "app" label in 1.20).

Now "diff -r deploy/kubernetes-1.18 deploy/kubernetes-1.20" shows only
intentional changes around the snapshotter beta API.

Author: pohly

deploy/kubernetes-1.18/hostpath/csi-hostpath-attacher.yaml

@@ -29,10 +29,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app.kubernetes.io/name
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-attacher
       containers:

deploy/kubernetes-1.18/hostpath/csi-hostpath-plugin.yaml

@@ -1,26 +1,3 @@
-# Service defined here, plus serviceName below in StatefulSet,
-# are needed only because of condition explained in
-# https://github.com/kubernetes/kubernetes/issues/69608
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: csi-hostpathplugin
-  labels:
-    app.kubernetes.io/instance: hostpath.csi.k8s.io
-    app.kubernetes.io/part-of: csi-driver-host-path
-    app.kubernetes.io/name: csi-hostpathplugin
-    app.kubernetes.io/component: plugin
-spec:
-  selector:
-    app.kubernetes.io/instance: hostpath.csi.k8s.io
-    app.kubernetes.io/part-of: csi-driver-host-path
-    app.kubernetes.io/name: csi-hostpathplugin
-    app.kubernetes.io/component: plugin
-  ports:
-    - name: dummy
-      port: 12345
----
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:

deploy/kubernetes-1.18/hostpath/csi-hostpath-provisioner.yaml

@@ -29,10 +29,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app.kubernetes.io/name
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-provisioner
       containers:

deploy/kubernetes-1.18/hostpath/csi-hostpath-resizer.yaml

@@ -29,10 +29,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app.kubernetes.io/name
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-resizer
       containers:

deploy/kubernetes-1.18/hostpath/csi-hostpath-snapshotter.yaml

@@ -29,10 +29,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app.kubernetes.io/name
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-snapshotter
       containers:

deploy/kubernetes-1.18/hostpath/csi-hostpath-testing.yaml

@@ -57,10 +57,10 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app.kubernetes.io/name
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       containers:
         - name: socat

deploy/kubernetes-1.20/hostpath/csi-hostpath-plugin.yaml

@@ -1,23 +1,3 @@
-# Service defined here, plus serviceName below in StatefulSet,
-# are needed only because of condition explained in
-# https://github.com/kubernetes/kubernetes/issues/69608
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: csi-hostpathplugin
-  labels:
-    app.kubernetes.io/instance: hostpath.csi.k8s.io
-    app.kubernetes.io/part-of: csi-driver-host-path
-    app.kubernetes.io/name: csi-hostpathplugin
-    app.kubernetes.io/component: plugin
-spec:
-  selector:
-    app: csi-hostpathplugin
-  ports:
-    - name: dummy
-      port: 12345
----
 kind: StatefulSet
 apiVersion: apps/v1
 metadata: