Merge pull request #292 from beagles/cleanup_unbound

openshift-merge-bot[bot] · web-flow · commit 3eda5111cec4 · 2025-02-27T17:50:28.000Z
Config cleanup and pools yaml ordering
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (
diff --git a/api/v1beta1/designate_types.go b/api/v1beta1/designate_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	"github.com/openstack-k8s-operators/lib-common/modules/storage"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -331,7 +331,6 @@ func SetupDefaults() {
 	SetupDesignateDefaults(designateDefaults)
 }
 
-
 // DesignateExtraVolMounts exposes additional parameters processed by the designate-operator
 // and defines the common VolMounts structure provided by the main storage module
 type DesignateExtraVolMounts struct {
diff --git a/api/v1beta1/designate_webhook.go b/api/v1beta1/designate_webhook.go
@@ -24,9 +24,9 @@ package v1beta1
 import (
 	"fmt"
 
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -46,7 +46,7 @@ type DesignateDefaults struct {
 	Backendbind9ContainerImageURL string
 	UnboundContainerImageURL      string
 	NetUtilsURL                   string
-	DesignateAPIRouteTimeout         int
+	DesignateAPIRouteTimeout      int
 }
 
 var designateDefaults DesignateDefaults
diff --git a/api/v1beta1/designateapi_types.go b/api/v1beta1/designateapi_types.go
@@ -17,11 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateAPITemplate defines the input parameters for the Designate API service
diff --git a/api/v1beta1/designatebackendbind9_types.go b/api/v1beta1/designatebackendbind9_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateBackendbind9SpecCore - this version has no containerImage for use with the OpenStackControlplane
@@ -165,6 +165,7 @@ func (instance *DesignateBackendbind9) GetLastAppliedTopology() *topologyv1.Topo
 func (instance *DesignateBackendbind9) SetLastAppliedTopology(topologyRef *topologyv1.TopoRef) {
 	instance.Status.LastAppliedTopology = topologyRef
 }
+
 // // RbacConditionsSet - set the conditions for the rbac object
 // func (instance DesignateBackendbind9) RbacConditionsSet(c *condition.Condition) {
 // 	instance.Status.Conditions.Set(c)
diff --git a/api/v1beta1/designatecentral_types.go b/api/v1beta1/designatecentral_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateCentralSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designatemdns_types.go b/api/v1beta1/designatemdns_types.go
@@ -17,11 +17,11 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateMdnsSpecCore -
diff --git a/api/v1beta1/designateproducer_types.go b/api/v1beta1/designateproducer_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateProducerSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designateunbound_types.go b/api/v1beta1/designateunbound_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // DesignateUnboundSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/api/v1beta1/designateworker_types.go b/api/v1beta1/designateworker_types.go
@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 // DesignateWorkerSpecCore - this version has no containerImage for use with the OpenStackControlplane
diff --git a/controllers/designateunbound_controller.go b/controllers/designateunbound_controller.go
@@ -511,10 +511,6 @@ func (r *UnboundReconciler) generateServiceConfigMaps(
 	}
 
 	templateParameters := make(map[string]interface{})
-	// TODO(beagles): these are defaulting to everything and might actually be fine because of how this
-	// is addressed but the network cidr should be derivable if there are network attachments ... I think.
-	templateParameters["ListenIP"] = "0.0.0.0"
-	templateParameters["ExternalNetCidr"] = "0.0.0.0/0"
 
 	cms := []util.Template{
 		// ScriptsConfigMap
diff --git a/pkg/designate/generate_bind9_pools_yaml.go b/pkg/designate/generate_bind9_pools_yaml.go
@@ -89,36 +89,34 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap, NsRecordsMap map[string]stri
 		return nsRecords[i].Priority < nsRecords[j].Priority
 	})
 
-	bindIPs := make([]string, 0, len(BindMap))
-	for _, ip := range BindMap {
-		bindIPs = append(bindIPs, ip)
+	bindIPs := make([]string, len(BindMap))
+	keyTmpl := "bind_address_%d"
+	for i := 0; i < len(BindMap); i++ {
+		bindIPs[i] = BindMap[fmt.Sprintf(keyTmpl, i)]
 	}
-	sort.Strings(bindIPs)
 
 	masterHosts := make([]string, 0, len(MdnsMap))
 	for _, host := range MdnsMap {
 		masterHosts = append(masterHosts, host)
 	}
 	sort.Strings(masterHosts)
 
-	nameservers := make([]Nameserver, len(bindIPs))
-	for i, bindIP := range bindIPs {
-		nameservers[i] = Nameserver{
-			Host: bindIP,
-			Port: 53,
-		}
-	}
-
 	targets := make([]Target, len(bindIPs))
-	for i, bindIP := range bindIPs {
+	nameservers := make([]Nameserver, len(bindIPs))
+	for i := 0; i < len(bindIPs); i++ {
 		masters := make([]Master, len(masterHosts))
 		for j, masterHost := range masterHosts {
 			masters[j] = Master{
 				Host: masterHost,
 				Port: 5354,
 			}
 		}
+		bindIP := bindIPs[i]
 
+		nameservers[i] = Nameserver{
+			Host: bindIP,
+			Port: 53,
+		}
 		targets[i] = Target{
 			Type:        "bind9",
 			Description: fmt.Sprintf("BIND9 Server %d (%s)", i, bindIP),
@@ -133,15 +131,6 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap, NsRecordsMap map[string]stri
 		}
 	}
 
-	sort.Slice(targets, func(i, j int) bool {
-		return targets[i].Options.Host < targets[j].Options.Host
-	})
-
-	for i := range targets {
-		targets[i].Description = fmt.Sprintf("BIND9 Server %d (%s)", i, targets[i].Options.Host)
-		targets[i].Options.RNDCKeyFile = fmt.Sprintf("%s/%s-%d", RndcConfDir, DesignateRndcKey, i)
-	}
-
 	// Catalog zone is an optional section
 	// catalogZone := &CatalogZone{
 	// 	FQDN:    "example.org.",
diff --git a/templates/designate/config/designate.conf b/templates/designate/config/designate.conf
@@ -43,7 +43,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
diff --git a/templates/designateapi/config/designate.conf b/templates/designateapi/config/designate.conf
@@ -15,9 +15,6 @@ connection={{ .DatabaseConnection }}
 [storage:sqlalchemy]
 connection={{ .DatabaseConnection }}
 
-[coordination]
-backend_url=memcached://127.0.0.1:11211
-
 [service:api]
 quotas_verify_project_id=True
 auth_strategy=keystone
@@ -45,8 +42,9 @@ poll_max_retries=6
 topics=notifications
 driver=messagingv2
 
+# XXX INCORRECT!
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
@@ -61,7 +59,5 @@ project_domain_name=Default
 user_domain_name=Default
 auth_type=password
 password={{ .AdminPassword }}
-memcache_use_advanced_pool=True
-memcached_servers=inet:[memcached-0.memcached]:11211
 region_name=regionOne
 interface=internal
diff --git a/templates/designatecentral/config/designate.conf b/templates/designatecentral/config/designate.conf
@@ -51,7 +51,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
diff --git a/templates/designatemdns/config/designate.conf b/templates/designatemdns/config/designate.conf
@@ -32,7 +32,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
diff --git a/templates/designateproducer/config/designate.conf b/templates/designateproducer/config/designate.conf
@@ -51,7 +51,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
diff --git a/templates/designateunbound/config/unbound.conf b/templates/designateunbound/config/unbound.conf
@@ -1,11 +1,7 @@
 server:
 	do-daemonize: no
-	interface: {{ .ListenIP }}
-	access-control: {{ .ExternalNetCidr }} allow
-
-# XXX(beagles) figure out how to insert acl for the user's config. We can't
-# merge it here because it will just obliterate what's already there.
-
+        interface: 0.0.0.0
+        interface: ::0
 	log-queries: no
 	hide-identity: yes
 	hide-version: yes
@@ -15,10 +11,6 @@ server:
 
 	unblock-lan-zones: yes
 	insecure-lan-zones: yes
-
-#
-# FUTURE: TLS (not currently implemented in available releases)
-#
 	rrset-cache-size: 100m
 	msg-cache-size: 50m
 

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ limitations under the License.`
`17`	`17`	`package v1beta1`
`18`	`18`
`19`	`19`	`import (`
`20`		`- corev1 "k8s.io/api/core/v1"`
`21`	`20`	`topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"`
	`21`	`+ corev1 "k8s.io/api/core/v1"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`const (`