Merge pull request #1013 from beagles/sample_external_designate

Adding designateext example networking

Author: openshift-merge-bot[bot]

Makefile

@@ -51,6 +51,7 @@ NETWORK_STORAGE_ADDRESS_PREFIX 	?= 172.18.0
 NETWORK_TENANT_ADDRESS_PREFIX 	?= 172.19.0
 NETWORK_STORAGEMGMT_ADDRESS_PREFIX 	?= 172.20.0
 NETWORK_DESIGNATE_ADDRESS_PREFIX 	?= 172.28.0
+NETWORK_DESIGNATE_EXT_ADDRESS_PREFIX 	?= 172.50.0
 INTERNALAPI_HOST_ROUTES ?=
 STORAGE_HOST_ROUTES ?=
 TENANT_HOST_ROUTES ?=
@@ -2342,6 +2343,7 @@ nncp: export NNCP_STORAGEMGMT_HOST_ROUTES=${STORAGEMGMT_HOST_ROUTES}
 nncp: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
 nncp: export NNCP_TENANT_HOST_ROUTES=${TENANT_HOST_ROUTES}
 nncp: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
+nncp: export DESIGNATE_EXT_PREFIX=${NETWORK_DESIGNATE_EXT_ADDRESS_PREFIX}
 ifeq ($(NETWORK_BGP), true)
 nncp: export BGP=enabled
 nncp: export INTERFACE_BGP_1=${NNCP_BGP_1_INTERFACE}
@@ -2412,6 +2414,7 @@ netattach: export STORAGE_PREFIX=${NETWORK_STORAGE_ADDRESS_PREFIX}
 netattach: export STORAGEMGMT_PREFIX=${NETWORK_STORAGEMGMT_ADDRESS_PREFIX}
 netattach: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
 netattach: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
+netattach: export DESIGNATE_EXT_PREFIX=${NETWORK_DESIGNATE_EXT_ADDRESS_PREFIX}
 netattach: export VLAN_START=${NETWORK_VLAN_START}
 netattach: export VLAN_STEP=${NETWORK_VLAN_STEP}
 netattach: export CTLPLANE_IP_ADDRESS_PREFIX=${NNCP_CTLPLANE_IP_ADDRESS_PREFIX}
@@ -2466,6 +2469,7 @@ metallb_config: export STORAGE_PREFIX=${NETWORK_STORAGE_ADDRESS_PREFIX}
 metallb_config: export STORAGEMGMT_PREFIX=${NETWORK_STORAGEMGMT_ADDRESS_PREFIX}
 metallb_config: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
 metallb_config: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
+metallb_config: export DESIGNATE_EXT_PREFIX=${NETWORK_DESIGNATE_EXT_ADDRESS_PREFIX}
 ifeq ($(NETWORK_ISOLATION_IPV4), true)
 metallb_config: export IPV4_ENABLED=true
 endif

scripts/gen-metallb-config.sh

@@ -140,6 +140,27 @@ if [ -n "$IPV6_ENABLED" ]; then
   - fd00:dddd::80-fd00:dddd::90
 EOF_CAT
 fi
+cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  namespace: metallb-system
+  name: designateext
+spec:
+  autoAssign: false
+  addresses:
+EOF_CAT
+if [ -n "$IPV4_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
+  - ${DESIGNATE_EXT_PREFIX}.80-${DESIGNATE_EXT_PREFIX}.90
+EOF_CAT
+fi
+if [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
+  - fd00:eaea::80-fd00:eaea::90
+EOF_CAT
+fi
 
 cat > ${DEPLOY_DIR}/l2advertisement.yaml <<EOF_CAT
 ---
@@ -186,6 +207,17 @@ spec:
   - tenant
   interfaces:
   - ${INTERFACE}.22
+---
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: designateext
+  namespace: metallb-system
+spec:
+  ipAddressPools:
+  - designateext
+  interfaces:
+  - ${INTERFACE}.26
 EOF_CAT
 cat > ${DEPLOY_DIR}/bgppeers.yaml <<EOF_CAT
 ---
@@ -226,6 +258,7 @@ spec:
   - internalapi
   - storage
   - tenant
+  - designateext
   peers:
   - bgp-peer
   - bgp-peer-2

scripts/gen-netatt.sh

@@ -46,6 +46,7 @@ if [ -n "$IPV4_ENABLED" ]; then
     check_var_set STORAGEMGMT_PREFIX
     check_var_set TENANT_PREFIX
     check_var_set DESIGNATE_PREFIX
+    check_var_set DESIGNATE_EXT_PREFIX
 fi
 
 echo DEPLOY_DIR ${DEPLOY_DIR}
@@ -60,6 +61,7 @@ if [ -n "$IPV4_ENABLED" ]; then
     echo "STORAGEMGMT_PREFIX ${STORAGEMGMT_PREFIX}"
     echo "TENANT_PREFIX ${TENANT_PREFIX}"
     echo "DESIGNATE_PREFIX ${DESIGNATE_PREFIX}"
+    echo "DESIGNATE_PREFIX ${DESIGNATE_EXT_PREFIX}"
 fi
 if [ -n "$IPV6_ENABLED" ]; then
     echo CTLPLANE_IPV6_ADDRESS_PREFIX ${CTLPLANE_IPV6_ADDRESS_PREFIX}
@@ -320,6 +322,27 @@ spec:
       }
     }
 EOF_CAT
