Renamed provider types and fixed crd object creation for DNSEntry (#9)

* fixed finalizer domain and apiGroups in controller.yaml * Allow to set TTL on creating dnsentry in source controller * Renamed provider types, fixed crd object creation for DNSEntry, added crds.yaml
gardener · Feb 13, 2019 · fc17227 · fc17227
1 parent 8ab53b2
commit fc17227
Show file tree

Hide file tree

Showing 18 changed files with 148 additions and 32 deletions.
diff --git a/cmd/dns/main.go b/cmd/dns/main.go
@@ -29,10 +29,10 @@ import (
 	dnssource "github.com/gardener/external-dns-management/pkg/dns/source"
 
 	_ "github.com/gardener/external-dns-management/pkg/controller/provider/alicloud"
+	_ "github.com/gardener/external-dns-management/pkg/controller/provider/aws"
 	_ "github.com/gardener/external-dns-management/pkg/controller/provider/azure"
-	_ "github.com/gardener/external-dns-management/pkg/controller/provider/googledns"
+	_ "github.com/gardener/external-dns-management/pkg/controller/provider/google"
 	_ "github.com/gardener/external-dns-management/pkg/controller/provider/openstack"
-	_ "github.com/gardener/external-dns-management/pkg/controller/provider/route53"
 
 	_ "github.com/gardener/external-dns-management/pkg/controller/source/ingress"
 	_ "github.com/gardener/external-dns-management/pkg/controller/source/service"

diff --git a/examples/crds.yaml b/examples/crds.yaml
@@ -0,0 +1,99 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: dnsentries.dns.gardener.cloud
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.dnsName
+    description: DNS ObjectName
+    name: DNS
+    type: string
+  - JSONPath: .status.state
+    description: Status of DNS entry in cloud provider
+    name: STATUS
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: AGE
+    type: date
+  conversion:
+    strategy: None
+  group: dns.gardener.cloud
+  names:
+    kind: DNSEntry
+    listKind: DNSEntryList
+    plural: dnsentries
+    shortNames:
+    - dnse
+    singular: dnsentry
+  scope: Namespaced
+  subresources:
+    status: {}
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: dnsowners.dns.gardener.cloud
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.ownerId
+    description: Owner Id
+    name: OWNERID
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: AGE
+    type: date
+  conversion:
+    strategy: None
+  group: dns.gardener.cloud
+  names:
+    kind: DNSOwner
+    listKind: DNSOwnerList
+    plural: dnsowners
+    shortNames:
+    - dnso
+    singular: dnsowner
+  scope: Cluster
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: dnsproviders.dns.gardener.cloud
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.providerType
+    description: Provider type
+    name: TYPE
+    type: string
+  - JSONPath: .status.state
+    description: Status of DNS provider
+    name: STATUS
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: AGE
+    type: date
+  conversion:
+    strategy: None
+  group: dns.gardener.cloud
+  names:
+    kind: DNSProvider
+    listKind: DNSProviderList
+    plural: dnsproviders
+    shortNames:
+    - dnspr
+    singular: dnsprovider
+  scope: Namespaced
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/examples/provider_alicloud.yaml b/examples/provider_alicloud.yaml
@@ -0,0 +1,12 @@
+apiVersion: dns.gardener.cloud/v1alpha1
+kind: DNSProvider
+metadata:
+  name: alicloud
+  namespace: default
+spec:
+  type: alicloud-dns
+  secretRef:
+    name: alicloud-credentials
+  domains:
+    include:
+    - my.own.domain.com
diff --git a/examples/provider_aws.yaml b/examples/provider_aws.yaml
@@ -4,9 +4,9 @@ metadata:
   name: aws
   namespace: default
 spec:
-  type: AWS
+  type: aws-route53
   secretRef:
     name: aws-credentials
   domains:
     include:
-    - ringtest.dev.k8s.ondemand.com
+    - my.own.domain.com
diff --git a/examples/provider_azure.yaml b/examples/provider_azure.yaml
@@ -4,9 +4,9 @@ metadata:
   name: azure
   namespace: default
 spec:
-  type: Azure
+  type: azure-dns
   secretRef:
     name: azure-credentials
   domains:
     include:
-    - ringtest.dev.k8s.ondemand.com
+    - my.own.domain.com
diff --git a/examples/provider_google.yaml b/examples/provider_google.yaml
@@ -4,9 +4,9 @@ metadata:
   name: google
   namespace: default
 spec:
-  type: CloudDNS
+  type: google-clouddns
   secretRef:
     name: google-credentials
   domains:
     include:
-    - ringtest.dev.k8s.ondemand.com
+    - my.own.domain.com
diff --git a/examples/provider_openstack.yaml b/examples/provider_openstack.yaml
@@ -4,9 +4,9 @@ metadata:
   name: openstack
   namespace: default
 spec:
-  type: Designate
+  type: openstack-designate
   secretRef:
     name: openstack-credentials
   domains:
     include:
-      - ringtest.dev.k8s.ondemand.com
+    - my.own.domain.com
diff --git a/examples/secret_alicloud_credentials.yaml b/examples/secret_alicloud_credentials.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: alicloud-credentials
+  namespace: default
+type: Opaque
+data:
+  # Replace '...' with values encoded as base64.
+  ACCESS_KEY_ID: ...
+  SECRET_ACCESS_KEY: ...
diff --git a/pkg/controller/provider/alicloud/controller.go b/pkg/controller/provider/alicloud/controller.go
@@ -20,11 +20,10 @@ import (
 	"github.com/gardener/external-dns-management/pkg/dns/provider"
 )
 
-const TYPE_CODE = "AliCloud"
-const CONTROLLER_NAME = "alicloud-dns-controller"
+const TYPE_CODE = "alicloud-dns"
 
 func init() {
-	provider.DNSController(CONTROLLER_NAME, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
+	provider.DNSController(TYPE_CODE, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
 		FinalizerDomain("dns.gardener.cloud").
 		MustRegister(provider.CONTROLLER_GROUP_DNS_CONTROLLERS)
 }
diff --git a/...controller/provider/route53/controller.go → pkg/controller/provider/aws/controller.go b/...controller/provider/route53/controller.go → pkg/controller/provider/aws/controller.go
@@ -14,17 +14,16 @@
  *
  */
 
-package route53
+package aws
 
 import (
 	"github.com/gardener/external-dns-management/pkg/dns/provider"
 )
 
-const TYPE_CODE = "AWS"
-const CONTROLLER_NAME = "route53-dns-controller"
+const TYPE_CODE = "aws-route53"
 
 func init() {
-	provider.DNSController(CONTROLLER_NAME, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
+	provider.DNSController(TYPE_CODE, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
 		FinalizerDomain("dns.gardener.cloud").
 		MustRegister(provider.CONTROLLER_GROUP_DNS_CONTROLLERS)
 }
diff --git a/pkg/controller/provider/route53/execution.go → pkg/controller/provider/aws/execution.go b/pkg/controller/provider/route53/execution.go → pkg/controller/provider/aws/execution.go
@@ -14,7 +14,7 @@
  *
  */
 
-package route53
+package aws
 
 import (
 	"github.com/aws/aws-sdk-go/aws"

diff --git a/pkg/controller/provider/route53/handler.go → pkg/controller/provider/aws/handler.go b/pkg/controller/provider/route53/handler.go → pkg/controller/provider/aws/handler.go
@@ -14,7 +14,7 @@
  *
  */
 
-package route53
+package aws
 
 import (
 	"fmt"

diff --git a/pkg/controller/provider/azure/controller.go b/pkg/controller/provider/azure/controller.go
@@ -20,11 +20,10 @@ import (
 	"github.com/gardener/external-dns-management/pkg/dns/provider"
 )
 
-const TYPE_CODE = "Azure"
-const CONTROLLER_NAME = "azure-dns-controller"
+const TYPE_CODE = "azure-dns"
 
 func init() {
-	provider.DNSController(CONTROLLER_NAME, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
+	provider.DNSController(TYPE_CODE, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
 		FinalizerDomain("dns.gardener.cloud").
 		MustRegister(provider.CONTROLLER_GROUP_DNS_CONTROLLERS)
 }
diff --git a/...ntroller/provider/googledns/controller.go → pkg/controller/provider/google/controller.go b/...ntroller/provider/googledns/controller.go → pkg/controller/provider/google/controller.go
@@ -14,17 +14,16 @@
  *
  */
 
-package googledns
+package google
 
 import (
 	"github.com/gardener/external-dns-management/pkg/dns/provider"
 )
 
-const TYPE_CODE = "CloudDNS"
-const CONTROLLER_NAME = "google-dns-controller"
+const TYPE_CODE = "google-clouddns"
 
 func init() {
-	provider.DNSController(CONTROLLER_NAME, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
+	provider.DNSController(TYPE_CODE, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
 		FinalizerDomain("dns.gardener.cloud").
 		MustRegister(provider.CONTROLLER_GROUP_DNS_CONTROLLERS)
 }
diff --git a/...ontroller/provider/googledns/execution.go → pkg/controller/provider/google/execution.go b/...ontroller/provider/googledns/execution.go → pkg/controller/provider/google/execution.go
@@ -14,7 +14,7 @@
  *
  */
 
-package googledns
+package google
 
 import (
 	"github.com/gardener/controller-manager-library/pkg/logger"

diff --git a/pkg/controller/provider/googledns/handler.go → pkg/controller/provider/google/handler.go b/pkg/controller/provider/googledns/handler.go → pkg/controller/provider/google/handler.go
@@ -14,7 +14,7 @@
  *
  */
 
-package googledns
+package google
 
 import (
 	"context"

diff --git a/pkg/controller/provider/openstack/controller.go b/pkg/controller/provider/openstack/controller.go
@@ -20,11 +20,10 @@ import (
 	"github.com/gardener/external-dns-management/pkg/dns/provider"
 )
 
-const TYPE_CODE = "Designate"
-const CONTROLLER_NAME = "openstack-dns-controller"
+const TYPE_CODE = "openstack-designate"
 
 func init() {
-	provider.DNSController(CONTROLLER_NAME, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
+	provider.DNSController(TYPE_CODE, provider.NewDNSHandlerFactory(TYPE_CODE, NewHandler)).
 		FinalizerDomain("dns.gardener.cloud").
 		MustRegister(provider.CONTROLLER_GROUP_DNS_CONTROLLERS)
 }
diff --git a/pkg/crds/crds.go b/pkg/crds/crds.go
@@ -45,7 +45,7 @@ var DNSProviderCRD = apiextensions.CreateCRDObject(api.GroupName, api.Version, a
 		JSONPath:    ".status.state",
 	})
 
-var DNSEntryCRD = apiextensions.CreateCRDObject(api.GroupName, api.Version, api.DNSEntryKind, api.DNSEntryPlural, "dnse", true,
+var DNSEntryCRD = apiextensions.CreateCRDObjectWithStatus(api.GroupName, api.Version, api.DNSEntryKind, api.DNSEntryPlural, "dnse", true,
 	v1beta1.CustomResourceColumnDefinition{
 		Name:        "DNS",
 		Description: "DNS ObjectName",
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
      *
      */
-    package route53
+    package aws
     import (
     	"fmt"
@@ Expand Down @@