Skip to content

namespace kctf zones by cluster name #381

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: v1
Choose a base branch
from
Open

namespace kctf zones by cluster name #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8664d
namespace kctf zones by cluster name
sirdarckcat Jul 15, 2022
8e389b6
Update kctf-cluster
sirdarckcat Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/bin/kctf-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ function kctf_cluster_start_gce {

gcloud projects add-iam-policy-binding ${PROJECT} --member=serviceAccount:${DNS_GSA_EMAIL} --role=roles/dns.admin || return

"${KCTF_BIN}/kubectl" create configmap --namespace kctf-system external-dns --from-literal=DOMAIN_NAME=${DOMAIN_NAME} --from-literal=EMAIL_ADDRESS=${EMAIL_ADDRESS:-} --dry-run=client -o yaml | "${KCTF_BIN}/kubectl" apply -f - || return
"${KCTF_BIN}/kubectl" create configmap --namespace kctf-system external-dns --from-literal=DOMAIN_NAME=${DOMAIN_NAME} --from-literal=EMAIL_ADDRESS=${EMAIL_ADDRESS:-} --from-literal=CLUSTER_NAME=${CLUSTER_NAME:-} --dry-run=client -o yaml | "${KCTF_BIN}/kubectl" apply -f - || return
fi

if [[ "${DISABLE_SRC_RANGES}" == "0" ]]; then
Expand Down
14 changes: 12 additions & 2 deletions kctf-operator/resources/external-dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,20 @@ func NewExternalDnsDeployment() client.Object {
Key: "DOMAIN_NAME",
},
},
}},
}, {
Name: "CLUSTER_NAME",
ValueFrom: &corev1.EnvVarSource{
ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
LocalObjectReference: corev1.LocalObjectReference{
Name: "external-dns",
},
Key: "CLUSTER_NAME",
},
},
}, },
Args: []string{"--log-level=debug", "--source=service", "--source=ingress",
"--provider=google", "--domain-filter=$(DOMAIN_NAME)", "--registry=txt",
"--txt-owner-id=kctf-cloud-dns"},
"--txt-owner-id=kctf-cloud-dns-$(CLUSTER_NAME)"},
},
{
Image: DOCKER_CERTBOT_IMAGE,
Expand Down