Rename snapshot-webhook to snapshot-conversion-webhook

leonardoce · leonardoce · commit d1f9f39347e8 · 2025-08-05T14:09:33.000+02:00
Signed-off-by: Leonardo Cecchi &lt;leonardo.cecchi@enterprisedb.com&gt;
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
@@ -23,7 +23,7 @@ jobs:
           make
           docker build -t test/csi-snapshotter:latest -f ./cmd/csi-snapshotter/Dockerfile --output=type=docker --label revision=latest .
           docker build -t test/snapshot-controller:latest -f ./cmd/snapshot-controller/Dockerfile --output=type=docker --label revision=latest .
-          docker build -t test/snapshot-webhook:latest -f ./cmd/snapshot-webhook/Dockerfile --output=type=docker --label revision=latest .
+          docker build -t test/snapshot-conversion-webhook:latest -f ./cmd/snapshot-conversion-webhook/Dockerfile --output=type=docker --label revision=latest .
 
       - name: Run Trivy vulnerability scanner on csi-snapshotter image
         uses: aquasecurity/trivy-action@master
@@ -49,12 +49,12 @@ jobs:
           vuln-type: 'os,library'
           severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'
 
-      - name: Run Trivy vulnerability scanner on snapshot-webhook image
+      - name: Run Trivy vulnerability scanner on snapshot-conversion-webhook image
         uses: aquasecurity/trivy-action@master
         env:
           TRIVY_DB_REPOSITORY: "public.ecr.aws/aquasecurity/trivy-db:2"
         with:
-          image-ref: 'test/snapshot-webhook:latest'
+          image-ref: 'test/snapshot-conversion-webhook:latest'
           format: 'table'
           exit-code: '1'
           ignore-unfixed: true
diff --git a/Makefile b/Makefile
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: all snapshot-controller csi-snapshotter snapshot-webhook clean test
+.PHONY: all snapshot-controller csi-snapshotter snapshot-conversion-webhook clean test
 
-CMDS=snapshot-controller csi-snapshotter snapshot-webhook
+CMDS=snapshot-controller csi-snapshotter snapshot-conversion-webhook
 all: build
 include release-tools/build.make
 
