Merge pull request #161 from rabi/bind_ip

Use bind_ip instead of bind_host

config/rbac/role.yaml

@@ -95,6 +95,13 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
 - apiGroups:
   - ""
   resources:

controllers/swiftproxy_controller.go

@@ -79,6 +79,7 @@ type SwiftProxyReconciler struct {
 //+kubebuilder:rbac:groups=k8s.cni.cncf.io,resources=network-attachment-definitions,verbs=get;list;watch
 //+kubebuilder:rbac:groups=memcached.openstack.org,resources=memcacheds,verbs=get;list;watch;
 //+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanapis,verbs=get;list;watch
+//+kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -455,7 +456,10 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	instance.Status.Conditions.MarkTrue(condition.InputReadyCondition, condition.InputReadyMessage)
-
+	bindIP, err := swift.GetBindIP(helper)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
 	// Create a Secret populated with content from templates/
 	tpl := swiftproxy.SecretTemplates(
 		instance,
@@ -464,6 +468,7 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		keystoneInternalURL,
 		password,
 		instance.Spec.MemcachedServers,
+		bindIP,
 		secretRef,
 	)
 	err = secret.EnsureSecrets(ctx, helper, instance, tpl, &envVars)

controllers/swiftstorage_controller.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	swiftv1beta1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
+	"github.com/openstack-k8s-operators/swift-operator/pkg/swift"
 	"github.com/openstack-k8s-operators/swift-operator/pkg/swiftstorage"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
@@ -76,6 +77,7 @@ type Netconfig struct {
 //+kubebuilder:rbac:groups=k8s.cni.cncf.io,resources=network-attachment-definitions,verbs=get;list;watch
 //+kubebuilder:rbac:groups=memcached.openstack.org,resources=memcacheds,verbs=get;list;watch;
 //+kubebuilder:rbac:groups=network.openstack.org,resources=dnsdata,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -167,8 +169,12 @@ func (r *SwiftStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	serviceLabels := swiftstorage.Labels()
 	envVars := make(map[string]env.Setter)
 
+	bindIP, err := swift.GetBindIP(helper)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
 	// Create a ConfigMap populated with content from templates/
-	tpl := swiftstorage.ConfigMapTemplates(instance, serviceLabels, instance.Spec.MemcachedServers)
+	tpl := swiftstorage.ConfigMapTemplates(instance, serviceLabels, instance.Spec.MemcachedServers, bindIP)
 	err = configmap.EnsureConfigMaps(ctx, helper, instance, tpl, &envVars)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -338,7 +344,8 @@ func getPodIPInNetwork(swiftPod corev1.Pod, namespace string, networkAttachment
 	networkName := fmt.Sprintf("%s/%s", namespace, networkAttachment)
 	netStat, err := networkattachment.GetNetworkStatusFromAnnotation(swiftPod.Annotations)
 	if err != nil {
-		err = fmt.Errorf("Error while getting the Network Status for pod %s: %v", swiftPod.Name, err)
+		err = fmt.Errorf("Error while getting the Network Status for pod %s: %w",
+			swiftPod.Name, err)
 		return "", err
 	}
 	for _, net := range netStat {

pkg/swift/funcs.go

@@ -16,10 +16,15 @@ limitations under the License.
 package swift
 
 import (
+	"context"
+	"math/rand"
+	"strings"
+
 	"github.com/openstack-k8s-operators/lib-common/modules/common"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
+	helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	corev1 "k8s.io/api/core/v1"
-	"math/rand"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func GetSecurityContext() corev1.SecurityContext {
@@ -69,3 +74,19 @@ func GetPodAffinity(componentName string) *corev1.Affinity {
 		corev1.LabelHostname,
 	)
 }
+
+// GetBindIP - Returns bind ip for services for ipv4 and ipv6.
+func GetBindIP(helper *helper.Helper) (string, error) {
+	nodes, err := helper.GetKClient().CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		return "0.0.0.0", err
+	}
+	for _, node := range nodes.Items {
+		for _, address := range node.Status.Addresses {
+			if address.Type == "InternalIP" && strings.Contains(address.Address, ":") {
+				return "::", nil
+			}
+		}
+	}
+	return "0.0.0.0", nil
+}

pkg/swiftproxy/templates.go

@@ -33,6 +33,7 @@ func SecretTemplates(
 	keystoneInternalURL string,
 	password string,
 	memcachedServers string,
+	bindIP string,
 	secretRef string,
 ) []util.Template {
 	templateParameters := make(map[string]interface{})
@@ -41,6 +42,7 @@ func SecretTemplates(
 	templateParameters["KeystonePublicURL"] = keystonePublicURL
 	templateParameters["KeystoneInternalURL"] = keystoneInternalURL
 	templateParameters["MemcachedServers"] = memcachedServers
+	templateParameters["BindIP"] = bindIP
 	templateParameters["SecretRef"] = secretRef
 
 	// create httpd  vhost template parameters

pkg/swiftstorage/templates.go

@@ -18,13 +18,18 @@ package swiftstorage
 
 import (
 	"fmt"
+
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	swiftv1beta1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
 )
 
-func ConfigMapTemplates(instance *swiftv1beta1.SwiftStorage, labels map[string]string, memcachedServers string) []util.Template {
+func ConfigMapTemplates(instance *swiftv1beta1.SwiftStorage,
+	labels map[string]string,
+	memcachedServers string,
+	bindIP string) []util.Template {
 	templateParameters := make(map[string]interface{})
 	templateParameters["MemcachedServers"] = memcachedServers
+	templateParameters["BindIP"] = bindIP
 
 	customData := map[string]string{}
 	for key, data := range instance.Spec.DefaultConfigOverwrite {

templates/swiftproxy/config/00-proxy-server.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-bind_host = localhost
+bind_ip = {{ .BindIP }}
 bind_port = 8081
 
 [pipeline:main]

templates/swiftstorage/config/00-account-server.conf

@@ -1,4 +1,5 @@
 [DEFAULT]
+bind_ip = {{ .BindIP }}
 bind_port = 6202
 
 [pipeline:main]

templates/swiftstorage/config/00-container-server.conf

@@ -1,4 +1,5 @@
 [DEFAULT]
+bind_ip = {{ .BindIP }}
 bind_port = 6201
 
 [pipeline:main]

templates/swiftstorage/config/00-object-server.conf

@@ -1,4 +1,5 @@
 [DEFAULT]
+bind_ip = {{ .BindIP }}
 bind_port = 6200
 
 [pipeline:main]

tests/functional/suite_test.go

@@ -61,7 +61,6 @@ var (
 	k8sClient client.Client
 	testEnv   *envtest.Environment
 	th        *TestHelper
-	ctx       context.Context
 	cancel    context.CancelFunc
 	logger    logr.Logger
 )