Merge pull request #16 from BuoyantIO/flynn/1.2.3

flynn/1.2.3
BuoyantIO · May 2, 2024 · bf810aa · bf810aa
2 parents f2b4104 + 6a6eadb
commit bf810aa
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 7 deletions.
diff --git a/assets/color-blue.png b/assets/color-blue.png
diff --git a/assets/color-green.png b/assets/color-green.png
diff --git a/assets/color-yellow.png b/assets/color-yellow.png
diff --git a/assets/face-cursing-blue.png b/assets/face-cursing-blue.png
diff --git a/assets/face-grinning-blue.png b/assets/face-grinning-blue.png
diff --git a/assets/face-grinning-grey.png b/assets/face-grinning-grey.png
diff --git a/assets/face-grinning.png b/assets/face-grinning.png
diff --git a/assets/face-hearteyes-green.png b/assets/face-hearteyes-green.png
diff --git a/assets/face-hearteyes.png b/assets/face-hearteyes.png
diff --git a/assets/face-kaboom-yellow.png b/assets/face-kaboom-yellow.png
diff --git a/assets/face-sleeping-pink.png b/assets/face-sleeping-pink.png
diff --git a/assets/html/favicon.ico b/assets/html/favicon.ico
diff --git a/demosh/check-requirements.sh b/demosh/check-requirements.sh
@@ -4,7 +4,7 @@ set -e
 # required here.
 missing= ;\
 \
-for cmd in bat kubectl kubectx linkerd flux; do \
+for cmd in bat kubectl linkerd flux; do \
     if ! command -v $cmd >/dev/null 2>&1; then \
         missing="$missing $cmd" ;\
     fi ;\

diff --git a/faces-chart/templates/color.yaml b/faces-chart/templates/color.yaml
@@ -37,6 +37,8 @@ spec:
         env:
         - name: FACES_SERVICE
           value: "color"
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         {{- if .Values.color.color }}
         - name: COLOR
           value: {{ .Values.color.color }}

diff --git a/faces-chart/templates/color2.yaml b/faces-chart/templates/color2.yaml
@@ -38,6 +38,8 @@ spec:
         env:
         - name: FACES_SERVICE
           value: "color"
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         {{- if .Values.color2.color }}
         - name: COLOR
           value: {{ .Values.color2.color }}

diff --git a/faces-chart/templates/face.yaml b/faces-chart/templates/face.yaml
@@ -37,6 +37,8 @@ spec:
         env:
         - name: FACES_SERVICE
           value: "face"
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         {{- include "partials.face-errorFraction" . }}
         {{- include "partials.face-delayBuckets" . }}
         resources:

diff --git a/faces-chart/templates/faces-gui.yaml b/faces-chart/templates/faces-gui.yaml
@@ -31,6 +31,9 @@ spec:
       - name: faces-gui
         image: {{ include "partials.gui-image" . }}
         imagePullPolicy: {{ include "partials.gui-imagePullPolicy" . }}
+        env:
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         ports:
         - name: http
           containerPort: 8000

diff --git a/faces-chart/templates/smiley.yaml b/faces-chart/templates/smiley.yaml
@@ -37,6 +37,8 @@ spec:
         env:
         - name: FACES_SERVICE
           value: "smiley"
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         {{- if .Values.smiley.smiley }}
         - name: SMILEY
           value: {{ .Values.smiley.smiley }}

diff --git a/faces-chart/templates/smiley2.yaml b/faces-chart/templates/smiley2.yaml
@@ -38,6 +38,8 @@ spec:
         env:
         - name: FACES_SERVICE
           value: "smiley"
+        - name: USER_HEADER_NAME
+          value: {{ .Values.authHeader | quote }}
         {{- if .Values.smiley2.smiley }}
         - name: SMILEY
           value: {{ .Values.smiley2.smiley }}

diff --git a/faces-chart/values.yaml b/faces-chart/values.yaml
@@ -9,6 +9,9 @@ defaultImageTag: ""             # If not set, uses the appVersion
 # Default imagePullPolicy. This is used only if not set in the sections below.
 defaultImagePullPolicy: IfNotPresent
 
+# User auth header.
+authHeader: "X-Faces-User"
+
 gui:
   image: ""                     # If set, overrides the imageName/imageTag pair
   imageName: ghcr.io/buoyantio/faces-gui

diff --git a/setup-cluster.sh b/setup-cluster.sh
@@ -57,13 +57,12 @@ helm install emissary-crds \
   --wait
 
 helm install emissary-ingress \
-  datawire/emissary-ingress \
+  oci://ghcr.io/emissary-ingress/emissary-chart \
   -n emissary \
-  --version 8.9.1 \
-  --set replicaCount=1 \
-  --set waitForApiext.enabled=false \
-  --set waitForApiext.createRoles=false \
-  --wait
+  --version 0.0.0-test \
+  --set nameOverride=emissary \
+  --set fullnameOverride=emissary \
+  --set replicaCount=1
 
 kubectl -n emissary wait --for condition=available --timeout=90s deploy -lproduct=aes