Skip to content

Commit

Permalink
Fix image name for example webhook, and other nitpicks
Browse files Browse the repository at this point in the history
Also bump example container versions to v3.0.0, and use
k8s.gcr.io/sig-storage instead of quay.io/k8scsi.
  • Loading branch information
bswartz committed Sep 22, 2020
1 parent 28abcf9 commit c6ab113
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml
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:v1.5.0
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.2.0
args:
- "--v=5"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
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
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`.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,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
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
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
2 changes: 1 addition & 1 deletion release-tools/build.make
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# This is the default. It can be overridden in the main Makefile after
# including build.make.
REGISTRY_NAME=quay.io/k8scsi
REGISTRY_NAME=k8s.gcr.io/sig-storage

# Can be set to -mod=vendor to ensure that the "vendor" directory is used.
GOFLAGS_VENDOR=
Expand Down

0 comments on commit c6ab113

Please sign in to comment.