Merge pull request kubernetes-sigs#31 from shaneutt/shaneutt/crd-deployments

Add CRDs deployments

Author: clubanderson

Makefile

@@ -561,7 +561,9 @@ uninstall-k8s: check-kubectl check-kustomize check-envsubst ## Uninstall from Ku
 install-openshift-infrastructure:
 ifeq ($(strip $(INFRASTRUCTURE_OVERRIDE)),true)
 	@echo "INFRASTRUCTURE_OVERRIDE is set to true, deploying infrastructure components"
-	@echo "Installing the Istio Sail Operator and CRDs for Istio and Gateway API"
+	@echo "Installing CRDs for Gateway API & GIE"
+	kustomize build deploy/components/crds | kubectl apply --server-side --force-conflicts -f -
+	@echo "Installing the Istio Sail Operator and CRDs for Istio"
 	kustomize build --enable-helm deploy/components/sail-operator | kubectl apply --server-side --force-conflicts -f -
 	@echo "Installing the Istio Control Plane"
 	kustomize build deploy/components/istio-control-plane | kubectl apply -f -
@@ -586,8 +588,10 @@ ifeq ($(strip $(INFRASTRUCTURE_OVERRIDE)),true)
 	@echo "INFRASTRUCTURE_OVERRIDE is set to true, removing infrastructure components"
 	@echo "Uninstalling the Istio Control Plane"
 	kustomize build deploy/components/istio-control-plane | kubectl delete -f - || true
-	@echo "Uninstalling the Istio Sail Operator and CRDs for Istio and Gateway API"
+	@echo "Uninstalling the Istio Sail Operator and CRDs for Istio"
 	kustomize build --enable-helm deploy/components/sail-operator | kubectl delete -f - || true
+	@echo "Uninstalling CRDs for Gateway API & GIE"
+	kustomize build deploy/components/crds | kubectl delete -f - || true
 else
 	$(error "Error: The environment variable INFRASTRUCTURE_OVERRIDE must be set to true in order to run this target.")
 endif

deploy/components/crds/kustomization.yaml

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+# Custom Resource Definitions (CRDs)
+#
+# This deploys the CRDs needed for development environments (e.g. Gateway API).
+#
+# **Warning**: CRDs are cluster-level, so in a shared development environment
+# this needs to be done in a controlled and communicated manner.
+# ------------------------------------------------------------------------------
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+# Gateway API CRDs
+- https://github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.2.1
+# Gateway API Inference Extension (GIE) CRDs
+# NOTE: deploys whatever is in the current branch
+- ../../../config/crd # GIE CRDs

deploy/components/sail-operator/kustomization.yaml

@@ -3,10 +3,10 @@
 #
 # This deploys the Istio Sail Operator via Helm chart to enable the creation
 # of Istio Control Planes, and ultimately Gateways. This will also deploy all
-# the Istio and Gateway API CRDs.
+# the Istio CRDs.
 #
 # This is required on Kubernetes clusters, and OpenShift clusters versions
-# below 4.19 (OpenShift 4.19+ includes all this by default).
+# below 4.19, but OpenShift 4.19+ clusters include all this by default.
 #
 # **Warning**: This needs to be deployed before, and separately from other
 # components as it deploys CRDs. It can be deployed with:
@@ -21,7 +21,6 @@ kind: Kustomization
 namespace: sail-operator
 
 resources:
-- https://github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.2.1
 - namespaces.yaml
 
 helmCharts:

scripts/run-kind.sh

@@ -88,20 +88,25 @@ kubectl --context ${KUBE_CONTEXT} -n local-path-storage wait --for=condition=Rea
 
 # Load the vllm simulator image into the cluster
 if [ "${CONTAINER_RUNTIME}" == "podman" ]; then
-	podman tag localhost/vllm-d/vllm-sim:${VLLM_SIMULATOR_VERSION} ${IMAGE_REGISTRY}/vllm-sim:${VLLM_SIMULATOR_VERSION}
 	podman save ${IMAGE_REGISTRY}/vllm-sim:${VLLM_SIMULATOR_VERSION} -o /dev/stdout | kind --name ${CLUSTER_NAME} load image-archive /dev/stdin
 else
 	kind --name ${CLUSTER_NAME} load docker-image ${IMAGE_REGISTRY}/vllm-sim:${VLLM_SIMULATOR_VERSION}
 fi
 
 # Load the ext_proc endpoint-picker image into the cluster
 if [ "${CONTAINER_RUNTIME}" == "podman" ]; then
-	podman tag localhost/${ENDPOINT_PICKER_IMAGE}:${ENDPOINT_PICKER_VERSION} ${IMAGE_REGISTRY}/${ENDPOINT_PICKER_IMAGE}:${ENDPOINT_PICKER_VERSION}
 	podman save ${IMAGE_REGISTRY}/${ENDPOINT_PICKER_IMAGE}:${ENDPOINT_PICKER_VERSION} -o /dev/stdout | kind --name ${CLUSTER_NAME} load image-archive /dev/stdin
 else
 	kind --name ${CLUSTER_NAME} load docker-image ${IMAGE_REGISTRY}/${ENDPOINT_PICKER_IMAGE}:${ENDPOINT_PICKER_VERSION}
 fi
 
+# ------------------------------------------------------------------------------
+# CRD Deployment (Gateway API + GIE)
+# ------------------------------------------------------------------------------
+
+kubectl kustomize deploy/components/crds |
+	kubectl --context ${KUBE_CONTEXT} apply --server-side --force-conflicts -f -
+
 # ------------------------------------------------------------------------------
 # Sail Operator Deployment
 # ------------------------------------------------------------------------------