Skip to content

Commit

Permalink
use upstream coreDNS chart instead of fork (#1776)
Browse files Browse the repository at this point in the history
Signed-off-by: Andre Aguas <andre.aguas@protonmail.com>
  • Loading branch information
abaguas authored Dec 21, 2024
1 parent e2e5a9b commit a7549af
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 19 deletions.
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ LOG_LEVEL ?= debug
CONTROLLER_GEN_VERSION ?= v0.16.5
GOLIC_VERSION ?= v0.7.2
GOLANGCI_VERSION ?= v1.60.3
ISTIO_VERSION ?= v1.23.3
POD_NAMESPACE ?= k8gb
CLUSTER_GEO_TAG ?= eu
EXT_GSLB_CLUSTERS_GEO_TAGS ?= us
Expand Down Expand Up @@ -179,7 +180,7 @@ deploy-local-cluster:
kubectl config use-context k3d-$(CLUSTER_NAME)$(CLUSTER_ID)

@echo -e "\n$(YELLOW)Create namespace $(NC)"
kubectl apply -f deploy/namespace.yaml
kubectl create namespace k8gb --dry-run=client -o yaml | kubectl apply -f -

@echo -e "\n$(YELLOW)Deploy GSLB operator from $(VERSION) $(NC)"
$(MAKE) deploy-k8gb-with-helm
Expand All @@ -191,18 +192,18 @@ deploy-local-cluster:
--version 4.0.15 -f $(NGINX_INGRESS_VALUES_PATH)

@echo -e "\n$(YELLOW)Install Istio CRDs $(NC)"
kubectl create namespace istio-system
kubectl create namespace istio-system --dry-run=client -o yaml | kubectl apply -f -
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 "$(ISTIO_VERSION)"

@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 "$(ISTIO_VERSION)" --wait

@echo -e "\n$(YELLOW)Install Istio Ingress Gateway $(NC)"
kubectl create namespace istio-ingress
kubectl create namespace istio-ingress --dry-run=client -o yaml | kubectl apply -f -
helm upgrade -i istio-ingressgateway istio/gateway -n istio-ingress \
-f $(ISTIO_INGRESS_VALUES_PATH)
--version "$(ISTIO_VERSION)" -f $(ISTIO_INGRESS_VALUES_PATH)

@if [ "$(DEPLOY_APPS)" = true ]; then $(MAKE) deploy-test-apps ; fi

Expand Down Expand Up @@ -265,7 +266,7 @@ deploy-k8gb-with-helm:

.PHONY: deploy-gslb-operator
deploy-gslb-operator: ## Deploy k8gb operator
kubectl apply -f deploy/namespace.yaml
kubectl create namespace k8gb --dry-run=client -o yaml | kubectl apply -f -
cd chart/k8gb && helm dependency update
helm -n k8gb upgrade -i k8gb chart/k8gb -f $(VALUES_YAML) $(HELM_ARGS) \
--set k8gb.log.format=$(LOG_FORMAT)
Expand Down
8 changes: 4 additions & 4 deletions chart/k8gb/Chart.lock
Original file line number Diff line number Diff line change
@@ -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.36.1
digest: sha256:55c867121c6aa4e926387802c02cd44e4c0f26439b79a73dbf4ff750c1e6f743
generated: "2024-11-11T06:50:48.270246+01:00"
4 changes: 2 additions & 2 deletions chart/k8gb/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.36.1

home: https://www.k8gb.io/
sources:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{{- if .Values.coredns.deployment.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-coredns
namespace: {{ .Release.Namespace }}
labels:
{{ include "chart.labels" . | indent 4 }}
name: {{ .Release.Name }}-coredns
apiVersion: v1
data:
Corefile: |-
{{ .Values.k8gb.dnsZone }}:5353 {
Expand Down
11 changes: 11 additions & 0 deletions chart/k8gb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ coredns:
serviceAccount:
create: true
name: coredns
# -- Disables all permissions since we don't open privileged ports
securityContext:
capabilities:
add: []
# -- Only meant to open the correct service and container ports, has no other impact on the coredns configuration
servers:
- port: 5353
servicePort: 53
plugins:
- name: prometheus
parameters: 0.0.0.0:9153

infoblox:
# -- infoblox provider enabled
Expand Down
4 changes: 0 additions & 4 deletions deploy/namespace.yaml

This file was deleted.

0 comments on commit a7549af

Please sign in to comment.