Merge pull request #271 from rabi/isCtlPlane

Add ServiceNetwork attribute to networks in netconfig

.gitignore

@@ -13,6 +13,7 @@ Dockerfile.cross
 
 bundle
 bundle.Dockerfile
+config/manager/kustomization.yaml
 
 # Test binary, build with `go test -c`
 *.test

apis/bases/network.openstack.org_ipsets.yaml

@@ -180,6 +180,10 @@ spec:
                         - nexthop
                         type: object
                       type: array
+                    serviceNetwork:
+                      description: ServiceNetwork mapping
+                      pattern: ^[a-z0-9][a-z0-9\-_]*[a-z0-9]$
+                      type: string
                     subnet:
                       description: Subnet name
                       pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
@@ -191,6 +195,7 @@ spec:
                   - address
                   - dnsDomain
                   - network
+                  - serviceNetwork
                   - subnet
                   type: object
                 type: array

apis/bases/network.openstack.org_netconfigs.yaml

@@ -55,6 +55,10 @@ spec:
                         ...
                       pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
                       type: string
+                    serviceNetwork:
+                      description: Service network mapping
+                      pattern: ^[a-z0-9][a-z0-9\-_]*[a-z0-9]$
+                      type: string
                     subnets:
                       description: Subnets of the network
                       items:

apis/network/v1beta1/ipset_types.go

@@ -82,6 +82,9 @@ type IPSetReservation struct {
 
 	// DNSDomain of the subnet
 	DNSDomain string `json:"dnsDomain"`
+
+	// ServiceNetwork mapping
+	ServiceNetwork ServiceNetNameStr `json:"serviceNetwork"`
 }
 
 // IPSetStatus defines the observed state of IPSet

apis/network/v1beta1/netconfig_types.go

