diff --git a/development/ecr/image-docs/snapshot-validation-webhook-about.md b/development/ecr/image-docs/snapshot-validation-webhook-about.md index 213f44afb7..cd070f31b6 100644 --- a/development/ecr/image-docs/snapshot-validation-webhook-about.md +++ b/development/ecr/image-docs/snapshot-validation-webhook-about.md @@ -1,5 +1,7 @@ Amazon EKS Distro image for Kubernetes CSI External Snapshot Validation Webhook +Note: This webhook has deprecated by Kubernetes as of external-snapshotter v8.0.0, and removed as of v8.2.0. See https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v8.2.0 + The snapshot validating webhook is an HTTP callback which responds to admission requests. It provides tighter validation for volume snapshot objects. This webhook introduces the ratcheting validation mechanism that performs stricter validation. It should be installed alongside the snapshot controllers and CRDs. https://github.com/kubernetes-csi/external-snapshotter diff --git a/development/ecr/image-docs/snapshot-validation-webhook-usage.md b/development/ecr/image-docs/snapshot-validation-webhook-usage.md index 9ab0bfa2c5..7a8e5ee750 100644 --- a/development/ecr/image-docs/snapshot-validation-webhook-usage.md +++ b/development/ecr/image-docs/snapshot-validation-webhook-usage.md @@ -3,3 +3,5 @@ You can get this image by running the following command: ```bash docker pull public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/snapshot-validation-webhook: ``` + +Note: diff --git a/projects/kubernetes-csi/external-snapshotter/Help.mk b/projects/kubernetes-csi/external-snapshotter/Help.mk index ee30498574..4b8272fa56 100644 --- a/projects/kubernetes-csi/external-snapshotter/Help.mk +++ b/projects/kubernetes-csi/external-snapshotter/Help.mk @@ -11,23 +11,19 @@ clone-repo: ## Clone upstream `external-snapshotter` checkout-repo: ## Checkout upstream tag based on value in GIT_TAG file ##@ Binary Targets -binaries: ## Build all binaries: `snapshot-controller csi-snapshotter snapshot-validation-webhook` for `linux/amd64 linux/arm64` +binaries: ## Build all binaries: `snapshot-controller csi-snapshotter` for `linux/amd64 linux/arm64` _output/1-26/bin/external-snapshotter/linux-amd64/snapshot-controller: ## Build `_output/1-26/bin/external-snapshotter/linux-amd64/snapshot-controller` _output/1-26/bin/external-snapshotter/linux-amd64/csi-snapshotter: ## Build `_output/1-26/bin/external-snapshotter/linux-amd64/csi-snapshotter` -_output/1-26/bin/external-snapshotter/linux-amd64/snapshot-validation-webhook: ## Build `_output/1-26/bin/external-snapshotter/linux-amd64/snapshot-validation-webhook` _output/1-26/bin/external-snapshotter/linux-arm64/snapshot-controller: ## Build `_output/1-26/bin/external-snapshotter/linux-arm64/snapshot-controller` _output/1-26/bin/external-snapshotter/linux-arm64/csi-snapshotter: ## Build `_output/1-26/bin/external-snapshotter/linux-arm64/csi-snapshotter` -_output/1-26/bin/external-snapshotter/linux-arm64/snapshot-validation-webhook: ## Build `_output/1-26/bin/external-snapshotter/linux-arm64/snapshot-validation-webhook` ##@ Image Targets -local-images: ## Builds `csi-snapshotter/images/amd64 snapshot-controller/images/amd64 snapshot-validation-webhook/images/amd64` as oci tars for presumbit validation -images: ## Pushes `csi-snapshotter/images/push snapshot-controller/images/push snapshot-validation-webhook/images/push` to IMAGE_REPO +local-images: ## Builds `csi-snapshotter/images/amd64 snapshot-controller/images/amd64` as oci tars for presumbit validation +images: ## Pushes `csi-snapshotter/images/push snapshot-controller/images/push` to IMAGE_REPO csi-snapshotter/images/amd64: ## Builds/pushes `csi-snapshotter/images/amd64` snapshot-controller/images/amd64: ## Builds/pushes `snapshot-controller/images/amd64` -snapshot-validation-webhook/images/amd64: ## Builds/pushes `snapshot-validation-webhook/images/amd64` csi-snapshotter/images/push: ## Builds/pushes `csi-snapshotter/images/push` snapshot-controller/images/push: ## Builds/pushes `snapshot-controller/images/push` -snapshot-validation-webhook/images/push: ## Builds/pushes `snapshot-validation-webhook/images/push` ##@ Checksum Targets checksums: ## Update checksums file based on currently built binaries. diff --git a/projects/kubernetes-csi/external-snapshotter/Makefile b/projects/kubernetes-csi/external-snapshotter/Makefile index 8b0930c803..95c8efbe03 100755 --- a/projects/kubernetes-csi/external-snapshotter/Makefile +++ b/projects/kubernetes-csi/external-snapshotter/Makefile @@ -7,14 +7,13 @@ REPO_OWNER=kubernetes-csi CSI_SNAPSHOTTER_IMAGE_COMPONENT?=kubernetes-csi/external-snapshotter/csi-snapshotter SNAPSHOT_CONTROLLER_IMAGE_COMPONENT?=kubernetes-csi/external-snapshotter/snapshot-controller -SNAPSHOT_VALIDATION_WEBHOOK_IMAGE_COMPONENT?=kubernetes-csi/external-snapshotter/snapshot-validation-webhook -IMAGE_NAMES=csi-snapshotter snapshot-controller snapshot-validation-webhook +IMAGE_NAMES=csi-snapshotter snapshot-controller SNAPSHOTTER_LICENSE=$(REPO)/vendor/github.com/kubernetes-csi/external-snapshotter/LICENSE -BINARY_TARGET_FILES=snapshot-controller csi-snapshotter snapshot-validation-webhook -SOURCE_PATTERNS=./cmd/snapshot-controller ./cmd/csi-snapshotter ./cmd/snapshot-validation-webhook +BINARY_TARGET_FILES=snapshot-controller csi-snapshotter +SOURCE_PATTERNS=./cmd/snapshot-controller ./cmd/csi-snapshotter DOCKERFILE_FOLDER=./docker/linux/$(IMAGE_NAME) diff --git a/projects/kubernetes-csi/external-snapshotter/docker/linux/snapshot-validation-webhook/Dockerfile b/projects/kubernetes-csi/external-snapshotter/docker/linux/snapshot-validation-webhook/Dockerfile deleted file mode 100644 index 92a2d63994..0000000000 --- a/projects/kubernetes-csi/external-snapshotter/docker/linux/snapshot-validation-webhook/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG BASE_IMAGE -FROM $BASE_IMAGE - -ARG TARGETARCH -ARG TARGETOS - - -COPY LICENSES /LICENSES -COPY ATTRIBUTION.txt /ATTRIBUTION.txt -COPY bin/external-snapshotter/$TARGETOS-$TARGETARCH/snapshot-validation-webhook /snapshot-validation-webhook -ENTRYPOINT ["/snapshot-validation-webhook"]