fix makefilke

Author: pacoxu

Dockerfile

@@ -1,5 +1,6 @@
 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
-ARG BUILDER_IMAGE=golang:1.23.0
+ARG BUILDER_IMAGE=golang:1.24.0
+    
 
 # Build the manager binary
 FROM ${BUILDER_IMAGE} AS builder

Makefile

@@ -67,6 +67,9 @@ IMAGE_NAME ?= llmaz
 IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME)
 GIT_TAG ?= $(shell git describe --tags --dirty --always)
 GOPROXY=${GOPROXY:-""}
+ifeq ($(origin GOPROXY), undefined)
+  unexport GOPROXY
+endif
 IMG ?= $(IMAGE_REPO):$(GIT_TAG)
 BUILDER_IMAGE ?= golang:$(GO_VERSION)
 KIND_CLUSTER_NAME ?= kind
@@ -177,7 +180,6 @@ run: manifests generate fmt vet ## Run a controller from your host.
 PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 .PHONY: docker-buildx
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
-	[ -n "$(GOPROXY)" ] && export GOPROXY=$(GOPROXY)
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
 	- $(CONTAINER_TOOL) buildx create --name project-v3-builder
@@ -226,7 +228,7 @@ endif
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply --server-side --force-conflicts -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.

chart/templates/gateway/envoy-ai-gateway.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.envoyAIGateway.enable -}}
+{{- if .Values.envoyAIGateway.enabled -}}
 # source : https://github.com/envoyproxy/ai-gateway/blob/main/examples/basic/basic.yaml
 
 # Copyright Envoy AI Gateway Authors
@@ -38,280 +38,70 @@ spec:
       kind: Gateway
       group: gateway.networking.k8s.io
   rules:
