From c420790a4e547bed133c8a2ec3617de6a8529b9c Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 26 Aug 2024 15:40:36 +1000 Subject: [PATCH] update metallb ip pool --- apps/adguard-home/base/service.yaml | 4 ++-- apps/gitea/env/k3s-cluster/values.yaml | 4 ++-- apps/homer/base/service.yaml | 4 ++-- apps/qbittorrent/base/service.yaml | 4 ++-- apps/sonarqube/env/k3s-cluster/values.yaml | 4 ++-- .../metallb-conf/env/k3s-cluster/advertisement.yaml | 2 +- .../metallb-conf/env/k3s-cluster/cluster-ip.yaml | 2 +- infrastructures/minio/env/k3s-cluster/values.yaml | 4 ++-- infrastructures/mongodb/env/k3s-cluster/values.yaml | 4 ++-- infrastructures/postgresql/env/k3s-cluster/values.yaml | 8 ++++---- infrastructures/renovate/base/values.yaml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/adguard-home/base/service.yaml b/apps/adguard-home/base/service.yaml index 965c49c..a5c8537 100644 --- a/apps/adguard-home/base/service.yaml +++ b/apps/adguard-home/base/service.yaml @@ -4,8 +4,8 @@ metadata: name: adguard-home namespace: adguard-home annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: adguard-home spec: diff --git a/apps/gitea/env/k3s-cluster/values.yaml b/apps/gitea/env/k3s-cluster/values.yaml index 55f5244..8c2daa3 100644 --- a/apps/gitea/env/k3s-cluster/values.yaml +++ b/apps/gitea/env/k3s-cluster/values.yaml @@ -18,8 +18,8 @@ service: http: 10080 ssh: 10022 annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster ingress: enabled: true ingressClassName: "nginx" diff --git a/apps/homer/base/service.yaml b/apps/homer/base/service.yaml index 57e175c..dd301d8 100644 --- a/apps/homer/base/service.yaml +++ b/apps/homer/base/service.yaml @@ -4,8 +4,8 @@ metadata: name: homer namespace: homer annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: homer spec: diff --git a/apps/qbittorrent/base/service.yaml b/apps/qbittorrent/base/service.yaml index b6eedf7..565776c 100644 --- a/apps/qbittorrent/base/service.yaml +++ b/apps/qbittorrent/base/service.yaml @@ -4,8 +4,8 @@ metadata: name: qbittorrent namespace: qbittorrent annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: qbittorrent spec: diff --git a/apps/sonarqube/env/k3s-cluster/values.yaml b/apps/sonarqube/env/k3s-cluster/values.yaml index 1dcc1ba..1e3fb76 100644 --- a/apps/sonarqube/env/k3s-cluster/values.yaml +++ b/apps/sonarqube/env/k3s-cluster/values.yaml @@ -24,8 +24,8 @@ service: http: 8090 elastic: 9091 annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster persistence: enabled: true storageClass: local-path diff --git a/infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml b/infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml index 1a9fa24..93c8bdc 100644 --- a/infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml +++ b/infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml @@ -5,4 +5,4 @@ metadata: namespace: metallb-system spec: ipAddressPools: - - k3s-cluster-ips \ No newline at end of file + - k3s-cluster-ip-pool \ No newline at end of file diff --git a/infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml b/infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml index f598015..3dfe227 100644 --- a/infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml +++ b/infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml @@ -1,7 +1,7 @@ apiVersion: metallb.io/v1beta1 kind: IPAddressPool metadata: - name: k3s-cluster-ips + name: k3s-cluster-ip-pool namespace: metallb-system spec: addresses: diff --git a/infrastructures/minio/env/k3s-cluster/values.yaml b/infrastructures/minio/env/k3s-cluster/values.yaml index 34654f2..e9af075 100644 --- a/infrastructures/minio/env/k3s-cluster/values.yaml +++ b/infrastructures/minio/env/k3s-cluster/values.yaml @@ -14,8 +14,8 @@ service: api: 19000 console: 19001 annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster persistence: existingClaim: "minio-pvc" containerSecurityContext: diff --git a/infrastructures/mongodb/env/k3s-cluster/values.yaml b/infrastructures/mongodb/env/k3s-cluster/values.yaml index c390c47..4055f37 100644 --- a/infrastructures/mongodb/env/k3s-cluster/values.yaml +++ b/infrastructures/mongodb/env/k3s-cluster/values.yaml @@ -23,8 +23,8 @@ startupProbe: service: type: LoadBalancer annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster persistence: existingClaim: "mongodb-pvc" persistentVolumeClaimRetentionPolicy: diff --git a/infrastructures/postgresql/env/k3s-cluster/values.yaml b/infrastructures/postgresql/env/k3s-cluster/values.yaml index 4a3ec6c..0e907eb 100644 --- a/infrastructures/postgresql/env/k3s-cluster/values.yaml +++ b/infrastructures/postgresql/env/k3s-cluster/values.yaml @@ -22,8 +22,8 @@ primary: service: type: LoadBalancer annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster persistence: existingClaim: postgresql-primary-pvc selector: @@ -45,8 +45,8 @@ readReplicas: ports: postgresql: 5433 annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster persistence: existingClaim: postgresql-replica-pvc selector: diff --git a/infrastructures/renovate/base/values.yaml b/infrastructures/renovate/base/values.yaml index 8bb6915..3f5fe13 100644 --- a/infrastructures/renovate/base/values.yaml +++ b/infrastructures/renovate/base/values.yaml @@ -23,8 +23,8 @@ service: type: LoadBalancer port: 18899 annotations: - metallb.universe.tf/address-pool: k3s-cluster-ips - metallb.universe.tf/allow-shared-ip: k3s-cluster-ips + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster ingress: enabled: true ingressClassName: nginx