use upstream coredns chart instead of fork

Signed-off-by: Andre Baptista Aguas <[email protected]>
k8gb-io · Oct 1, 2024 · 7d3ab38 · 7d3ab38
1 parent eb1f4dd
commit 7d3ab38
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 109 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ CLUSTER_GSLB_GATEWAY = docker network inspect ${CLUSTER_GSLB_NETWORK} -f '{{ (in
 GSLB_DOMAIN ?= cloud.example.com
 REPO := absaoss/k8gb
 SHELL := bash
-VALUES_YAML ?= ""
+VALUES_YAML ?= deploy/k8gb/values.yaml
 PODINFO_IMAGE_REPO ?= ghcr.io/stefanprodan/podinfo
 HELM_ARGS ?=
 K8GB_COREDNS_IP ?= kubectl get svc k8gb-coredns -n k8gb -o custom-columns='IP:spec.clusterIP' --no-headers
@@ -73,7 +73,8 @@ NO_VALUE ?= no_value
 ###############################
 PWD ?=  $(shell pwd)
 ifndef VERSION
-VERSION := $(shell git fetch --force --tags &> /dev/null ; git describe --tags --abbrev=0)
+#VERSION := $(shell git fetch --force --tags &> /dev/null ; git describe --tags --abbrev=0)
+VERSION := "v0.0.0"
 endif
 COMMIT_HASH ?= $(shell git rev-parse --short HEAD)
 SEMVER ?= $(VERSION)-$(COMMIT_HASH)
@@ -157,7 +158,6 @@ deploy-test-version: ## Upgrade k8gb to the test version on existing clusters
 
 	@for c in $(CLUSTER_IDS); do \
 		$(MAKE) deploy-local-cluster CLUSTER_ID=$$c VERSION=$(SEMVER)-$(ARCH) CHART='./chart/k8gb' ;\
-		kubectl apply -n k8gb -f ./deploy/test/coredns-tcp-svc.yaml ;\
 	done
 
 .PHONY: list-running-pods
@@ -193,15 +193,15 @@ deploy-local-cluster:
 	kubectl create namespace istio-system
 	helm repo add --force-update istio https://istio-release.storage.googleapis.com/charts
 	helm repo update
-	helm upgrade -i istio-base istio/base -n istio-system
+	helm upgrade -i istio-base istio/base -n istio-system --version 1.23.2
 
 	@echo -e "\n$(YELLOW)Install Istiod $(NC)"
-	helm upgrade -i istiod istio/istiod -n istio-system --wait
+	helm upgrade -i istiod istio/istiod -n istio-system -version 1.23.2 --wait
 
 	@echo -e "\n$(YELLOW)Install Istio Ingress Gateway $(NC)"
 	kubectl create namespace istio-ingress
 	helm upgrade -i istio-ingressgateway istio/gateway -n istio-ingress \
-		-f $(ISTIO_INGRESS_VALUES_PATH)
+		-version 1.23.2 -f $(ISTIO_INGRESS_VALUES_PATH)
 
 	@if [ "$(DEPLOY_APPS)" = true ]; then $(MAKE) deploy-test-apps ; fi
 
@@ -254,7 +254,6 @@ deploy-k8gb-with-helm:
 	helm -n k8gb upgrade -i k8gb $(CHART) -f $(VALUES_YAML) \
 		--set $(call get-helm-args,$(CLUSTER_ID)) \
 		--set k8gb.reconcileRequeueSeconds=10 \
-		--set k8gb.dnsZoneNegTTL=10 \
 		--set k8gb.imageTag=${VERSION:"stable"=""} \
 		--set k8gb.log.format=$(LOG_FORMAT) \
 		--set k8gb.log.level=$(LOG_LEVEL) \

diff --git a/chart/k8gb/Chart.lock b/chart/k8gb/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: coredns
-  repository: https://k8gb-io.github.io/coredns-helm
-  version: 1.15.3
-digest: sha256:6e8906f6d2e0772826658468a0ff436fe0b1f6b7e2daeb4a03b27edfedcba41c
-generated: "2024-09-06T11:25:39.309536+02:00"
+  repository: https://coredns.github.io/helm
+  version: 1.34.0
+digest: sha256:4a8560d95d3584c274cc64034394da8b2b57f5372694186a9d0a5488a728a0ff
+generated: "2024-10-01T20:03:17.515057+02:00"
diff --git a/chart/k8gb/Chart.yaml b/chart/k8gb/Chart.yaml
@@ -9,8 +9,8 @@ kubeVersion: ">= 1.19.0-0"
 
 dependencies:
   - name: coredns
-    repository: https://k8gb-io.github.io/coredns-helm
-    version: 1.15.3
+    repository: https://coredns.github.io/helm
+    version: 1.34.0
 
 home: https://www.k8gb.io/
 sources:

