From ba6fb4694cbcb444ac9d166d6413a338f2a5d0aa Mon Sep 17 00:00:00 2001
From: Filipp <filipp.einik@comuny.de>
Date: Tue, 27 Feb 2024 12:55:22 +0700
Subject: [PATCH 1/2] realignment with updated kubernetes version, bump to
nginx-ingress 1.9.3, kubernetes-dashboard v2.7.0, removed deprecated apis
---
kubeOne.sh | 2 +-
kubeTwo.sh | 2 +-
yaml/trinity-ingress.yaml | 23 ++++++++++++++++-------
yaml/trinity-k8s-dashboard-ingress.yaml | 9 ++++++---
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/kubeOne.sh b/kubeOne.sh
index 033a34f..a194cee 100644
--- a/kubeOne.sh
+++ b/kubeOne.sh
@@ -3,7 +3,7 @@ kubectl apply -f ./yaml/trinity-config-map.yaml
kubectl apply -f ./yaml/twilio-config-map.yaml
kubectl apply -f ./yaml/trinity-secrets.yaml
kubectl apply -f ./yaml/oidc-deployment.yaml
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.6.4/deploy/static/provider/aws/deploy.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.9.3/deploy/static/provider/aws/deploy.yaml
kubectl apply -f ./yaml/trinity-ingress-no-tls.yaml
sleep 5
kubectl get service -n ingress-nginx -o wide ingress-nginx-controller
diff --git a/kubeTwo.sh b/kubeTwo.sh
index 7628b90..c5052f6 100644
--- a/kubeTwo.sh
+++ b/kubeTwo.sh
@@ -3,7 +3,7 @@ kubectl apply -f ./yaml/cert-issuer.yaml
kubectl apply -f ./yaml/trinity-ingress.yaml
kubectl apply -f ./yaml/trinity-cron-jobs.yaml
kubectl create job --from=cronjob/rotate-keys key-rotation-1
-kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.2.0/aio/deploy/recommended.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml
kubectl create serviceaccount dashboard-admin-sa
kubectl create clusterrolebinding dashboard-admin-sa --clusterrole=cluster-admin --serviceaccount=default:dashboard-admin-sa
kubectl apply -f ./yaml/trinity-k8s-dashboard-ingress.yaml
diff --git a/yaml/trinity-ingress.yaml b/yaml/trinity-ingress.yaml
index 93526bf..8c1de20 100644
--- a/yaml/trinity-ingress.yaml
+++ b/yaml/trinity-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: trinity-ingress
@@ -18,14 +18,23 @@ spec:
http:
paths:
- path: /oidc/
+ pathType: ImplementationSpecific
backend:
- serviceName: oidc-service
- servicePort: 8080
+ service:
+ name: oidc-service
+ port:
+ number: 8080
- path: /auth/
+ pathType: ImplementationSpecific
backend:
- serviceName: oidc-service
- servicePort: 8080
+ service:
+ name: oidc-service
+ port:
+ number: 8080
- path: /frontend/
+ pathType: ImplementationSpecific
backend:
- serviceName: oidc-service
- servicePort: 8080
+ service:
+ name: oidc-service
+ port:
+ number: 8080
diff --git a/yaml/trinity-k8s-dashboard-ingress.yaml b/yaml/trinity-k8s-dashboard-ingress.yaml
index 6f99baa..9559e57 100644
--- a/yaml/trinity-k8s-dashboard-ingress.yaml
+++ b/yaml/trinity-k8s-dashboard-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: trinity-k8s-dashboard-ingress
@@ -19,6 +19,9 @@ spec:
http:
paths:
- path: /dashboard(/|$)(.*)
+ pathType: ImplementationSpecific
backend:
- serviceName: kubernetes-dashboard
- servicePort: 443
\ No newline at end of file
+ service:
+ name: kubernetes-dashboard
+ port:
+ number: 443
\ No newline at end of file
--
GitLab
From a39338695d07ae5b4461158b98b8ed02cd953954 Mon Sep 17 00:00:00 2001
From: Filipp <filipp.einik@comuny.de>
Date: Mon, 4 Mar 2024 13:33:34 +0700
Subject: [PATCH 2/2] revert trinity-ingress.yaml +
trinity-k8s-dashboard-ingress.yaml
---
yaml/trinity-ingress.yaml | 23 +++++++----------------
yaml/trinity-k8s-dashboard-ingress.yaml | 9 +++------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/yaml/trinity-ingress.yaml b/yaml/trinity-ingress.yaml
index 8c1de20..93526bf 100644
--- a/yaml/trinity-ingress.yaml
+++ b/yaml/trinity-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1
+apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: trinity-ingress
@@ -18,23 +18,14 @@ spec:
http:
paths:
- path: /oidc/
- pathType: ImplementationSpecific
backend:
- service:
- name: oidc-service
- port:
- number: 8080
+ serviceName: oidc-service
+ servicePort: 8080
- path: /auth/
- pathType: ImplementationSpecific
backend:
- service:
- name: oidc-service
- port:
- number: 8080
+ serviceName: oidc-service
+ servicePort: 8080
- path: /frontend/
- pathType: ImplementationSpecific
backend:
- service:
- name: oidc-service
- port:
- number: 8080
+ serviceName: oidc-service
+ servicePort: 8080
diff --git a/yaml/trinity-k8s-dashboard-ingress.yaml b/yaml/trinity-k8s-dashboard-ingress.yaml
index 9559e57..6f99baa 100644
--- a/yaml/trinity-k8s-dashboard-ingress.yaml
+++ b/yaml/trinity-k8s-dashboard-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1
+apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: trinity-k8s-dashboard-ingress
@@ -19,9 +19,6 @@ spec:
http:
paths:
- path: /dashboard(/|$)(.*)
- pathType: ImplementationSpecific
backend:
- service:
- name: kubernetes-dashboard
- port:
- number: 443
\ No newline at end of file
+ serviceName: kubernetes-dashboard
+ servicePort: 443
\ No newline at end of file
--
GitLab