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.

Sign up for GitHub

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

Jump to bottom

Fix image name for example webhook, and other nitpicks #378

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Fix image name for example webhook, and other nitpicks #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
serviceAccount: csi-snapshotter
containers:
- name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v1.5.0
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand All @@ -84,7 +84,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: quay.io/k8scsi/csi-snapshotter:canary
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.0
args:
- "--v=5"
- "--csi-address=$(ADDRESS)"
Expand All @@ -97,7 +97,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: hostpath
image: quay.io/k8scsi/hostpathplugin:v1.2.0
image: k8s.gcr.io/sig-storage/hostpathplugin:v1.4.0
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
serviceAccount: snapshot-controller
containers:
- name: snapshot-controller
image: quay.io/k8scsi/snapshot-controller:canary
image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0
args:
- "--v=5"
- "--leader-election=false"
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/webhook-example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ make
Build the docker image

```bash
docker build -t validation-webhook:latest -f ./cmd/validation-webhook/Dockerfile .
docker build -t snapshot-validation-webhook:latest -f ./cmd/validation-webhook/Dockerfile .
```

## How to deploy the webhook
Expand Down Expand Up @@ -78,4 +78,4 @@ Look into [cert-manager](https://cert-manager.io/) to handle the certificates, a

#### Important

Please see the deployment [yaml](./webhook.yaml) for the arguments expected by the webhook server. The snapshot validation webhook is served at the path `/snapshot`.
Please see the deployment [yaml](./webhook.yaml) for the arguments expected by the webhook server. The snapshot validation webhook is served at the path `/volumesnapshot`.
3 changes: 1 addition & 2 deletions deploy/kubernetes/webhook-example/admission-configuration-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: "validation-webhook.snapshot.storage.k8s.io"
namespace: "default"
webhooks:
- name: "validation-webhook.snapshot.storage.k8s.io"
rules:
Expand All @@ -20,4 +19,4 @@ webhooks:
admissionReviewVersions: ["v1", "v1beta1"]
sideEffects: None
failurePolicy: Ignore # We recommend switching to Fail only after successful installation of the webhook server and webhook.
timeoutSeconds: 2 # This will affect the latency and performance. Finetune this value based on your application's tolerance.
timeoutSeconds: 2 # This will affect the latency and performance. Finetune this value based on your application's tolerance.
2 changes: 1 addition & 1 deletion deploy/kubernetes/webhook-example/create-cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ echo ${serverCert} | openssl base64 -d -A -out ${tmpdir}/server-cert.pem
kubectl create secret generic ${secret} \
--from-file=key.pem=${tmpdir}/server-key.pem \
--from-file=cert.pem=${tmpdir}/server-cert.pem \
--dry-run -o yaml |
--dry-run=client -o yaml |
kubectl -n ${namespace} apply -f -
2 changes: 1 addition & 1 deletion deploy/kubernetes/webhook-example/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: snapshot-validation
image: k8s.gcr.io/sig-storage/validation-webhook:v2.2.0 # change the image if you wish to use your own custom validation server image
image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v3.0.0 # change the image if you wish to use your own custom validation server image
args: ['--tls-cert-file=/etc/snapshot-validation-webhook/certs/cert.pem', '--tls-private-key-file=/etc/snapshot-validation-webhook/certs/key.pem']
ports:
- containerPort: 443 # change the port as needed
Expand Down