diff --git a/chart/k8gb/README.md b/chart/k8gb/README.md
@@ -89,12 +89,9 @@ For Kubernetes `< 1.19` use this chart and k8gb in version `0.8.8` or lower.
 | infoblox.wapiVersion | string | `"2.3.1"` | WAPI version |
 | istio.enabled | bool | `true` | install istio RBAC |
 | k8gb.clusterGeoTag | string | `"eu"` | used for places where we need to distinguish between different Gslb instances |
-| k8gb.coredns.extraServerBlocks | string | `""` | Extra CoreDNS server blocks |
-| k8gb.coredns.extra_plugins | list | `[]` | Extra CoreDNS plugins to be enabled |
 | k8gb.deployCrds | bool | `true` | whether it should also deploy the gslb and dnsendpoints CRDs |
 | k8gb.deployRbac | bool | `true` | whether it should also deploy the service account, cluster role and cluster role binding |
 | k8gb.dnsZone | string | `"cloud.example.com"` | dnsZone controlled by gslb |
-| k8gb.dnsZoneNegTTL | int | `300` | Negative TTL for SOA record |
 | k8gb.edgeDNSServers | list | `["1.1.1.1"]` | host/ip[:port] format is supported here where port defaults to 53 |
 | k8gb.edgeDNSServers[0] | string | `"1.1.1.1"` | use this DNS server as a main resolver to enable cross k8gb DNS based communication |
 | k8gb.edgeDNSZone | string | `"example.com"` | main zone which would contain gslb zone to delegate |

diff --git a/chart/k8gb/templates/coredns-cm.yaml b/chart/k8gb/templates/coredns-cm.yaml
diff --git a/chart/k8gb/values.schema.json b/chart/k8gb/values.schema.json
@@ -270,10 +270,6 @@
                     "format": "idn-hostname",
                     "minLength": 1
                 },
-                "dnsZoneNegTTL": {
-                    "type": "integer",
-                    "minimum": 0
-                },
                 "edgeDNSZone": {
                     "format": "idn-hostname",
                     "minLength": 1
@@ -300,9 +296,6 @@
                 "log": {
                     "$ref": "#/definitions/k8gbLog"
                 },
-                "coredns": {
-                    "$ref": "#/definitions/k8gbCoreDNS"
-                },
                 "splitBrainCheck": {
                     "type": "boolean"
                 },
@@ -360,22 +353,6 @@
             },
             "title": "Log"
         },