+cat > ${DEPLOY_DIR}/designateext.yaml <<EOF_CAT
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: designateext
+  namespace: ${NAMESPACE}
+spec:
+  config: |
+    {
+      "cniVersion": "0.3.1",
+      "name": "designatext",
+      "type": "macvlan",
+      "master": "${INTERFACE}.$((${VLAN_START}+${VLAN_STEP}*6))",
+      "ipam": {
+        "type": "whereabouts",
+        "range": "172.50.0.0/24",
+        "range_start": "172.50.0.30",
+        "range_end": "172.50.0.70"
+      }
+    }
+EOF_CAT
 
 if [ -n "$INTERFACE_BGP_1" ]; then
     cat > ${DEPLOY_DIR}/bgpnet1.yaml <<EOF_CAT

scripts/gen-nncp.sh

@@ -39,6 +39,7 @@ check_var_set STORAGE_PREFIX
 check_var_set STORAGEMGMT_PREFIX
 check_var_set TENANT_PREFIX
 check_var_set DESIGNATE_PREFIX
+check_var_set DESIGNATE_EXT_PREFIX
 if [ -n "$BGP" ]; then
     check_var_set INTERFACE_BGP_1
     check_var_set INTERFACE_BGP_2
@@ -87,6 +88,7 @@ tenant_vlan_id=$((${VLAN_START}+$((${VLAN_STEP}*2))))
 storagemgmt_vlan_id=$((${VLAN_START}+$((${VLAN_STEP}*3))))
 octavia_vlan_id=$((${VLAN_START}+$((${VLAN_STEP}*4))))
 designate_vlan_id=$((${VLAN_START}+$((${VLAN_STEP}*5))))
+designate_ext_vlan_id=$((${VLAN_START}+$((${VLAN_STEP}*6))))
 
 for WORKER in ${WORKERS}; do
   cat > ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
@@ -442,6 +444,51 @@ EOF_CAT
 EOF_CAT
     fi
 
+    #
+    # designate external VLAN interface
+    #
+    cat >> ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
+    - description: designate external vlan interface
+      name: ${INTERFACE}.${designate_ext_vlan_id}
+      state: up
+      type: vlan
+      vlan:
+        base-iface: ${INTERFACE}
+        id: ${designate_ext_vlan_id}
+        reorder-headers: true
+EOF_CAT
+    if [ -n "$IPV4_ENABLED" ]; then
+        cat >> ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
+      ipv4:
+        address:
+        - ip: ${DESIGNATE_EXT_PREFIX}.${IP_ADDRESS_SUFFIX}
+          prefix-length: 24
+        enabled: true
+        dhcp: false
+EOF_CAT
+    else
+        cat >> ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
+      ipv4:
+        enabled: false
+EOF_CAT
+    fi
+    if [ -n "$IPV6_ENABLED" ]; then
+        cat >> ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
+      ipv6:
+        address:
+        - ip: fd00:eaea::${IPV6_ADDRESS_SUFFIX}
+          prefix-length: 64
+        enabled: true
+        dhcp: false
+        autoconf: false
+EOF_CAT
+    else
+        cat >> ${DEPLOY_DIR}/${WORKER}_nncp.yaml <<EOF_CAT
+      ipv6:
+        enabled: false
+EOF_CAT
+    fi
+
     #
     # ctlplane interface (untagged)
     #