From 2c5b1b2ee6e67b1b0cb9d47395c76b762c9d5c41 Mon Sep 17 00:00:00 2001
From: Joseph Anttila Hall <jkh@google.com>
Date: Tue, 9 Apr 2024 20:15:24 +0000
Subject: [PATCH] Fix 'kind' example manifests.

---
 .github/workflows/e2e.yaml               | 6 ++++--
 examples/kind/konnectivity-agent-ds.yaml | 3 +--
 examples/kind/konnectivity-server.yaml   | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 34a8b2a67..fe4cd6aac 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -36,9 +36,11 @@ jobs:
         mkdir _output
 
         make docker-build/proxy-agent-amd64 REGISTRY=gcr.io/k8s-staging-kas-network-proxy TAG=local BASEIMAGE=${{ env.BASEIMAGE }}
-        docker save gcr.io/k8s-staging-kas-network-proxy/proxy-agent-amd64:local > _output/konnectivity-agent.tar
+        docker tag gcr.io/k8s-staging-kas-network-proxy/proxy-agent-amd64:local gcr.io/k8s-staging-kas-network-proxy/proxy-agent:master
+        docker save gcr.io/k8s-staging-kas-network-proxy/proxy-agent:master > _output/konnectivity-agent.tar
         make docker-build/proxy-server-amd64 REGISTRY=gcr.io/k8s-staging-kas-network-proxy TAG=local BASEIMAGE=${{ env.BASEIMAGE }}
-        docker save gcr.io/k8s-staging-kas-network-proxy/proxy-server-amd64:local > _output/konnectivity-server.tar
+        docker tag gcr.io/k8s-staging-kas-network-proxy/proxy-server-amd64:local gcr.io/k8s-staging-kas-network-proxy/proxy-server:master
+        docker save gcr.io/k8s-staging-kas-network-proxy/proxy-server:master > _output/konnectivity-server.tar
 
     - uses: actions/upload-artifact@v4
       with:
diff --git a/examples/kind/konnectivity-agent-ds.yaml b/examples/kind/konnectivity-agent-ds.yaml
index 3ef45d555..98f7cbd29 100644
--- a/examples/kind/konnectivity-agent-ds.yaml
+++ b/examples/kind/konnectivity-agent-ds.yaml
@@ -36,8 +36,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: konnectivity-agent-container
-        image: gcr.io/k8s-staging-kas-network-proxy/proxy-agent-amd64:local
-        imagePullPolicy: Never
+        image: gcr.io/k8s-staging-kas-network-proxy/proxy-agent:master
         resources:
           requests:
             cpu: 50m
diff --git a/examples/kind/konnectivity-server.yaml b/examples/kind/konnectivity-server.yaml
index cfb7e3738..aefe69a95 100644
--- a/examples/kind/konnectivity-server.yaml
+++ b/examples/kind/konnectivity-server.yaml
@@ -55,17 +55,20 @@ spec:
       hostNetwork: true
       containers:
       - name: konnectivity-server-container
-        image: gcr.io/k8s-staging-kas-network-proxy/proxy-server-amd64:local
-        imagePullPolicy: Never
+        image: gcr.io/k8s-staging-kas-network-proxy/proxy-server:master
         resources:
           requests:
             cpu: 1m
+        securityContext:
+          allowPrivilegeEscalation: false
+          runAsUser: 0
         command: [ "/proxy-server"]
         args: [
           "--log-file=/var/log/konnectivity-server.log",
           "--logtostderr=true",
           "--log-file-max-size=0",
           "--uds-name=/etc/kubernetes/konnectivity-server/konnectivity-server.socket",
+          "--delete-existing-uds-file",
           "--cluster-cert=/etc/kubernetes/pki/apiserver.crt",
           "--cluster-key=/etc/kubernetes/pki/apiserver.key",
           "--server-port=0",