Migrate OpenVPN (#10)

Reviewed-on: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/pulls/10
This commit is contained in:
Nikolai Rodionov 2023-02-19 13:22:48 +00:00
parent cfee65ed2e
commit df48d45018
6 changed files with 15 additions and 24 deletions

View File

@ -1,3 +1,3 @@
#kubectl get all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings -l app.kubernetes.io/managed-by=Helm -l app.kubernetes.io/instance=cert-manager -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name | while read -r var1 var2; do kubectl annotate $var1 $var2 "meta.helm.sh/release-namespace"="cert-manager" "meta.helm.sh/release-name"="cert-manager" --overwrite; done #kubectl get all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings -l app.kubernetes.io/managed-by=Helm -l app.kubernetes.io/instance=cert-manager -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name | while read -r var1 var2; do kubectl annotate $var1 $var2 "meta.helm.sh/release-namespace"="cert-manager" "meta.helm.sh/release-name"="cert-manager" --overwrite; done
kubectl get EnvoyFilter,PodDisruptionBudget,sa,ValidatingWebhookConfiguration,all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings,MutatingWebhookConfiguration -l argocd.argoproj.io/instance=istiod -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name,"ns":.metadata.namespace | while read -r var1 var2 var3; do kubectl annotate $var1 $var2 -n $var3 "meta.helm.sh/release-namespace"="istio-system" "meta.helm.sh/release-name"="istiod" && kubectl label $var1 $var2 -n $var3 app.kubernetes.io/managed-by=Helm; done kubectl get PersistentVolumeClaim,EnvoyFilter,PodDisruptionBudget,sa,ValidatingWebhookConfiguration,all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings,MutatingWebhookConfiguration -l argocd.argoproj.io/instance=istio-ingressgateway -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name,"ns":.metadata.namespace | while read -r var1 var2 var3; do kubectl annotate $var1 $var2 -n $var3 "meta.helm.sh/release-namespace"="istio-system" "meta.helm.sh/release-name"="istio-ingressgateway" && kubectl label $var1 $var2 -n $var3 app.kubernetes.io/managed-by=Helm; done

View File

@ -14,4 +14,8 @@ service:
port: 443 port: 443
protocol: TCP protocol: TCP
targetPort: 443 targetPort: 443
- name: openvpn
port: 1194
protocol: TCP
targetPort: 1194

View File

@ -23,22 +23,4 @@ istio-resources:
name: openvpn name: openvpn
number: 1194 number: 1194
protocol: TCP protocol: TCP
# virtual_services:
# - metadata:
# name: openvpn
# spec:
# hosts:
# - '*'
# gateways:
# - istio-system/etersoft-vpn
# tcp:
# - match:
# - port: 1194
# route:
# - destination:
# host: openvpn
# port:
# number: 1194
#
#
#

View File

@ -6,7 +6,7 @@ bases:
- repositories.yaml - repositories.yaml
releases: releases:
- <<: *metrics-server - <<: *metrics-server
installed: true installed: true
namespace: kube-system namespace: kube-system
createNamespace: false createNamespace: false
@ -26,10 +26,15 @@ releases:
namespace: istio-system namespace: istio-system
createNamespace: false createNamespace: false
- <<: *cert-manager - <<: *cert-manager
installed: true installed: true
namespace: cert-manager namespace: cert-manager
createNamespace: false createNamespace: false
- <<: *openvpn
installed: true
namespace: openvpn-service
createNamespace: false
helmfiles: helmfiles:
- path: {{.Environment.Name }}/helmfile.yaml - path: {{.Environment.Name }}/helmfile.yaml

View File

@ -58,7 +58,7 @@ templates:
- template: istio-version - template: istio-version
istio-gateway: &istio-gateway istio-gateway: &istio-gateway
name: istio-gateway name: istio-ingressgateway
chart: istio/gateway chart: istio/gateway
inherit: inherit:
- template: istio-version - template: istio-version
@ -77,7 +77,7 @@ templates:
openvpn: &openvpn openvpn: &openvpn
name: openvpn name: openvpn
chart: allanger-charts/openvpn chart: allanger-charts/openvpn
version: 1.0.1 version: 1.0.3
inherit: inherit:
- template: default-env-values - template: default-env-values