From 84cf74dc38a2ede8e89a405d8042a445ee421bfe Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 10:12:59 +0900 Subject: [PATCH 1/6] =?UTF-8?q?draft:=20argocd-server=E3=81=AEingress?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 19 +++++++++++++++++++ argocd-settings/base/kustomization.yaml | 1 + 2 files changed, 20 insertions(+) create mode 100644 argocd-settings/base/ingress.yaml diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml new file mode 100644 index 0000000..e14ff65 --- /dev/null +++ b/argocd-settings/base/ingress.yaml @@ -0,0 +1,19 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: argocd-server-ingress + namespace: argocd + annotations: + nginx.ingress.kubernetes.io/rewrite-target: / +spec: + rules: + - host: argocd.honahuku.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: argocd-server + port: + number: 80 diff --git a/argocd-settings/base/kustomization.yaml b/argocd-settings/base/kustomization.yaml index 9eefd1e..bfc2479 100644 --- a/argocd-settings/base/kustomization.yaml +++ b/argocd-settings/base/kustomization.yaml @@ -5,3 +5,4 @@ namespace: argocd resources: - configmap.yaml + - ingress.yaml From c34653e09927a533f9332a838a5ab68c719f6246 Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 11:52:43 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20rewrite-target=E3=81=AF=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=A6=E3=82=82=E3=81=84=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml index e14ff65..c4bb1c9 100644 --- a/argocd-settings/base/ingress.yaml +++ b/argocd-settings/base/ingress.yaml @@ -3,8 +3,6 @@ kind: Ingress metadata: name: argocd-server-ingress namespace: argocd - annotations: - nginx.ingress.kubernetes.io/rewrite-target: / spec: rules: - host: argocd.honahuku.com From 3f15d5463cc05985584ce0dc59c4cce4ad22ef71 Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 11:55:36 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20argocd=E3=81=ABhttps=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml index c4bb1c9..6d33268 100644 --- a/argocd-settings/base/ingress.yaml +++ b/argocd-settings/base/ingress.yaml @@ -15,3 +15,6 @@ spec: name: argocd-server port: number: 80 + tls: + - hosts: + - argocd.honahuku.com From d9d463b1d903c5584c7c7d11a03b2a8504285bc3 Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 12:20:12 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20ingressClass=E3=81=AE=E5=8F=82?= =?UTF-8?q?=E7=85=A7=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml index 6d33268..e946b2e 100644 --- a/argocd-settings/base/ingress.yaml +++ b/argocd-settings/base/ingress.yaml @@ -4,6 +4,7 @@ metadata: name: argocd-server-ingress namespace: argocd spec: + ingressClassName: nginx rules: - host: argocd.honahuku.com http: From 969018ab1c85d4bd5666c56f2edb42286aa24536 Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 12:25:56 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=B8=80=E6=97=A6TLS=E3=82=92?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml index e946b2e..7bd0d19 100644 --- a/argocd-settings/base/ingress.yaml +++ b/argocd-settings/base/ingress.yaml @@ -16,6 +16,6 @@ spec: name: argocd-server port: number: 80 - tls: - - hosts: - - argocd.honahuku.com + # tls: + # - hosts: + # - argocd.honahuku.com From 29788ce60c651a939464eda14a6cc5d4fbbed93c Mon Sep 17 00:00:00 2001 From: Honahuku Date: Tue, 12 Dec 2023 12:29:03 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20tls=E3=81=AEsecret=E3=82=92=E6=8C=87?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- argocd-settings/base/ingress.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/argocd-settings/base/ingress.yaml b/argocd-settings/base/ingress.yaml index 7bd0d19..1f0928d 100644 --- a/argocd-settings/base/ingress.yaml +++ b/argocd-settings/base/ingress.yaml @@ -16,6 +16,7 @@ spec: name: argocd-server port: number: 80 - # tls: - # - hosts: - # - argocd.honahuku.com + tls: + - hosts: + - argocd.honahuku.com + secretName: argocd-server-tls