Merge "Add Metallb job"

tools/deployment/common/ingress.sh

@@ -18,28 +18,31 @@ set -xe
 
 helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 
-#NOTE: Deploy cluster ingress
-helm upgrade --install ingress-nginx-cluster ingress-nginx/ingress-nginx \
-  --version ${HELM_INGRESS_NGINX_VERSION} \
-  --namespace=kube-system \
-  --set controller.admissionWebhooks.enabled="false" \
-  --set controller.kind=DaemonSet \
-  --set controller.service.type=ClusterIP \
-  --set controller.scope.enabled="false" \
-  --set controller.hostNetwork="true" \
-  --set controller.ingressClassResource.name=nginx-cluster \
-  --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-cluster" \
-  --set controller.ingressClassResource.default="true" \
-  --set controller.ingressClass=nginx-cluster \
-  --set controller.labels.app=ingress-api
+if ! [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])metallb($|[[:space:]]) ]]; then
+    #NOTE: Deploy cluster ingress
+    helm upgrade --install ingress-nginx-cluster ingress-nginx/ingress-nginx \
+    --version ${HELM_INGRESS_NGINX_VERSION} \
+    --namespace=kube-system \
+    --set controller.admissionWebhooks.enabled="false" \
+    --set controller.kind=DaemonSet \
+    --set controller.service.type=ClusterIP \
+    --set controller.scope.enabled="false" \
+    --set controller.hostNetwork="true" \
+    --set controller.ingressClassResource.name=nginx-cluster \
+    --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-cluster" \
+    --set controller.ingressClassResource.default="true" \
+    --set controller.ingressClass=nginx-cluster \
+    --set controller.labels.app=ingress-api
 
-#NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh kube-system
+    #NOTE: Wait for deploy
+    ./tools/deployment/common/wait-for-pods.sh kube-system
+fi
 
 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-nginx-openstack ingress-nginx/ingress-nginx \
   --version ${HELM_INGRESS_NGINX_VERSION} \
   --namespace=openstack \
+  --set controller.kind=DaemonSet \
   --set controller.admissionWebhooks.enabled="false" \
   --set controller.scope.enabled="true" \
   --set controller.service.enabled="false" \
@@ -54,6 +57,7 @@ helm upgrade --install ingress-nginx-openstack ingress-nginx/ingress-nginx \
 helm upgrade --install ingress-nginx-ceph ingress-nginx/ingress-nginx \
   --version ${HELM_INGRESS_NGINX_VERSION} \
   --namespace=ceph \
+  --set controller.kind=DaemonSet \
   --set controller.admissionWebhooks.enabled="false" \
   --set controller.scope.enabled="true" \
   --set controller.service.enabled="false" \

tools/deployment/component/heat/heat.sh

@@ -39,5 +39,4 @@ openstack orchestration service list
 
 FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://heat.openstack.svc.cluster.local
-  curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://heat-api.openstack.svc.cluster.local:8004
 fi

tools/deployment/component/horizon/horizon.sh

@@ -36,5 +36,4 @@ fi
 
 FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://horizon.openstack.svc.cluster.local
-  curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://horizon-int.openstack.svc.cluster.local
 fi

tools/deployment/component/keystone/keystone.sh

@@ -66,5 +66,4 @@ fi
 
 FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://keystone.openstack.svc.cluster.local
-  curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://keystone-api.openstack.svc.cluster.local:5000
 fi

zuul.d/2023.2.yaml

@@ -52,6 +52,18 @@
         container_distro_name: ubuntu
         container_distro_version: jammy
 
+- job:
+    name: openstack-helm-compute-kit-metallb-2023-2-ubuntu_jammy
+    parent: openstack-helm-compute-kit
+    nodeset: openstack-helm-1node-2nodes-ubuntu_jammy
+    vars:
+      metallb_setup: true
+      osh_params:
+        openstack_release: "2023.2"
+        container_distro_name: ubuntu
+        container_distro_version: jammy
+        feature_gates: metallb
+
 - job:
     name: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy
     parent: openstack-helm-compute-kit-ovn

zuul.d/project.yaml

@@ -44,6 +44,7 @@
         - openstack-helm-keystone-ldap-2023-2-ubuntu_jammy  # 1 node
         - openstack-helm-cinder-2023-2-ubuntu_jammy  # 3 nodes rook
         - openstack-helm-compute-kit-2023-2-ubuntu_jammy  # 3 nodes
+        - openstack-helm-compute-kit-metallb-2023-2-ubuntu_jammy  # 1 node + 2 nodes
         # TODO: uncomment when parted is compatible with Jammy kernel
         # See https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2049689
         # - openstack-helm-tls-2023-2-ubuntu_jammy  # 1 node 32GB