-    - matches:
-        - headers:
-            - type: Exact
-              name: x-ai-eg-model
-              value: gpt-4o-mini
-      backendRefs:
-        - name: envoy-ai-gateway-basic-openai
-    - matches:
-        - headers:
-            - type: Exact
-              name: x-ai-eg-model
-              value: us.meta.llama3-2-1b-instruct-v1:0
-      backendRefs:
-        - name: envoy-ai-gateway-basic-aws
-    - matches:
-        - headers:
-            - type: Exact
-              name: x-ai-eg-model
-              value: some-cool-self-hosted-model
-      backendRefs:
-        - name: envoy-ai-gateway-basic-testupstream
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: AIServiceBackend
-metadata:
-  name: envoy-ai-gateway-basic-openai
-  namespace: default
-spec:
-  schema:
-    name: OpenAI
-  backendRef:
-    name: envoy-ai-gateway-basic-openai
-    kind: Backend
-    group: gateway.envoyproxy.io
-  backendSecurityPolicyRef:
-    name: envoy-ai-gateway-basic-openai-apikey
-    kind: BackendSecurityPolicy
-    group: aigateway.envoyproxy.io
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: AIServiceBackend
-metadata:
-  name: envoy-ai-gateway-basic-aws
-  namespace: default
-spec:
-  schema:
-    name: AWSBedrock
-  backendRef:
-    name: envoy-ai-gateway-basic-aws
-    kind: Backend
-    group: gateway.envoyproxy.io
-  backendSecurityPolicyRef:
-    name: envoy-ai-gateway-basic-aws-credentials
-    kind: BackendSecurityPolicy
-    group: aigateway.envoyproxy.io
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: AIServiceBackend
-metadata:
-  name: envoy-ai-gateway-basic-azure
-  namespace: default
-spec:
-  schema:
-    name: AzureOpenAI
-    version: 2025-01-01-preview
-  backendRef:
-    name: envoy-ai-gateway-basic-azure
-    kind: Backend
-    group: gateway.envoyproxy.io
-  backendSecurityPolicyRef:
-    name: envoy-ai-gateway-basic-azure-credentials
-    kind: BackendSecurityPolicy
-    group: aigateway.envoyproxy.io
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: BackendSecurityPolicy
-metadata:
-  name: envoy-ai-gateway-basic-openai-apikey
-  namespace: default
-spec:
-  type: APIKey
-  apiKey:
-    secretRef:
-      name: envoy-ai-gateway-basic-openai-apikey
-      namespace: default
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: BackendSecurityPolicy
-metadata:
-  name: envoy-ai-gateway-basic-azure-credentials
-  namespace: default
-spec:
-  type: AzureCredentials
-  azureCredentials:
-    clientID: AZURE_CLIENT_ID   # Replace with your Azure Client ID.
-    tenantID: AZURE_TENANT_ID   # Replace with your Azure Tenant ID.
-    clientSecretRef:
-      name: envoy-ai-gateway-basic-azure-client-secret
-      namespace: default
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: BackendSecurityPolicy
-metadata:
-  name: envoy-ai-gateway-basic-aws-credentials
-  namespace: default
-spec:
-  type: AWSCredentials
-  awsCredentials:
-    region: us-east-1
-    credentialsFile:
-      secretRef:
-        name: envoy-ai-gateway-basic-aws-credentials
----
-apiVersion: gateway.envoyproxy.io/v1alpha1
-kind: Backend
-metadata:
-  name: envoy-ai-gateway-basic-openai
-  namespace: default
-spec:
-  endpoints:
-    - fqdn:
-        hostname: api.openai.com
-        port: 443
----
-apiVersion: gateway.envoyproxy.io/v1alpha1
-kind: Backend
-metadata:
-  name: envoy-ai-gateway-basic-aws
-  namespace: default
-spec:
-  endpoints:
-    - fqdn:
-        hostname: bedrock-runtime.us-east-1.amazonaws.com
-        port: 443
----
-apiVersion: gateway.envoyproxy.io/v1alpha1
-kind: Backend
-metadata:
-  name: envoy-ai-gateway-basic-azure
-  namespace: default
-spec:
-  endpoints:
-    - fqdn:
-        hostname: dummy-azure-resource.openai.azure.com  # Replace "dummy-azure-resource" with your Azure OpenAI resource e.g. <azure_resource_name>.openai.azure.com
-        port: 443
----
-apiVersion: gateway.networking.k8s.io/v1alpha3
-kind: BackendTLSPolicy
-metadata:
-  name: envoy-ai-gateway-basic-openai-tls
-  namespace: default
-spec:
-  targetRefs:
-    - group: 'gateway.envoyproxy.io'
-      kind: Backend
-      name: envoy-ai-gateway-basic-openai
-  validation:
-    wellKnownCACertificates: "System"
-    hostname: api.openai.com
----
-apiVersion: gateway.networking.k8s.io/v1alpha3
-kind: BackendTLSPolicy
-metadata:
-  name: envoy-ai-gateway-basic-aws-tls
-  namespace: default
-spec:
-  targetRefs:
-    - group: 'gateway.envoyproxy.io'
-      kind: Backend
-      name: envoy-ai-gateway-basic-aws
-  validation:
-    wellKnownCACertificates: "System"
-    hostname: bedrock-runtime.us-east-1.amazonaws.com
----
-apiVersion: gateway.networking.k8s.io/v1alpha3
-kind: BackendTLSPolicy
-metadata:
-  name: envoy-ai-gateway-basic-azure-tls
-  namespace: default
-spec:
-  targetRefs:
-    - group: 'gateway.envoyproxy.io'
-      kind: Backend
-      name: envoy-ai-gateway-basic-azure
-  validation:
-    wellKnownCACertificates: "System"
-    hostname: dummy-azure-resource.openai.azure.com  # Replace "dummy-azure-resource" with your Azure OpenAI resource e.g. <azure_resource_name>.openai.azure.com
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: envoy-ai-gateway-basic-openai-apikey
-  namespace: default
-type: Opaque
-stringData:
-  apiKey: OPENAI_API_KEY  # Replace with your OpenAI API key.
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: envoy-ai-gateway-basic-azure-client-secret
-  namespace: default
-type: Opaque
-stringData:
-  client-secret: AZURE_CLIENT_SECRET  # Replace with your Azure client secret for authentication.
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: envoy-ai-gateway-basic-aws-credentials
-  namespace: default
-type: Opaque
-stringData:
-  # Replace with your AWS credentials.
-  credentials: |
-    [default]
-    aws_access_key_id = AWS_ACCESS_KEY_ID
-    aws_secret_access_key = AWS_SECRET_ACCESS_KEY
----
-apiVersion: aigateway.envoyproxy.io/v1alpha1
-kind: AIServiceBackend
-metadata:
-  name: envoy-ai-gateway-basic-testupstream
-  namespace: default
-spec:
-  schema:
-    name: OpenAI
-  backendRef:
-    name: envoy-ai-gateway-basic-testupstream
-    kind: Service
-    port: 80
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: envoy-ai-gateway-basic-testupstream
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: envoy-ai-gateway-basic-testupstream
-  template:
-    metadata:
-      labels:
-        app: envoy-ai-gateway-basic-testupstream
-    spec:
-      containers:
-        - name: testupstream
-          image: docker.io/envoyproxy/ai-gateway-testupstream:latest
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 8080
-          env:
-            - name: TESTUPSTREAM_ID
-              value: test
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-            initialDelaySeconds: 1
-            periodSeconds: 1
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: envoy-ai-gateway-basic-testupstream
-  namespace: default
-spec:
-  selector:
-    app: envoy-ai-gateway-basic-testupstream
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8080
-  type: ClusterIP
+    # - matches:
+    #     - headers:
+    #         - type: Exact
+    #           name: x-ai-eg-model
+    #           value: some-cool-self-hosted-model
+    #   backendRefs:
+    #     - name: envoy-ai-gateway-basic-testupstream
+# Below is a testupstream service that can be used to test the AI Gateway
+# ---
+# apiVersion: aigateway.envoyproxy.io/v1alpha1
+# kind: AIServiceBackend
+# metadata:
+#   name: envoy-ai-gateway-basic-testupstream
+#   namespace: default
+# spec:
+#   schema:
+#     name: OpenAI
+#   backendRef:
+#     name: envoy-ai-gateway-basic-testupstream
+#     kind: Service
+#     port: 80
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: envoy-ai-gateway-basic-testupstream
+#   namespace: default
+# spec:
+#   replicas: 1
+#   selector:
+#     matchLabels:
+#       app: envoy-ai-gateway-basic-testupstream
+#   template:
+#     metadata:
+#       labels:
+#         app: envoy-ai-gateway-basic-testupstream
+#     spec:
+#       containers:
+#         - name: testupstream
+#           image: docker.io/envoyproxy/ai-gateway-testupstream:latest
+#           imagePullPolicy: IfNotPresent
+#           ports:
+#             - containerPort: 8080
+#           env:
+#             - name: TESTUPSTREAM_ID
+#               value: test
+#           readinessProbe:
+#             httpGet:
+#               path: /health
+#               port: 8080
+#             initialDelaySeconds: 1
+#             periodSeconds: 1
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: envoy-ai-gateway-basic-testupstream
+#   namespace: default
+# spec:
+#   selector:
+#     app: envoy-ai-gateway-basic-testupstream
+#   ports:
+#     - protocol: TCP
+#       port: 80
+#       targetPort: 8080
+#   type: ClusterIP
 {{- end }}