add kustomization and manifest generation for loadbalancer resources

Signed-off-by: Yassine TIJANI <[email protected]>

Author: yastij

examples/cluster/cluster.yaml renamed to examples/cluster/base/cluster.yaml

@@ -3,4 +3,4 @@ namespace:
   group: cluster.x-k8s.io
   version: v1alpha2
   path: spec/infrastructureRef/namespace
-  create: true
+  create: true

examples/cluster/kustomization.yaml renamed to examples/cluster/base/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: VSphereCluster
+metadata:
+  name: ${CLUSTER_NAME}
+spec:
+  loadBalancerRef:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+    Kind: ${PROVIDER_KIND}
+    Name: ${CLUSTER_NAME}
+    namespace: default
+    

examples/cluster/kustomizeconfig.yaml renamed to examples/cluster/base/kustomizeconfig.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+- ../base
+patchesStrategicMerge:
+- cluster_loadbalancer_patch.yaml

examples/cluster/loadbalancer/cluster_loadbalancer_patch.yaml

@@ -34,6 +34,11 @@ CABPK_MANAGER_IMAGE="${CABPK_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/capi-ku
 CAPI_MANAGER_IMAGE="${CAPI_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.2.1}"
 CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cluster-api-provider-vsphere/release/manager:latest}"
 
+LOADBALANCER=
+AWS_VPC="${AWS_VPC:-}"
+AWS_REGION="${AWS_REGION:-}"
+AWS_SUBNET="${AWS_SUBNET:-}"
+
 # Set the default log levels for the manager containers.
 CABPK_MANAGER_LOG_LEVEL="${CABPK_MANAGER_LOG_LEVEL:-4}"
 CAPI_MANAGER_LOG_LEVEL="${CAPI_MANAGER_LOG_LEVEL:-4}"
@@ -52,6 +57,7 @@ FLAGS
   -f    force overwrite of existing files
   -h    prints this help screen
   -i    input directory (default ${SRC_DIR})
+  -l    enables load balancer 
   -m    capv manager image (default "${CAPV_MANAGER_IMAGE}")
   -M    capv manager log level (default "${CAPV_MANAGER_LOG_LEVEL}")
   -o    output directory (default ${OUT_DIR})
@@ -60,7 +66,7 @@ FLAGS
 EOF
 }
 
-while getopts ':b:B:c:dfhi:m:M:o:p:P:' opt; do
+while getopts ':b:B:c:dfhi:lm:M:o:p:P:' opt; do
   case "${opt}" in
   b)
     CABPK_MANAGER_IMAGE="${OPTARG}"
@@ -83,6 +89,9 @@ while getopts ':b:B:c:dfhi:m:M:o:p:P:' opt; do
   i)
     SRC_DIR="${OPTARG}"
     ;;
+  l)
+   LOADBALANCER=1
+   ;;
   m)
     CAPV_MANAGER_IMAGE="${OPTARG}"
     ;;
@@ -130,6 +139,7 @@ PROVIDER_COMPONENTS_GENERATED_FILE=${OUT_DIR}/provider-components.yaml
 CLUSTER_GENERATED_FILE=${OUT_DIR}/cluster.yaml
 CONTROLPLANE_GENERATED_FILE=${OUT_DIR}/controlplane.yaml
 MACHINEDEPLOYMENT_GENERATED_FILE=${OUT_DIR}/machinedeployment.yaml
+LB_GENERATED_FILE=${OUT_DIR}/loadbalancer.yaml
 
 ok_file() {
   [ -f "${1}" ] || { echo "${1} is missing" 1>&2; exit 1; }
@@ -185,7 +195,9 @@ record_and_export VSPHERE_NETWORK       "${ENV_VAR_REQ}"
 record_and_export VSPHERE_RESOURCE_POOL ':-'
 record_and_export VSPHERE_FOLDER        ':-'
 record_and_export VSPHERE_TEMPLATE      ':-'
-record_and_export SSH_AUTHORIZED_KEY    ':-'
+record_and_export AWS_VPC               ':-'
+record_and_export AWS_SUBNET            ':-'
+record_and_export AWS_REGION            ':-'
 
 verify_cpu_mem_dsk() {
   eval "[[ \${${1}-} =~ [[:digit:]]+ ]] || ${1}=\"${2}\"; \
@@ -241,10 +253,15 @@ envsubst() {
 # Generate the addons file.
 envsubst >"${ADDONS_GENERATED_FILE}" <"${SRC_DIR}/addons.yaml"
 echo "Generated ${ADDONS_GENERATED_FILE}"
-
 # Generate cluster resources.
-kustomize build "${SRC_DIR}/cluster" | envsubst >"${CLUSTER_GENERATED_FILE}"
-echo "Generated ${CLUSTER_GENERATED_FILE}"
+if [ ! -z "$LOADBALANCER" ]
+then
+  kustomize build "${SRC_DIR}/cluster/loadbalancer" | envsubst >"${CLUSTER_GENERATED_FILE}"
+  echo "Generated ${CLUSTER_GENERATED_FILE}"
+else
+  kustomize build "${SRC_DIR}/cluster/base" | envsubst >"${CLUSTER_GENERATED_FILE}"
+  echo "Generated ${CLUSTER_GENERATED_FILE}"
+fi
 
 # Generate controlplane resources.
 kustomize build "${SRC_DIR}/controlplane" | envsubst >"${CONTROLPLANE_GENERATED_FILE}"
@@ -270,7 +287,11 @@ echo "Generated ${COMPONENTS_VSPHERE_GENERATED_FILE}"
 kustomize build "${SRC_DIR}/provider-components" | envsubst >"${PROVIDER_COMPONENTS_GENERATED_FILE}"
 echo "Generated ${PROVIDER_COMPONENTS_GENERATED_FILE}"
 echo "WARNING: ${PROVIDER_COMPONENTS_GENERATED_FILE} includes vSphere credentials"
-
+if [ ! -z "$LOADBALANCER" ]
+then
+  envsubst >>"${PROVIDER_COMPONENTS_GENERATED_FILE}" <"${SRC_DIR}/loadbalancer.yaml"
+  echo "Generated loadbalancer resource in ${PROVIDER_COMPONENTS_GENERATED_FILE}"
+fi
 # If running in Docker then ensure the contents of the OUT_DIR have the
 # the same owner as the volume mounted to the /out directory.
 [ "${DOCKER_ENABLED-}" ] && chown -R "$(stat -c '%u:%g' /out)" "${OUT_DIR}"

examples/cluster/loadbalancer/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
+kind: AWSLoadBalancer
+metadata:
+  name: ${CLUSTER_NAME}
+  namespace: default
+spec:
+  vpcId: ${AWS_VPC}
+  subnetIds:
+  - ${AWS_SUBNET}
+  region: ${AWS_REGION}

examples/generate.sh

@@ -38,6 +38,7 @@ spec:
       - effect: NoExecute
         key: node.alpha.kubernetes.io/unreachable
         operator: Exists
+
 ---
 apiVersion: apps/v1
 kind: Deployment