@@ -28,6 +28,13 @@ import (
 // NetNameStr is used for validation of a net name.
 type NetNameStr string
 
+// +kubebuilder:validation:Pattern="^[a-z0-9][a-z0-9\\-_]*[a-z0-9]$"
+type ServiceNetNameStr string
+
+func ToDefaultServiceNetwork(n NetNameStr) ServiceNetNameStr {
+	return ServiceNetNameStr(strings.ToLower(string(n)))
+}
+
 // Network definition
 type Network struct {
 	// +kubebuilder:validation:Required
@@ -46,6 +53,10 @@ type Network struct {
 	// +kubebuilder:validation:Required
 	// Subnets of the network
 	Subnets []Subnet `json:"subnets"`
+
+	// +kubebuilder:validation:optional
+	// Service network mapping
+	ServiceNetwork ServiceNetNameStr `json:"serviceNetwork,omitempty"`
 }
 
 // Subnet definition

apis/network/v1beta1/netconfig_webhook.go

@@ -51,9 +51,12 @@ var _ webhook.Defaulter = &NetConfig{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *NetConfig) Default() {
-	netconfiglog.Info("default", "name", r.Name)
+	for _, net := range r.Spec.Networks {
+		if net.ServiceNetwork == "" {
+			net.ServiceNetwork = ToDefaultServiceNetwork(net.Name)
+		}
+	}
 
-	// TODO(user): fill in your defaulting logic.
 }
 
 //+kubebuilder:webhook:path=/validate-network-openstack-org-v1beta1-netconfig,mutating=false,failurePolicy=fail,sideEffects=None,groups=network.openstack.org,resources=netconfigs,verbs=create;update;delete,versions=v1beta1,name=vnetconfig.kb.io,admissionReviewVersions=v1
@@ -146,7 +149,6 @@ func valiateNetworks(
 	allErrs := field.ErrorList{}
 	netNames := map[string]field.Path{}
 	netCIDR := map[string]field.Path{}
-
 	for netIdx, _net := range networks {
 		path := path.Child("networks").Index(netIdx)
 
@@ -172,7 +174,6 @@ func valiateNetworks(
 			}
 		}
 	}
-
 	return allErrs
 }
 

config/crd/bases/network.openstack.org_ipsets.yaml

@@ -180,6 +180,10 @@ spec:
                         - nexthop
                         type: object
                       type: array
+                    serviceNetwork:
+                      description: ServiceNetwork mapping
+                      pattern: ^[a-z0-9][a-z0-9\-_]*[a-z0-9]$
+                      type: string
                     subnet:
                       description: Subnet name
                       pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
@@ -191,6 +195,7 @@ spec:
                   - address
                   - dnsDomain
                   - network
+                  - serviceNetwork
                   - subnet
                   type: object
                 type: array

config/crd/bases/network.openstack.org_netconfigs.yaml

@@ -55,6 +55,10 @@ spec:
                         ...
                       pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
                       type: string
+                    serviceNetwork:
+                      description: Service network mapping
+                      pattern: ^[a-z0-9][a-z0-9\-_]*[a-z0-9]$
+                      type: string
                     subnets:
                       description: Subnets of the network
                       items:

config/manifests/bases/infra-operator.clusterserviceversion.yaml

@@ -28,6 +28,11 @@ spec:
       kind: DNSMasq
       name: dnsmasqs.network.openstack.org
       version: v1beta1
+    - description: InstanceHA is the Schema for the instancehas API
+      displayName: Instance HA
+      kind: InstanceHA
+      name: instancehas.instanceha.openstack.org
+      version: v1beta1
     - description: IPSet is the Schema for the ipsets API
       displayName: IPSet
       kind: IPSet
@@ -51,6 +56,10 @@ spec:
       displayName: Redis
       kind: Redis
       name: redises.redis.openstack.org
+      specDescriptors:
+      - description: TLS settings for Redis service and internal Redis replication
+        displayName: TLS
+        path: tls
       version: v1beta1
     - description: Reservation is the Schema for the reservations API
       displayName: Reservation

controllers/network/ipset_controller.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"sort"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
@@ -43,6 +45,8 @@ import (
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 )
 
+const CtlPlaneNetwork = "ctlplane"
+
 // IPSetReconciler reconciles a IPSet object
 type IPSetReconciler struct {
 	client.Client
@@ -274,6 +278,13 @@ func (r *IPSetReconciler) reconcileNormal(ctx context.Context, instance *network
 			return ctrl.Result{}, err
 		}
 
+		// sort instance.Status.Reservations
+		sort.Slice(instance.Status.Reservation, func(i, j int) bool {
+			return (strings.EqualFold(string(instance.Status.Reservation[i].ServiceNetwork),
+				CtlPlaneNetwork) && !strings.EqualFold(string(instance.Status.Reservation[j].ServiceNetwork),
+				CtlPlaneNetwork))
+		})
+
 		instance.Status.Conditions.MarkTrue(networkv1.ReservationReadyCondition, networkv1.ReservationReadyMessage)
 
 		Log.Info("IPSet is ready:", "instance", instance.Name, "ipSetRes", ipSetRes.Spec.Reservation)
@@ -398,6 +409,10 @@ func (r *IPSetReconciler) ensureReservation(
 			return nil, err
 		}
 
+		if netDef.ServiceNetwork == "" {
+			netDef.ServiceNetwork = networkv1.ToDefaultServiceNetwork(netDef.Name)
+		}
+
 		// set net: subnet label
 		reservationLabels = util.MergeStringMaps(reservationLabels,
 			map[string]string{
@@ -426,15 +441,16 @@ func (r *IPSetReconciler) ensureReservation(
 		// add IP to the reservation and IPSet status reservations
 		reservationSpec.Reservation[string(netDef.Name)] = *ip
 		ipsetRes := networkv1.IPSetReservation{
-			Network:   netDef.Name,
-			Subnet:    subnetDef.Name,
-			Address:   ip.Address,
-			MTU:       netDef.MTU,
-			Cidr:      subnetDef.Cidr,
-			Vlan:      subnetDef.Vlan,
-			Gateway:   subnetDef.Gateway,
-			Routes:    subnetDef.Routes,
-			DNSDomain: netDef.DNSDomain,
+			Network:        netDef.Name,
+			Subnet:         subnetDef.Name,
+			Address:        ip.Address,
+			MTU:            netDef.MTU,
+			Cidr:           subnetDef.Cidr,
+			Vlan:           subnetDef.Vlan,
+			Gateway:        subnetDef.Gateway,
+			Routes:         subnetDef.Routes,
+			DNSDomain:      netDef.DNSDomain,
+			ServiceNetwork: netDef.ServiceNetwork,
 		}
 		if ipsetNet.DefaultRoute != nil && *ipsetNet.DefaultRoute && subnetDef.Gateway != nil {
 			ipsetRes.Gateway = subnetDef.Gateway

tests/functional/base_test.go

@@ -482,6 +482,20 @@ func GetNetSpec(name string, subnets ...networkv1.Subnet) networkv1.Network {
 	return net
 }
 
+func GetNetCtlplaneSpec(name string, subnets ...networkv1.Subnet) networkv1.Network {
+	net := networkv1.Network{
+		Name:           networkv1.NetNameStr(name),
+		DNSDomain:      fmt.Sprintf("%s.example.com", strings.ToLower(name)),
+		MTU:            1400,
+		Subnets:        []networkv1.Subnet{},
+		ServiceNetwork: "ctlplane",
+	}
+
+	net.Subnets = append(net.Subnets, subnets...)
+
+	return net
+}
+
 func GetDefaultNetConfigSpec() map[string]interface{} {
 	net := GetNetSpec(net1, GetSubnet1(subnet1))
 	return GetNetConfigSpec(net)

tests/functional/ipset_controller_test.go

@@ -320,7 +320,7 @@ var _ = Describe("IPSet controller", func() {
 		BeforeEach(func() {
 			netSpecs = []networkv1.Network{}
 			netSpecs = append(netSpecs, GetNetSpec(net1, GetSubnet1(subnet1)))
-			netSpecs = append(netSpecs, GetNetSpec(net2, GetSubnet2(subnet1)))
+			netSpecs = append(netSpecs, GetNetCtlplaneSpec(net2, GetSubnet2(subnet1)))
 			netSpecs = append(netSpecs, GetNetSpec(net3, GetSubnet3(subnet1)))
 
 			ipSetNetworks = []networkv1.IPSetNetwork{}
@@ -369,11 +369,23 @@ var _ = Describe("IPSet controller", func() {
 
 			Eventually(func(g Gomega) {
 				g.Expect(k8sClient.Get(ctx, ipSetName, instance)).Should(Succeed())
+				ctlplaneNetwork := instance.Status.Reservation[0].Network
+				g.Expect(instance.Status.Reservation[0].ServiceNetwork).To(Equal(networkv1.ServiceNetNameStr("ctlplane")))
+				ctlplaneFound := false
 				for i := 0; i < len(ipSetNetworks); i++ {
 					// first assert that the instance networks are in the same order as we specified
 					g.Expect(instance.Spec.Networks[i].Name).To(Equal(ipSetNetworks[i].Name))
 					// then assert that the reservation networks are in the same order
-					g.Expect(instance.Spec.Networks[i].Name).To(Equal(instance.Status.Reservation[i].Network))
+					// other than ctlplane network being the first one.
+					if ipSetNetworks[i].Name == ctlplaneNetwork {
+						ctlplaneFound = true
+						continue
+					}
+					if ctlplaneFound {
+						g.Expect(instance.Spec.Networks[i].Name).To(Equal(instance.Status.Reservation[i].Network))
+					} else {
+						g.Expect(instance.Spec.Networks[i].Name).To(Equal(instance.Status.Reservation[i+1].Network))
+					}
 				}
 				g.Expect(k8sClient.Update(ctx, instance)).Should(Succeed())
 			}, timeout, interval).Should(Succeed())