Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to use the new SSP operator [release-1.3] #1026

Merged
merged 19 commits into from
Jan 7, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Temporary workaround in SSP CSV: remove certs volume and set …
…webhook port"

This reverts commit c73c124349c89a8213c987de0423f58b9ec0f611.

Signed-off-by: Zvi Cahana <[email protected]>
zcahana committed Dec 28, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ff089d31d6c9f5cba3c62d2a6ffa76a9f743630f
Original file line number Diff line number Diff line change
@@ -2088,8 +2088,17 @@ spec:
name: webhook-server
protocol: TCP
resources: {}
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
serviceAccountName: ssp-operator
terminationGracePeriodSeconds: 10
volumes:
- name: cert
secret:
defaultMode: 420
secretName: ssp-webhook-server-cert
- name: cdi-operator
spec:
replicas: 1
@@ -2568,7 +2577,6 @@ spec:
webhookPath: /mutate-ns-hco-kubevirt-io
- admissionReviewVersions:
- v1beta1
containerPort: 9443
deploymentName: ssp-operator
failurePolicy: Fail
generateName: vssp.kb.io
Original file line number Diff line number Diff line change
@@ -2088,8 +2088,17 @@ spec:
name: webhook-server
protocol: TCP
resources: {}
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
serviceAccountName: ssp-operator
terminationGracePeriodSeconds: 10
volumes:
- name: cert
secret:
defaultMode: 420
secretName: ssp-webhook-server-cert
- name: cdi-operator
spec:
replicas: 1
@@ -2568,7 +2577,6 @@ spec:
webhookPath: /mutate-ns-hco-kubevirt-io
- admissionReviewVersions:
- v1beta1
containerPort: 9443
deploymentName: ssp-operator
failurePolicy: Fail
generateName: vssp.kb.io
9 changes: 9 additions & 0 deletions deploy/operator.yaml
Original file line number Diff line number Diff line change
@@ -339,8 +339,17 @@ spec:
name: webhook-server
protocol: TCP
resources: {}
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
serviceAccountName: ssp-operator
terminationGracePeriodSeconds: 10
volumes:
- name: cert
secret:
defaultMode: 420
secretName: ssp-webhook-server-cert
---
apiVersion: apps/v1
kind: Deployment
9 changes: 0 additions & 9 deletions hack/build-manifests.sh
Original file line number Diff line number Diff line change
@@ -156,15 +156,6 @@ function create_ssp_csv() {
"

gen_csv ${SSP_CSV_GENERATOR} ${operatorName} "${SSP_OPERATOR_IMAGE}" ${dumpCRDsArg} ${operatorArgs}

# Temporary CSV workarounds:
# 1) remove the `certs` volume from ssp-operator pod
# 2) set the containerPort to 9443 for the ssp webhook
sspCsv="${TEMPDIR}/${operatorName}.${CSV_EXT}"
sed -i '/volumes:/,/secretName: ssp-webhook-server-cert/d' ${sspCsv}
sed -i '/volumeMounts:/,/readOnly: true/d' ${sspCsv}
sed -i '/webhookPath: \/validate-ssp-kubevirt-io-v1beta1-ssp/a \ \ \ \ containerPort: 9443' ${sspCsv}

echo "${operatorName}"
}