Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit fac6752

Browse files
authored
Merge pull request #1085 from pohly/extender-removal
remove support for scheduler extender and mutating pod webhook
2 parents 361c8f8 + 003fada commit fac6752

File tree

90 files changed

+102
-4155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+102
-4155
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN equivs-build python3-fake-debian-package
3939
RUN set -x && \
4040
git clone https://github.com/intel/ipmctl.git && \
4141
cd ipmctl && \
42-
tag=$(curl --silent https://github.com/intel/ipmctl/releases/latest | sed -e 's;.*tag/\([^"]*\).*;\1;') && \
42+
tag=$(basename $(curl -Ls -o /dev/null -w %{url_effective} https://github.com/intel/ipmctl/releases/latest)) && \
4343
git checkout $tag && \
4444
mkdir build && \
4545
cd build && \

Dockerfile.UBI

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN set -x && \
5959
mkdir -p /usr/local/share/package-licenses && \
6060
cp LICENSE /usr/local/share/package-licenses/ipmctl.LICENSE && \
6161
cd ipmctl && \
62-
tag=$(curl --silent https://github.com/intel/ipmctl/releases/latest | sed -e 's;.*tag/\([^"]*\).*;\1;') && \
62+
tag=$(basename $(curl -Ls -o /dev/null -w %{url_effective} https://github.com/intel/ipmctl/releases/latest)) && \
6363
git checkout $tag && \
6464
mkdir build && \
6565
cd build && \

conf.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"_work",
1010
"deploy/kustomize",
1111
"third-party",
12-
"test/test-config.d",
13-
"pkg/scheduler"
12+
"test/test-config.d"
1413
],
1514
"extensions": [
1615
"linkcheck2",

deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,9 @@ spec:
8989
type: object
9090
type: object
9191
controllerTLSSecret:
92-
description: ControllerTLSSecret is the name of a secret which contains
93-
ca.crt, tls.crt and tls.key data for the scheduler extender and
94-
pod mutation webhook. A controller is started if (and only if) this
95-
secret is specified. The special string "-openshift-" enables the
96-
usage of https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html
97-
to create certificates.
92+
description: "ControllerTLSSecret used to be the name of a secret
93+
which contains ca.crt, tls.crt and tls.key data for the scheduler
94+
extender and pod mutation webhook. It is now unused. \n DEPRECATED"
9895
type: string
9996
deviceMode:
10097
description: DeviceMode to use to manage PMEM devices.
@@ -135,9 +132,9 @@ spec:
135132
increased with this setting, either with a higher integer or a percentage.
136133
x-kubernetes-int-or-string: true
137134
mutatePods:
138-
description: MutatePod defines how a mutating pod webhook is configured
135+
description: "MutatePod defines how a mutating pod webhook is configured
139136
if a controller is started. The field is ignored if the controller
140-
is not enabled. The default is "Try".
137+
is not enabled. The default is \"Try\". \n DEPRECATED"
141138
enum:
142139
- Always
143140
- Try
@@ -246,12 +243,12 @@ spec:
246243
type: object
247244
type: object
248245
schedulerNodePort:
249-
description: SchedulerNodePort, if non-zero, ensures that the "scheduler"
246+
description: "SchedulerNodePort, if non-zero, ensures that the \"scheduler\"
250247
service is created as a NodeService with that fixed port number.
251248
Otherwise that service is created as a cluster service. The number
252249
must be from the range reserved by Kubernetes for node ports. This
253250
is useful if the kube-scheduler cannot reach the scheduler extender
254-
via a cluster service.
251+
via a cluster service. \n DEPRECATED"
255252
format: int32
256253
type: integer
257254
type: object

deploy/kubernetes-1.21/direct/pmem-csi.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
env:
361357
- name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
397393
successThreshold: 1
398394
timeoutSeconds: 5
399395
terminationMessagePath: /dev/termination-log
400-
volumeMounts:
401-
- mountPath: /certs
402-
name: webhook-cert
403396
priorityClassName: system-cluster-critical
404397
serviceAccountName: pmem-csi-intel-com-webhooks
405398
tolerations:
406399
- effect: NoSchedule
407400
operator: Exists
408401
- effect: NoExecute
409402
operator: Exists
410-
volumes:
411-
- name: webhook-cert
412-
secret:
413-
secretName: pmem-csi-intel-com-controller-secret
414403
---
415404
apiVersion: apps/v1
416405
kind: DaemonSet

deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
- -v=5
361357
env:
@@ -398,20 +394,13 @@ spec:
398394
successThreshold: 1
399395
timeoutSeconds: 5
400396
terminationMessagePath: /dev/termination-log
401-
volumeMounts:
402-
- mountPath: /certs
403-
name: webhook-cert
404397
priorityClassName: system-cluster-critical
405398
serviceAccountName: pmem-csi-intel-com-webhooks
406399
tolerations:
407400
- effect: NoSchedule
408401
operator: Exists
409402
- effect: NoExecute
410403
operator: Exists
411-
volumes:
412-
- name: webhook-cert
413-
secret:
414-
secretName: pmem-csi-intel-com-controller-secret
415404
---
416405
apiVersion: apps/v1
417406
kind: DaemonSet

deploy/kubernetes-1.21/lvm/pmem-csi.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
env:
361357
- name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
397393
successThreshold: 1
398394
timeoutSeconds: 5
399395
terminationMessagePath: /dev/termination-log
400-
volumeMounts:
401-
- mountPath: /certs
402-
name: webhook-cert
403396
priorityClassName: system-cluster-critical
404397
serviceAccountName: pmem-csi-intel-com-webhooks
405398
tolerations:
406399
- effect: NoSchedule
407400
operator: Exists
408401
- effect: NoExecute
409402
operator: Exists
410-
volumes:
411-
- name: webhook-cert
412-
secret:
413-
secretName: pmem-csi-intel-com-controller-secret
414403
---
415404
apiVersion: apps/v1
416405
kind: DaemonSet

deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
- -v=5
361357
env:
@@ -398,20 +394,13 @@ spec:
398394
successThreshold: 1
399395
timeoutSeconds: 5
400396
terminationMessagePath: /dev/termination-log
401-
volumeMounts:
402-
- mountPath: /certs
403-
name: webhook-cert
404397
priorityClassName: system-cluster-critical
405398
serviceAccountName: pmem-csi-intel-com-webhooks
406399
tolerations:
407400
- effect: NoSchedule
408401
operator: Exists
409402
- effect: NoExecute
410403
operator: Exists
411-
volumes:
412-
- name: webhook-cert
413-
secret:
414-
secretName: pmem-csi-intel-com-controller-secret
415404
---
416405
apiVersion: apps/v1
417406
kind: DaemonSet

deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
- -v=5
361357
env:
@@ -398,20 +394,13 @@ spec:
398394
successThreshold: 1
399395
timeoutSeconds: 5
400396
terminationMessagePath: /dev/termination-log
401-
volumeMounts:
402-
- mountPath: /certs
403-
name: webhook-cert
404397
priorityClassName: system-cluster-critical
405398
serviceAccountName: pmem-csi-intel-com-webhooks
406399
tolerations:
407400
- effect: NoSchedule
408401
operator: Exists
409402
- effect: NoExecute
410403
operator: Exists
411-
volumes:
412-
- name: webhook-cert
413-
secret:
414-
secretName: pmem-csi-intel-com-controller-secret
415404
---
416405
apiVersion: apps/v1
417406
kind: DaemonSet

deploy/kubernetes-1.21/pmem-csi-direct.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ spec:
352352
- -mode=webhooks
353353
- -drivername=$(PMEM_CSI_DRIVER_NAME)
354354
- -nodeSelector={"storage":"pmem"}
355-
- -caFile=
356-
- -certFile=/certs/tls.crt
357-
- -keyFile=/certs/tls.key
358-
- -schedulerListen=:8000
359355
- -metricsListen=:10010
360356
env:
361357
- name: TERMINATION_LOG_PATH
@@ -397,20 +393,13 @@ spec:
397393
successThreshold: 1
398394
timeoutSeconds: 5
399395
terminationMessagePath: /dev/termination-log
400-
volumeMounts:
401-
- mountPath: /certs
402-
name: webhook-cert
403396
priorityClassName: system-cluster-critical
404397
serviceAccountName: pmem-csi-intel-com-webhooks
405398
tolerations:
406399
- effect: NoSchedule
407400
operator: Exists
408401
- effect: NoExecute
409402
operator: Exists
410-
volumes:
411-
- name: webhook-cert
412-
secret:
413-
secretName: pmem-csi-intel-com-controller-secret
414403
---
415404
apiVersion: apps/v1
416405
kind: DaemonSet

0 commit comments

Comments
 (0)