nits

kcp-dev · Jun 29, 2024 · a112aef · a112aef
1 parent 16d4702
commit a112aef
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/examples/sharded/kind-values-phase3-alpha.yaml b/examples/sharded/kind-values-phase3-alpha.yaml
@@ -15,9 +15,14 @@ kcp:
   externalLogicalClusterAdminFlag: true
   tag: main
   enabled: true
-  v: 8
+  v: 2
   tokenAuth:
     enabled: true
+    fileName: auth-token.csv
+    config: |
+        external-logical-cluster-admin-token,external-logical-cluster-admin,1111-1111-1111-1111,"system:kcp:external-logical-cluster-admin"
+        system-kcp-admin-token,system-kcp-admin,5555-5555-5555-5555,"system:kcp:admin"
+        system-master-token,system-masters,6666-6666-6666-6666,"system:masters"
   batteries:
     - workspace-types
     - metrics-viewer

diff --git a/examples/sharded/kind-values-phase3-beta.yaml b/examples/sharded/kind-values-phase3-beta.yaml
@@ -14,9 +14,14 @@ etcd:
 kcp:
   tag: main
   enabled: true
-  v: 8
+  v: 2
   tokenAuth:
     enabled: true
+    fileName: auth-token.csv
+    config: |
+        external-logical-cluster-admin-token,external-logical-cluster-admin,1111-1111-1111-1111,"system:kcp:external-logical-cluster-admin"
+        system-kcp-admin-token,system-kcp-admin,5555-5555-5555-5555,"system:kcp:admin"
+        system-master-token,system-masters,6666-6666-6666-6666,"system:masters"
   batteries:
     - workspace-types
     - metrics-viewer

diff --git a/examples/sharded/kind-values-phase3-proxy.yaml b/examples/sharded/kind-values-phase3-proxy.yaml
@@ -16,6 +16,22 @@ kcp:
 kcpFrontProxy:
   tag: main
   enabled: true
+  additionalPathMappings:
+    - path: /services/edge-proxy
+      backend: https://clusters-virtualworkspaces.cluster-proxy.svc:8443
+      backend_server_ca: /etc/kcp/tls/ca/tls.crt
+      proxy_client_cert: /etc/kcp-front-proxy/requestheader-client/tls.crt
+      proxy_client_key: /etc/kcp-front-proxy/requestheader-client/tls.key
+    - path: /services/cluster-proxy
+      backend: https://clusters-virtualworkspaces.cluster-proxy.svc:8443
+      backend_server_ca: /etc/kcp/tls/ca/tls.crt
+      proxy_client_cert: /etc/kcp-front-proxy/requestheader-client/tls.crt
+      proxy_client_key: /etc/kcp-front-proxy/requestheader-client/tls.key
+    - path: /services/namespace-proxy
+      backend: https://namespaces-virtualworkspaces.cluster-proxy.svc:8443
+      backend_server_ca: /etc/kcp/tls/ca/tls.crt
+      proxy_client_cert: /etc/kcp-front-proxy/requestheader-client/tls.crt
+      proxy_client_key: /etc/kcp-front-proxy/requestheader-client/tls.key
   ingress:
     secret: proxy-front-proxy-cert
     enabled: true
@@ -27,6 +43,11 @@ kcpFrontProxy:
       nginx.ingress.kubernetes.io/backend-protocol: HTTPS
   tokenAuth:
     enabled: true
+    fileName: auth-token.csv
+    config: |
+        external-logical-cluster-admin-token,external-logical-cluster-admin,1111-1111-1111-1111,"system:kcp:external-logical-cluster-admin"
+        system-kcp-admin-token,system-kcp-admin,5555-5555-5555-5555,"system:kcp:admin"
+        system-master-token,system-masters,6666-6666-6666-6666,"system:masters"
 cache:
   enabled: false
 certificates: