diff --git a/dns/operationcode.org/records.tf b/dns/operationcode.org/records.tf index 25c27cc..b6633c2 100644 --- a/dns/operationcode.org/records.tf +++ b/dns/operationcode.org/records.tf @@ -25,21 +25,14 @@ resource "dnsimple_record" "api" { domain = "${var.hosted-zone}" name = "api" type = "CNAME" - value = "${var.k8s-cluster-ingress}" + value = "backend.k8s.operationcode.org" } resource "dnsimple_record" "staging_api" { domain = "${var.hosted-zone}" name = "api.staging" type = "CNAME" - value = "${var.k8s-cluster-ingress}" -} - -resource "dnsimple_record" "dashboards" { - domain = "${var.hosted-zone}" - name = "dashboards" - type = "CNAME" - value = "${var.k8s-cluster-ingress}" + value = "backend-staging.k8s.operationcode.org" } resource "dnsimple_record" "pybot" { @@ -67,19 +60,12 @@ resource "dnsimple_record" "resources_api" { domain = "${var.hosted-zone}" name = "resources" type = "CNAME" - value = "${var.k8s-cluster-ingress}" + value = "resources.k8s.operationcode.org" } resource "dnsimple_record" "resources_staging_api" { domain = "${var.hosted-zone}" name = "resources.staging" type = "CNAME" - value = "${var.k8s-cluster-ingress}" -} - -resource "dnsimple_record" "python_backend_dev" { - domain = "${var.hosted-zone}" - name = "api.dev" - type = "CNAME" - value = "${var.k8s-cluster-ingress}" + value = "resources-staging.k8s.operationcode.org" } diff --git a/kubernetes/eksctl/aws-alb-ingress-controller/external-dns.yaml b/kubernetes/eksctl/aws-alb-ingress-controller/external-dns.yaml deleted file mode 100644 index 7ee2e68..0000000 --- a/kubernetes/eksctl/aws-alb-ingress-controller/external-dns.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: external-dns ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRole -metadata: - name: external-dns -rules: -- apiGroups: [""] - resources: ["services"] - verbs: ["get","watch","list"] -- apiGroups: [""] - resources: ["pods"] - verbs: ["get","watch","list"] -- apiGroups: ["extensions"] - resources: ["ingresses"] - verbs: ["get","watch","list"] -- apiGroups: [""] - resources: ["nodes"] - verbs: ["list"] ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRoleBinding -metadata: - name: external-dns-viewer -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: external-dns -subjects: -- kind: ServiceAccount - name: external-dns - namespace: default ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: external-dns -spec: - selector: - matchLabels: - app: external-dns - strategy: - type: Recreate - template: - metadata: - labels: - app: external-dns - spec: - serviceAccountName: external-dns - containers: - - name: external-dns - image: registry.opensource.zalan.do/teapot/external-dns:v0.5.9 - args: - - --source=service - - --source=ingress - - --domain-filter=k8s.operationcode.org # will make ExternalDNS see only the hosted zones matching provided domain, omit to process all available hosted zones - - --provider=aws - - --policy=upsert-only # would prevent ExternalDNS from deleting any records, omit to enable full synchronization - - --aws-zone-type=public # only look at public hosted zones (valid values are public, private or no value for both) - - --registry=txt - - --txt-owner-id=Z2QGEWMWUT7EEB