Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no dns service installed if seed has taint disabledDNS #5

Merged
merged 1 commit into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

EXTENSION_PREFIX := gardener-extension
NAME := shoot-dns-service
REGISTRY := eu.gcr.io/gardener-project
REGISTRY := eu.gcr.io/gardener-project/gardener
IMAGE_PREFIX := $(REGISTRY)/extensions
REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
HACK_DIR := $(REPO_ROOT)/hack
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: core.gardener.cloud/v1alpha1
apiVersion: core.gardener.cloud/v1beta1
kind: ControllerRegistration
metadata:
name: extension-shoot-dns-service
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module github.com/gardener/gardener-extension-shoot-dns-service
go 1.13

require (
github.com/gardener/external-dns-management v0.7.5 // indirect
github.com/gardener/gardener v0.35.1-0.20200128130120-5b69a02f511a
github.com/gardener/gardener-extensions v1.3.1-0.20200205125211-46fd5fe5fbb0
github.com/gardener/external-dns-management v0.7.6 // indirect
github.com/gardener/gardener v1.0.1-0.20200213093126-7a6123b6ae21
github.com/gardener/gardener-extensions v1.3.1-0.20200219155613-f5f526846320
github.com/go-logr/logr v0.1.0
github.com/gobuffalo/packr/v2 v2.1.0
github.com/golang/mock v1.3.1
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/pkg/errors v0.8.1
github.com/pkg/errors v0.9.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
k8s.io/api v0.0.0-20191010143144-fbf594f18f80
k8s.io/apimachinery v0.0.0-20191016060620-86f2f1b9c076
k8s.io/api v0.16.4
k8s.io/apimachinery v0.17.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
k8s.io/component-base v0.16.4
sigs.k8s.io/controller-runtime v0.4.0
)

Expand Down
53 changes: 45 additions & 8 deletions go.sum

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions pkg/controller/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ import (
"path/filepath"
"time"

gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
gardencorev1beta1helper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"

controllerconfig "github.com/gardener/gardener-extension-shoot-dns-service/pkg/controller/config"
"github.com/gardener/gardener-extension-shoot-dns-service/pkg/imagevector"
"github.com/gardener/gardener-extension-shoot-dns-service/pkg/service"
Expand Down Expand Up @@ -104,6 +107,14 @@ func (a *actuator) Reconcile(ctx context.Context, ex *extensionsv1alpha1.Extensi
return err
}

// Shoots that don't specify a DNS domain or that are scheduled to a seed that is tainted with "DNS disabled"
// don't get an DNS service
if gardencorev1beta1helper.TaintsHave(cluster.Seed.Spec.Taints, gardencorev1beta1.SeedTaintDisableDNS) ||
cluster.Shoot.Spec.DNS == nil {
a.logger.Info("DNS domain is not specified or the seed is tainted with 'disable-dns', therefore no shoot dns service is installed", "shoot", ex.Namespace)
return a.Delete(ctx, ex)
}

if err := a.createShootResources(ctx, cluster, ex.Namespace); err != nil {
return err
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.