diff options
| -rw-r--r-- | kubernetes/ntp/ntp.conf (renamed from kubernetes/rpi/ntp/ntp.conf) | 0 | ||||
| -rwxr-xr-x | kubernetes/pihole/deploy.sh | 5 | ||||
| -rw-r--r-- | kubernetes/pihole/pihole-configmap.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/pihole/pihole-deployment.yaml (renamed from kubernetes/rpi/pihole-deployment.yaml) | 35 | ||||
| -rw-r--r-- | kubernetes/pihole/pihole-secret.yaml (renamed from kubernetes/rpi/secret.yaml) | 2 | ||||
| -rw-r--r-- | kubernetes/squid/squid-configmap.yaml (renamed from kubernetes/rpi/configmap.yaml) | 2 | ||||
| -rw-r--r-- | kubernetes/squid/squid-proxy-deployment.yaml (renamed from kubernetes/rpi/squid-proxy-deployment.yaml) | 7 | ||||
| -rw-r--r-- | kubernetes/squid/squid.conf (renamed from kubernetes/rpi/squid/squid.conf) | 0 | ||||
| -rw-r--r-- | kubernetes/unbound/unbound-deployment.yaml (renamed from kubernetes/rpi/unbound-deployment.yaml) | 0 |
9 files changed, 34 insertions, 23 deletions
diff --git a/kubernetes/rpi/ntp/ntp.conf b/kubernetes/ntp/ntp.conf index b81b065..b81b065 100644 --- a/kubernetes/rpi/ntp/ntp.conf +++ b/kubernetes/ntp/ntp.conf diff --git a/kubernetes/pihole/deploy.sh b/kubernetes/pihole/deploy.sh new file mode 100755 index 0000000..7b2dc5b --- /dev/null +++ b/kubernetes/pihole/deploy.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env sh + +kubectl apply -f ./pihole-secret.yaml +kubectl apply -f ./pihole-configmap.yaml +kubectl apply -f ./pihole-deployment.yaml diff --git a/kubernetes/pihole/pihole-configmap.yaml b/kubernetes/pihole/pihole-configmap.yaml new file mode 100644 index 0000000..d0c34bf --- /dev/null +++ b/kubernetes/pihole/pihole-configmap.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: pihole-configmap +data: + pihole_tz: iran/tehran diff --git a/kubernetes/rpi/pihole-deployment.yaml b/kubernetes/pihole/pihole-deployment.yaml index cee5d53..8f48319 100644 --- a/kubernetes/rpi/pihole-deployment.yaml +++ b/kubernetes/pihole/pihole-deployment.yaml @@ -6,7 +6,7 @@ metadata: app: pihole spec: replicas: 1 - selcetor: + selector: matchLabels: app: pihole template: @@ -26,12 +26,12 @@ spec: - name: TZ valueFrom: configMapKeyRef: - name: k3s-rpi-configmap + name: pihole-configmap key: pihole_tz - name: WEBPASSWORD - valueFrom: + valueFrom: secretKeyRef: - name: k3s-rpi-secrets + name: pihole-secret key: pihole-webpassword --- apiVersion: v1 @@ -41,25 +41,30 @@ metadata: spec: selector: app: pihole - type: LoadBalancer + type: NodePort ports: - protocol: TCP - port: 53 + port: 2053 targetPort: 53 - nodePort: 53 + nodePort: 30153 + name: "pihole-tcp-53" - protocol: UDP - port: 53 + port: 2053 targetPort: 53 - nodePort: 53 + nodePort: 30153 + name: "pihole-udp-53" - protocol: UDP - port: 67 + port: 2067 targetPort: 67 - nodePort: 67 + nodePort: 30167 + name: "pihole-udp-67" - protocol: TCP - port: 80 + port: 2080 targetPort: 80 - nodePort: 80 + nodePort: 30180 + name: "pihole-tcp-80" - protocol: TCP - port: 443 + port: 20443 targetPort: 443 - nodePort: 443 + nodePort: 30443 + name: "pihole-tcp-443" diff --git a/kubernetes/rpi/secret.yaml b/kubernetes/pihole/pihole-secret.yaml index 0ac4b60..f79d6a6 100644 --- a/kubernetes/rpi/secret.yaml +++ b/kubernetes/pihole/pihole-secret.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: k3s-rpi-secrets + name: pihole-secret type: Opaque data: pihole-webpassword: WGFzaG1pdGgjNjY2Cg== diff --git a/kubernetes/rpi/configmap.yaml b/kubernetes/squid/squid-configmap.yaml index 551ee23..8820f6d 100644 --- a/kubernetes/rpi/configmap.yaml +++ b/kubernetes/squid/squid-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: k3s-rpi-configmap + name: squid-configmap data: pihole_tz: iran/tehran squid_config_vol: /etc/squid/ diff --git a/kubernetes/rpi/squid-proxy-deployment.yaml b/kubernetes/squid/squid-proxy-deployment.yaml index 70ec65e..1ef2c40 100644 --- a/kubernetes/rpi/squid-proxy-deployment.yaml +++ b/kubernetes/squid/squid-proxy-deployment.yaml @@ -23,13 +23,8 @@ spec: - name: TZ valueFrom: configMapKeyRef: - name: k3s-rpi-configmap + name: squid-configmap key: pihole_tz - - name: WEBPASSWORD - valueFrom: - secretKeyRef: - name: k3s-rpi-secrets - key: pihole-webpassword volumes: - name: squid-config-volume valueFrom: diff --git a/kubernetes/rpi/squid/squid.conf b/kubernetes/squid/squid.conf index 5099bbc..5099bbc 100644 --- a/kubernetes/rpi/squid/squid.conf +++ b/kubernetes/squid/squid.conf diff --git a/kubernetes/rpi/unbound-deployment.yaml b/kubernetes/unbound/unbound-deployment.yaml index 26f8997..26f8997 100644 --- a/kubernetes/rpi/unbound-deployment.yaml +++ b/kubernetes/unbound/unbound-deployment.yaml |