-        "k8gbCoreDNS": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "extra_plugins": {
-                    "type": [
-                        "array",
-                        "null"
-                    ]
-                },
-                "extraServerBlocks": {
-                    "type": "string"
-                }
-            },
-            "title": "k8gbCoredns"
-        },
         "k8gbSecurityContext": {
             "type": "object",
             "additionalProperties": false,

diff --git a/chart/k8gb/values.yaml b/chart/k8gb/values.yaml
@@ -14,9 +14,7 @@ k8gb:
   # -- whether it should also deploy the service account, cluster role and cluster role binding
   deployRbac: true
   # -- dnsZone controlled by gslb
-  dnsZone: "cloud.example.com"
-  # -- Negative TTL for SOA record
-  dnsZoneNegTTL: 300
+  dnsZone: &dnsZone "cloud.example.com"
   # -- main zone which would contain gslb zone to delegate
   edgeDNSZone: "example.com" # main zone which would contain gslb zone to delegate
   # -- host/ip[:port] format is supported here where port defaults to 53
@@ -29,11 +27,6 @@ k8gb:
   extGslbClustersGeoTags: "us"
   # -- Reconcile time in seconds
   reconcileRequeueSeconds: 30
-  coredns:
-    # -- Extra CoreDNS server blocks
-    extraServerBlocks: ""
-    # -- Extra CoreDNS plugins to be enabled
-    extra_plugins: []
   log:
     # -- log format (simple,json)
     format: simple # log format (simple,json)
@@ -86,9 +79,6 @@ externaldns:
 coredns:
   # -- service: refer to https://www.k8gb.io/docs/service_upgrade.html for upgrading CoreDNS service steps
   isClusterService: false
-  deployment:
-    # -- Skip CoreDNS creation and uses the one shipped by k8gb instead
-    skipConfig: true
   image:
     # -- CoreDNS CRD plugin image
     repository: absaoss/k8s_crd
@@ -98,6 +88,27 @@ coredns:
   serviceAccount:
     create: true
     name: coredns
+  securityContext:
+    capabilities:
+      add: []
+  servers:
+  - zones: 
+    - zone: *dnsZone
+    port: 5353
+    servicePort: 53
+    plugins:
+    - name: errors
+    - name: health
+    - name: ready
+    - name: prometheus
+      parameters: 0.0.0.0:9153
+    - name: forward
+      parameters: . /etc/resolv.conf
+    - name: k8s_crd
+      configBlock: |-
+        filter k8gb.absa.oss/dnstype=local
+        negttl 300
+        loadbalance weight
 
 infoblox:
   # -- infoblox provider enabled

diff --git a/deploy/k8gb/values.yaml b/deploy/k8gb/values.yaml
@@ -0,0 +1,19 @@
+coredns:
+  servers:
+  - zones: 
+    - zone: cloud.example.com
+    port: 5353
+    servicePort: 53
+    plugins:
+    - name: errors
+    - name: health
+    - name: ready
+    - name: prometheus
+      parameters: 0.0.0.0:9153
+    - name: forward
+      parameters: . /etc/resolv.conf
+    - name: k8s_crd
+      configBlock: |-
+        filter k8gb.absa.oss/dnstype=local
+        negttl 10
+        loadbalance weight
diff --git a/deploy/test/coredns-tcp-svc.yaml b/deploy/test/coredns-tcp-svc.yaml
diff --git a/docs/examples/azure/k8gb/aks1-helm-values.yaml b/docs/examples/azure/k8gb/aks1-helm-values.yaml
@@ -1,8 +1,6 @@
 k8gb:
   # -- dnsZone controlled by gslb
-  dnsZone: "demo.k8gb-kubeconeu2023.com"
-  # -- Negative TTL for SOA record
-  dnsZoneNegTTL: 300
+  dnsZone: &dnsZone "demo.k8gb-kubeconeu2023.com"
   # -- main zone which would contain gslb zone to delegate
   edgeDNSZone: "k8gb-kubeconeu2023.com" # main zone which would contain gslb zone to delegate
   # -- host/ip[:port] format is supported here where port defaults to 53
@@ -33,3 +31,23 @@ azuredns:
     resourceGroup: k8gb-kubeconeu2023
     aadClientId: myAADClientID
     aadClientSecret: myAADClientSecret
+
+coredns:
+  servers:
+  - zones: 
+    - zone: *dnsZone
+    port: 5353
+    servicePort: 53
+    plugins:
+    - name: errors
+    - name: health
+    - name: ready
+    - name: prometheus
+      parameters: 0.0.0.0:9153
+    - name: forward
+      parameters: . /etc/resolv.conf
+    - name: k8s_crd
+      configBlock: |-
+        filter k8gb.absa.oss/dnstype=local
+        negttl 300
+        loadbalance weight
diff --git a/docs/examples/azure/k8gb/aks2-helm-values.yaml b/docs/examples/azure/k8gb/aks2-helm-values.yaml
@@ -1,8 +1,6 @@
 k8gb:
   # -- dnsZone controlled by gslb
-  dnsZone: "demo.k8gb-kubeconeu2023.com"
-  # -- Negative TTL for SOA record
-  dnsZoneNegTTL: 300
+  dnsZone: &dnsZone "demo.k8gb-kubeconeu2023.com"
   # -- main zone which would contain gslb zone to delegate
   edgeDNSZone: "k8gb-kubeconeu2023.com" # main zone which would contain gslb zone to delegate
   # -- host/ip[:port] format is supported here where port defaults to 53
@@ -32,3 +30,23 @@ azuredns:
     resourceGroup: k8gb-kubeconeu2023
     aadClientId: myAADClientID
     aadClientSecret: myAADClientSecret
+
+coredns:
+  servers:
+  - zones: 
+    - zone: *dnsZone
+    port: 5353
+    servicePort: 53
+    plugins:
+    - name: errors
+    - name: health
+    - name: ready
+    - name: prometheus
+      parameters: 0.0.0.0:9153
+    - name: forward
+      parameters: . /etc/resolv.conf
+    - name: k8s_crd
+      configBlock: |-
+        filter k8gb.absa.oss/dnstype=local
+        negttl 300
+        loadbalance weight
diff --git a/docs/examples/windowsdns/k8gb/aks1-helm-values.yaml b/docs/examples/windowsdns/k8gb/aks1-helm-values.yaml
@@ -3,9 +3,7 @@ k8gb:
   deployCrds: true
   deployRbac: true
   # -- dns zone that will be managed by CoreDNS
-  dnsZone: "global.k8gb.local"
-  # -- Negative TTL for SOA record
-  dnsZoneNegTTL: 300
+  dnsZone: &dnsZone "global.k8gb.local"
   # -- main zone which would contain gslb zone to delegate
   edgeDNSZone: "k8gb.local"
   # -- host/ip[:port] format is supported here where port defaults to 53
@@ -60,6 +58,24 @@ coredns:
   rbac:
     create: true
     name: coredns
+  servers:
+  - zones: 
+    - zone: *dnsZone
+    port: 5353
+    servicePort: 53
+    plugins:
+    - name: errors
+    - name: health
+    - name: ready
+    - name: prometheus
+      parameters: 0.0.0.0:9153
+    - name: forward
+      parameters: . /etc/resolv.conf
+    - name: k8s_crd
+      configBlock: |-
+        filter k8gb.absa.oss/dnstype=local
+        negttl 300
+        loadbalance weight
 
 rfc2136:
   enabled: true
@@ -80,4 +96,4 @@ rfc2136:
       gssTsigCreds:
         - kerberos-username: k8gb
         - kerberos-password: asdfkuj#f8guh1
-        - kerberos-realm: k8gb.local
+        - kerberos-realm: k8gb.local