Merge pull request #1085 from pohly/extender-removal

remove support for scheduler extender and mutating pod webhook
intel · Dec 13, 2022 · fac6752 · fac6752
2 parents 361c8f8 + 003fada
commit fac6752
Show file tree

Hide file tree

Showing 90 changed files with 102 additions and 4,155 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,7 +39,7 @@ RUN equivs-build python3-fake-debian-package
 RUN set -x && \
     git clone https://github.com/intel/ipmctl.git && \
     cd ipmctl && \
-    tag=$(curl --silent https://github.com/intel/ipmctl/releases/latest | sed -e 's;.*tag/\([^"]*\).*;\1;') && \
+    tag=$(basename $(curl -Ls -o /dev/null -w %{url_effective} https://github.com/intel/ipmctl/releases/latest)) && \
     git checkout $tag && \
     mkdir build && \
     cd build && \

diff --git a/Dockerfile.UBI b/Dockerfile.UBI
@@ -59,7 +59,7 @@ RUN set -x && \
     mkdir -p /usr/local/share/package-licenses && \
     cp LICENSE /usr/local/share/package-licenses/ipmctl.LICENSE && \
     cd ipmctl && \
-    tag=$(curl --silent https://github.com/intel/ipmctl/releases/latest | sed -e 's;.*tag/\([^"]*\).*;\1;') && \
+    tag=$(basename $(curl -Ls -o /dev/null -w %{url_effective} https://github.com/intel/ipmctl/releases/latest)) && \
     git checkout $tag && \
     mkdir build && \
     cd build && \

diff --git a/conf.json b/conf.json
@@ -9,8 +9,7 @@
         "_work",
         "deploy/kustomize",
         "third-party",
-        "test/test-config.d",
-        "pkg/scheduler"
+        "test/test-config.d"
     ],
     "extensions": [
         "linkcheck2",

diff --git a/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml b/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml
@@ -89,12 +89,9 @@ spec:
                     type: object
                 type: object
               controllerTLSSecret:
-                description: ControllerTLSSecret is the name of a secret which contains
-                  ca.crt, tls.crt and tls.key data for the scheduler extender and
-                  pod mutation webhook. A controller is started if (and only if) this
-                  secret is specified. The special string "-openshift-" enables the
-                  usage of https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html
-                  to create certificates.
+                description: "ControllerTLSSecret used to be the name of a secret
+                  which contains ca.crt, tls.crt and tls.key data for the scheduler
+                  extender and pod mutation webhook. It is now unused. \n DEPRECATED"
                 type: string
               deviceMode:
                 description: DeviceMode to use to manage PMEM devices.
@@ -135,9 +132,9 @@ spec:
                   increased with this setting, either with a higher integer or a percentage.
                 x-kubernetes-int-or-string: true
               mutatePods:
-                description: MutatePod defines how a mutating pod webhook is configured
+                description: "MutatePod defines how a mutating pod webhook is configured
                   if a controller is started. The field is ignored if the controller
-                  is not enabled. The default is "Try".
+                  is not enabled. The default is \"Try\". \n DEPRECATED"
                 enum:
                 - Always
                 - Try
@@ -246,12 +243,12 @@ spec:
                     type: object
                 type: object
               schedulerNodePort:
-                description: SchedulerNodePort, if non-zero, ensures that the "scheduler"
+                description: "SchedulerNodePort, if non-zero, ensures that the \"scheduler\"
                   service is created as a NodeService with that fixed port number.
                   Otherwise that service is created as a cluster service. The number
                   must be from the range reserved by Kubernetes for node ports. This
                   is useful if the kube-scheduler cannot reach the scheduler extender
-                  via a cluster service.
+                  via a cluster service. \n DEPRECATED"
                 format: int32
                 type: integer
             type: object

diff --git a/deploy/kubernetes-1.21/direct/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         env:
         - name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         - -v=5
         env:
@@ -398,20 +394,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/lvm/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         env:
         - name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         - -v=5
         env:
@@ -398,20 +394,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         - -v=5
         env:
@@ -398,20 +394,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/pmem-csi-direct.yaml b/deploy/kubernetes-1.21/pmem-csi-direct.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         env:
         - name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.21/pmem-csi-lvm-testing.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         - -v=5
         env:
@@ -398,20 +394,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.21/pmem-csi-lvm.yaml b/deploy/kubernetes-1.21/pmem-csi-lvm.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         env:
         - name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.22/direct/pmem-csi.yaml b/deploy/kubernetes-1.22/direct/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         env:
         - name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet

diff --git a/deploy/kubernetes-1.22/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.22/direct/testing/pmem-csi.yaml
@@ -352,10 +352,6 @@ spec:
         - -mode=webhooks
         - -drivername=$(PMEM_CSI_DRIVER_NAME)
         - -nodeSelector={"storage":"pmem"}
-        - -caFile=
-        - -certFile=/certs/tls.crt
-        - -keyFile=/certs/tls.key
-        - -schedulerListen=:8000
         - -metricsListen=:10010
         - -v=5
         env:
@@ -398,20 +394,13 @@ spec:
           successThreshold: 1
           timeoutSeconds: 5
         terminationMessagePath: /dev/termination-log
-        volumeMounts:
-        - mountPath: /certs
-          name: webhook-cert
       priorityClassName: system-cluster-critical
       serviceAccountName: pmem-csi-intel-com-webhooks
       tolerations:
       - effect: NoSchedule
         operator: Exists
       - effect: NoExecute
         operator: Exists
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: pmem-csi-intel-com-controller-secret
 ---
 apiVersion: apps/v1
 kind: DaemonSet