Merge pull request #1564 from GiganticMinecraft/workflows_sso

fix argo workflows
GiganticMinecraft · Dec 21, 2023 · 07cbb59 · 07cbb59
2 parents a86f15b + f195e59
commit 07cbb59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/http-exits.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/http-exits.yaml
@@ -95,11 +95,6 @@ spec:
             external-hostname: phpmyadmin.onp-k8s.admin.seichi.click
             internal-authority: "phpmyadmin.seichi-minecraft:80"
 
-          # Argo Eventsの管理画面。
-          # 今は特に何も表示してないのとSSOを入れるので認証は噛まさない。
-          - name: argo-workflows
-            external-hostname: argo-workflows.onp-k8s.admin.seichi.click
-            internal-authority: "argo-workflows-server.argo:2746"
   template:
     metadata:
       name: "cloudflared-tunnel-http-exit--{{name}}"

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/https-exits.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/https-exits.yaml
@@ -19,6 +19,12 @@ spec:
             external-hostname: argocd.onp-k8s.admin.seichi.click
             internal-authority: argocd-server.argocd:443
 
+          # Argo Eventsの管理画面。
+          # 今は特に何も表示してないのとSSOを入れるので認証は噛まさない。
+          - name: argo-workflows
+            external-hostname: argo-workflows.onp-k8s.admin.seichi.click
+            internal-authority: argo-workflows-server.argo:2746
+
           # 管理者からの直アクセスを想定するため、GitHub TeamsによるSSOを設定している
           # (terraform/cloudflare_network_admin_services.yaml 参照)
           #

diff --git a/.../manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/argo-workflows.yaml b/.../manifests/seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/argo-workflows.yaml
@@ -21,6 +21,7 @@ spec:
           extraArgs:
             - --auth-mode=sso
           sso:
+            enabled: true
             issuer: https://argocd.onp-k8s.admin.seichi.click/api/dex
             # sessionExpiry defines how long your login is valid for in hours. (optional, default: 10h)
             sessionExpiry: 240h