diff --git a/README.md b/README.md
@@ -20,15 +20,15 @@ Blog post for the Volume Group Snapshot Alpha feature can be found [here](https:
 
 This information reflects the head of this branch.
 
-| Minimum CSI Version                                                                | Recommended CSI Version                                                                | Container Image             | [Min K8s Version](https://kubernetes-csi.github.io/docs/kubernetes-compatibility.html#minimum-version) | [Recommended K8s Version](https://kubernetes-csi.github.io/docs/project-policies.html#recommended-version) |
-| ------------------------------------------------------------------------------------------ | ----------------------------| --------------- | --------------- |  --------------- |
-| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/csi-snapshotter | 1.20         | 1.20         |
-| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/snapshot-controller  | 1.20     | 1.20         |
-| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/snapshot-webhook  | 1.20     | 1.20         |
+| Minimum CSI Version                                                                | Recommended CSI Version                                                                | Container Image                                    | [Min K8s Version](https://kubernetes-csi.github.io/docs/kubernetes-compatibility.html#minimum-version) | [Recommended K8s Version](https://kubernetes-csi.github.io/docs/project-policies.html#recommended-version) |
+| ------------------------------------------------------------------------------------------ | ----------------------------|----------------------------------------------------| --------------- |  --------------- |
+| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/csi-snapshotter             | 1.20         | 1.20         |
+| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/snapshot-controller         | 1.20     | 1.20         |
+| [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | [CSI Spec v1.5.0](https://github.com/container-storage-interface/spec/releases/tag/v1.5.0) | k8s.gcr.io/sig-storage/snapshot-conversion-webhook | 1.20     | 1.20         |
 
-Note: snapshot-controller, snapshot-webhook, csi-snapshotter v4.1 requires v1 snapshot CRDs to be installed, but it serves both v1 and v1beta1 snapshot objects. Storage version is changed from v1beta1 to v1 in 4.1.0 so v1beta1 is deprecated and will be removed in a future release.
+Note: snapshot-controller, snapshot-conversion-webhook, csi-snapshotter v4.1 requires v1 snapshot CRDs to be installed, but it serves both v1 and v1beta1 snapshot objects. Storage version is changed from v1beta1 to v1 in 4.1.0 so v1beta1 is deprecated and will be removed in a future release.
 
-Note: when the volume group snapshot feature is enabled, snapshot-controller, snapshot-webhook, csi-snapshotter require the v1alpha1 volumegroupsnapshot CRDs to be installed.
+Note: when the volume group snapshot feature is enabled, snapshot-controller, snapshot-conversion-webhook, csi-snapshotter require the v1alpha1 volumegroupsnapshot CRDs to be installed.
 
 ## Feature Status
 
diff --git a/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml b/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml
@@ -24,7 +24,7 @@ spec:
       clientConfig:
         service:
           namespace: default
-          name: snapshot-webhook-service
+          name: snapshot-conversion-webhook-service
           path: /convert
   versions:
   - additionalPrinterColumns:
diff --git a/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml b/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshotcontents.yaml
@@ -24,7 +24,7 @@ spec:
       clientConfig:
         service:
           namespace: default
-          name: snapshot-webhook-service
+          name: snapshot-conversion-webhook-service
           path: /convert
   versions:
   - additionalPrinterColumns:
diff --git a/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml b/client/config/crd/groupsnapshot.storage.k8s.io_volumegroupsnapshots.yaml
@@ -23,7 +23,7 @@ spec:
       clientConfig:
         service:
           namespace: default
-          name: snapshot-webhook-service
+          name: snapshot-conversion-webhook-service
           path: /convert
   versions:
   - additionalPrinterColumns:
diff --git a/cmd/snapshot-conversion-webhook/Dockerfile b/cmd/snapshot-conversion-webhook/Dockerfile
@@ -0,0 +1,7 @@
+FROM gcr.io/distroless/static:latest
+LABEL maintainers="Kubernetes Authors"
+LABEL description="Snapshot Webhook"
+ARG binary=./bin/snapshot-conversion-webhook
+
+COPY ${binary} snapshot-conversion-webhook
+ENTRYPOINT ["/snapshot-conversion-webhook"]
diff --git a/cmd/snapshot-conversion-webhook/main.go b/cmd/snapshot-conversion-webhook/main.go
diff --git a/cmd/snapshot-webhook/Dockerfile b/cmd/snapshot-webhook/Dockerfile
diff --git a/deploy/kubernetes/webhook-example/README.md b/deploy/kubernetes/webhook-example/README.md
@@ -13,7 +13,7 @@ make
 Build the docker image
 
 ```bash
-docker build -t snapshot-webhook:latest -f ./cmd/snapshot-webhook/Dockerfile .
+docker build -t snapshot-conversion-webhook:latest -f ./cmd/snapshot-conversion-webhook/Dockerfile .
 ```
 
 ## How to deploy the webhook
@@ -35,7 +35,7 @@ These commands should be run from the top level directory.
 
     ```bash
     # This script will create a TLS certificate signed by the [cluster](https://kubernetes.io/docs/tasks/tls/managing-tls-in-a-cluster/). It will place the public and private key into a secret on the cluster.
-    ./deploy/kubernetes/webhook-example/create-cert.sh --service snapshot-webhook-service --secret snapshot-webhook-secret --namespace default # Make sure to use a different namespace
+    ./deploy/kubernetes/webhook-example/create-cert.sh --service snapshot-conversion-webhook-service --secret snapshot-conversion-webhook-secret --namespace default # Make sure to use a different namespace
     ```
 
 2. Patch the VolumeGroupSnapshot, VolumeGroupSnapshotContent and VolumeGroupSnapshotClass CRDs filling in the CA bundle field.
diff --git a/deploy/kubernetes/webhook-example/webhook.yaml b/deploy/kubernetes/webhook-example/webhook.yaml
@@ -2,48 +2,47 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: snapshot-webhook-deployment
+  name: snapshot-conversion-webhook-deployment
   namespace: default # NOTE: change the namespace
   labels:
-    app.kubernetes.io/name: snapshot-webhook
+    app.kubernetes.io/name: snapshot-conversion-webhook
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: snapshot-webhook
+      app.kubernetes.io/name: snapshot-conversion-webhook
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: snapshot-webhook
+        app.kubernetes.io/name: snapshot-conversion-webhook
     spec:
       containers:
-      - name: snapshot-webhook
-        image: registry.k8s.io/sig-storage/snapshot-webhook:v8.0.1 # change the image if you wish to use your own custom validation server image
+      - name: snapshot-conversion-webhook
+        image: registry.k8s.io/sig-storage/snapshot-conversion-webhook:v8.0.1 # change the image if you wish to use your own custom validation server image
         imagePullPolicy: IfNotPresent
         args:
-        - '--tls-cert-file=/etc/snapshot-webhook/certs/tls.crt'
-        - '--tls-private-key-file=/etc/snapshot-webhook/certs/tls.key'
+        - '--tls-cert-file=/etc/snapshot-conversion-webhook/certs/tls.crt'
+        - '--tls-private-key-file=/etc/snapshot-conversion-webhook/certs/tls.key'
         # uncomment the following line to enable webhook for VolumeGroupSnapshot, VolumeGroupSnapshotContent and VolumeGroupSnapshotClass.
-        # - '--enable-volume-group-snapshot-webhook'
         ports:
         - containerPort: 443 # change the port as needed
         volumeMounts:
-          - name: snapshot-webhook-certs
-            mountPath: /etc/snapshot-webhook/certs
+          - name: snapshot-conversion-webhook-certs
+            mountPath: /etc/snapshot-conversion-webhook/certs
             readOnly: true
       volumes:
-        - name: snapshot-webhook-certs
+        - name: snapshot-conversion-webhook-certs
           secret:
-            secretName: snapshot-webhook-secret
+            secretName: snapshot-conversion-webhook-secret
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: snapshot-webhook-service
+  name: snapshot-conversion-webhook-service
   namespace: default # NOTE: change the namespace
 spec:
   selector:
-    app.kubernetes.io/name: snapshot-webhook
+    app.kubernetes.io/name: snapshot-conversion-webhook
   ports:
     - protocol: TCP
       port: 443 # Change if needed
