shift pod-gateway target back to media namespace #83
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
and move testing out to a test folder
--- kubernetes/apps Kustomization: flux-system/cluster-apps Namespace: flux-system/testing
+++ kubernetes/apps Kustomization: flux-system/cluster-apps Namespace: flux-system/testing
@@ -1,10 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
- labels:
- kustomize.toolkit.fluxcd.io/name: cluster-apps
- kustomize.toolkit.fluxcd.io/namespace: flux-system
- vpn-routed-gateway: 'true'
- name: testing
-
--- kubernetes/apps Kustomization: flux-system/cluster-apps Kustomization: flux-system/vpn-routed
+++ kubernetes/apps Kustomization: flux-system/cluster-apps Kustomization: flux-system/vpn-routed
@@ -1,40 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
- labels:
- kustomize.toolkit.fluxcd.io/name: cluster-apps
- kustomize.toolkit.fluxcd.io/namespace: flux-system
- name: vpn-routed
- namespace: flux-system
-spec:
- commonMetadata:
- labels:
- app.kubernetes.io/name: vpn-routed
- decryption:
- provider: sops
- secretRef:
- name: sops-age
- interval: 30m
- path: ./kubernetes/apps/testing/vpn-routed-pods/app
- postBuild:
- substituteFrom:
- - kind: ConfigMap
- name: cluster-settings
- - kind: Secret
- name: cluster-secrets
- - kind: ConfigMap
- name: cluster-settings-user
- optional: true
- - kind: Secret
- name: cluster-secrets-user
- optional: true
- prune: true
- retryInterval: 1m
- sourceRef:
- kind: GitRepository
- name: home-kubernetes
- targetNamespace: testing
- timeout: 5m
- wait: false
-
--- kubernetes/apps Kustomization: flux-system/cluster-apps Kustomization: flux-system/non-vpn-routed
+++ kubernetes/apps Kustomization: flux-system/cluster-apps Kustomization: flux-system/non-vpn-routed
@@ -1,40 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
- labels:
- kustomize.toolkit.fluxcd.io/name: cluster-apps
- kustomize.toolkit.fluxcd.io/namespace: flux-system
- name: non-vpn-routed
- namespace: flux-system
-spec:
- commonMetadata:
- labels:
- app.kubernetes.io/name: non-vpn-routed
- decryption:
- provider: sops
- secretRef:
- name: sops-age
- interval: 30m
- path: ./kubernetes/apps/testing/non-vpn-routed-pods/app
- postBuild:
- substituteFrom:
- - kind: ConfigMap
- name: cluster-settings
- - kind: Secret
- name: cluster-secrets
- - kind: ConfigMap
- name: cluster-settings-user
- optional: true
- - kind: Secret
- name: cluster-secrets-user
- optional: true
- prune: true
- retryInterval: 1m
- sourceRef:
- kind: GitRepository
- name: home-kubernetes
- targetNamespace: testing
- timeout: 5m
- wait: false
-
--- kubernetes/apps/testing/non-vpn-routed-pods/app Kustomization: flux-system/non-vpn-routed Deployment: testing/novpn
+++ kubernetes/apps/testing/non-vpn-routed-pods/app Kustomization: flux-system/non-vpn-routed Deployment: testing/novpn
@@ -1,30 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- labels:
- app.kubernetes.io/name: non-vpn-routed
- kustomize.toolkit.fluxcd.io/name: non-vpn-routed
- kustomize.toolkit.fluxcd.io/namespace: flux-system
- name: novpn
- namespace: testing
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: novpn
- template:
- metadata:
- labels:
- app: novpn
- spec:
- containers:
- - args:
- - while true; do sleep 30; done;
- command:
- - /bin/bash
- - -c
- - --
- image: nicolaka/netshoot
- name: dnsutils
-
--- kubernetes/apps/media/prowlarr/app Kustomization: flux-system/prowlarr HelmRelease: media/prowlarr
+++ kubernetes/apps/media/prowlarr/app Kustomization: flux-system/prowlarr HelmRelease: media/prowlarr
@@ -36,13 +36,13 @@
retries: 3
values:
controllers:
main:
annotations:
reloader.stakater.com/auto: 'true'
- routeToVPN: 'true'
+ setGateway: 'true'
containers:
main:
env:
COMPlus_EnableDiagnostics: '0'
PROWLARR__INSTANCE_NAME: Prowlarr
PROWLARR__LOG_LEVEL: info
--- kubernetes/apps/network/vpn-gateway/app Kustomization: flux-system/vpn-gateway HelmRelease: network/vpn-gateway
+++ kubernetes/apps/network/vpn-gateway/app Kustomization: flux-system/vpn-gateway HelmRelease: network/vpn-gateway
@@ -85,13 +85,13 @@
ports:
- port: 27071
type: udp
- port: 27071
type: tcp
routed_namespaces:
- - testing
+ - media
settings:
NOT_ROUTED_TO_GATEWAY_CIDRS: 10.0.0.0/8 192.168.0.0/24
VPN_BLOCK_OTHER_TRAFFIC: true
VPN_INTERFACE: wg0
VPN_LOCAL_CIDRS: 10.0.0.0/8 192.168.1.0/24
VPN_TRAFFIC_PORT: ${SECRET_VPN_GATEWAY_PORT}
--- kubernetes/apps/testing/vpn-routed-pods/app Kustomization: flux-system/vpn-routed Deployment: testing/vpn-routed
+++ kubernetes/apps/testing/vpn-routed-pods/app Kustomization: flux-system/vpn-routed Deployment: testing/vpn-routed
@@ -1,32 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- labels:
- app.kubernetes.io/name: vpn-routed
- kustomize.toolkit.fluxcd.io/name: vpn-routed
- kustomize.toolkit.fluxcd.io/namespace: flux-system
- name: vpn-routed
- namespace: testing
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: vpn-routed
- template:
- metadata:
- annotations:
- setGateway: 'true'
- labels:
- app: vpn-routed
- spec:
- containers:
- - args:
- - while true; do sleep 30; done;
- command:
- - /bin/bash
- - -c
- - --
- image: nicolaka/netshoot
- name: dnsutils
- |
--- HelmRelease: network/vpn-gateway ConfigMap: testing/vpn-gateway-pod-gateway
+++ HelmRelease: network/vpn-gateway ConfigMap: testing/vpn-gateway-pod-gateway
@@ -1,29 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: vpn-gateway-pod-gateway
- namespace: testing
- labels:
- app.kubernetes.io/name: pod-gateway
- app.kubernetes.io/instance: vpn-gateway
- app.kubernetes.io/managed-by: Helm
-data:
- settings.sh: |
- #!/bin/sh
- # Generated by vpn-gateway-pod-gateway
- DNS_LOCAL_CIDRS="local"
- NOT_ROUTED_TO_GATEWAY_CIDRS="10.0.0.0/8 192.168.0.0/24"
- VPN_BLOCK_OTHER_TRAFFIC="true"
- VPN_INTERFACE="wg0"
- VPN_LOCAL_CIDRS="10.0.0.0/8 192.168.1.0/24"
- VPN_TRAFFIC_PORT="${SECRET_VPN_GATEWAY_PORT}"
- VXLAN_GATEWAY_FIRST_DYNAMIC_IP="20"
- VXLAN_ID="42"
- VXLAN_IP_NETWORK="172.16.0"
- nat.conf: |
- # Generated by vpn-gateway-pod-gateway
- transmission 10 udp:27071,tcp:27071
- nat6.conf: |
- # Generated by vpn-gateway-pod-gateway
-
--- HelmRelease: network/vpn-gateway ConfigMap: media/vpn-gateway-pod-gateway
+++ HelmRelease: network/vpn-gateway ConfigMap: media/vpn-gateway-pod-gateway
@@ -0,0 +1,29 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: vpn-gateway-pod-gateway
+ namespace: media
+ labels:
+ app.kubernetes.io/name: pod-gateway
+ app.kubernetes.io/instance: vpn-gateway
+ app.kubernetes.io/managed-by: Helm
+data:
+ settings.sh: |
+ #!/bin/sh
+ # Generated by vpn-gateway-pod-gateway
+ DNS_LOCAL_CIDRS="local"
+ NOT_ROUTED_TO_GATEWAY_CIDRS="10.0.0.0/8 192.168.0.0/24"
+ VPN_BLOCK_OTHER_TRAFFIC="true"
+ VPN_INTERFACE="wg0"
+ VPN_LOCAL_CIDRS="10.0.0.0/8 192.168.1.0/24"
+ VPN_TRAFFIC_PORT="${SECRET_VPN_GATEWAY_PORT}"
+ VXLAN_GATEWAY_FIRST_DYNAMIC_IP="20"
+ VXLAN_ID="42"
+ VXLAN_IP_NETWORK="172.16.0"
+ nat.conf: |
+ # Generated by vpn-gateway-pod-gateway
+ transmission 10 udp:27071,tcp:27071
+ nat6.conf: |
+ # Generated by vpn-gateway-pod-gateway
+
--- HelmRelease: media/prowlarr Deployment: media/prowlarr
+++ HelmRelease: media/prowlarr Deployment: media/prowlarr
@@ -7,13 +7,13 @@
app.kubernetes.io/component: main
app.kubernetes.io/instance: prowlarr
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: prowlarr
annotations:
reloader.stakater.com/auto: 'true'
- routeToVPN: 'true'
+ setGateway: 'true'
spec:
revisionHistoryLimit: 3
replicas: 1
strategy:
type: Recreate
selector: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
and move testing out to a test folder