Merge "Fix monitoring job"

helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl

@@ -14,8 +14,7 @@ limitations under the License.
 
 {{/*
 abstract: |
-  Returns a container definition for use with the kubernetes-entrypoint image
-  from stackanetes.
+  Returns a container definition for use with the kubernetes-entrypoint image.
 values: |
   images:
     tags:

nagios/values.yaml

@@ -19,7 +19,7 @@ images:
   tags:
     apache_proxy: docker.io/library/httpd:2.4
     nagios: docker.io/openstackhelm/nagios:latest-ubuntu_jammy
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
     selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy
     image_repo_sync: docker.io/library/docker:17.07.0
   pull_policy: IfNotPresent

registry/values.yaml

@@ -30,8 +30,8 @@ images:
   tags:
     registry: docker.io/library/registry:2
     registry_proxy: registry.k8s.io/kube-registry-proxy:0.4
-    bootstrap: docker.io/library/docker:17.07.0
-    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
+    bootstrap: docker.io/library/docker:29
+    dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
   pull_policy: "IfNotPresent"
   local_registry:
     active: false
@@ -138,7 +138,7 @@ bootstrap:
   script:
     docker info
   preload_images:
-    - quay.io/kozhukalov/kubernetes-entrypoint:v1.0.0
+    - quay.io/airshipit/nginx:alpine3.18
 
 dependencies:
   static:

releasenotes/notes/nagios-36a6b2cb6e9fc720.yaml

@@ -0,0 +1,6 @@
+---
+nagios:
+  - |
+    Use the quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy image
+    by default for init containers
+...

releasenotes/notes/registry-daf63a0fbe9771cb.yaml

@@ -0,0 +1,7 @@
+---
+registry:
+  - Update docker client image to 29
+  - |
+    Use quay.io/airshipit/keystone-entrypoint:latest-ubuntu_jammy
+    image by default for init containers
+...

roles/deploy-env/defaults/main.yaml

@@ -59,6 +59,7 @@ metallb_setup: true
 metallb_version: "0.14.9"
 metallb_pool_cidr: "172.24.128.0/24"
 metallb_openstack_endpoint_cidr: "172.24.128.100/24"
+metallb_osh_infra_endpoint_cidr: "172.24.128.101/24"
 
 client_cluster_ssh_setup: true
 client_ssh_user: zuul

roles/deploy-env/tasks/ingress.yaml

@@ -48,7 +48,8 @@
       --set controller.ingressClassResource.name=nginx \
       --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-openstack" \
       --set controller.ingressClass=nginx \
-      --set controller.labels.app=ingress-api
+      --set controller.labels.app=ingress-api \
+      --set controller.allowSnippetAnnotations=true
 
 - name: Deploy ingress in ceph namespace
   become_user: "{{ kubectl.user }}"
@@ -64,7 +65,8 @@
       --set controller.ingressClassResource.name=nginx-ceph \
       --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-ceph" \
       --set controller.ingressClass=nginx-ceph \
-      --set controller.labels.app=ingress-api
+      --set controller.labels.app=ingress-api \
+      --set controller.allowSnippetAnnotations=true
 
 - name: Deploy ingress in osh_infra namespace
   become_user: "{{ kubectl.user }}"
@@ -79,5 +81,6 @@
       --set controller.ingressClassResource.name=nginx-osh-infra \
       --set controller.ingressClassResource.controllerValue="k8s.io/ingress-nginx-osh-infra" \
       --set controller.ingressClass=nginx-osh-infra \
-      --set controller.labels.app=ingress-api
+      --set controller.labels.app=ingress-api \
+      --set controller.allowSnippetAnnotations=true
 ...

roles/deploy-env/tasks/ingress_metallb_endpoint.yaml

@@ -44,6 +44,40 @@
     EOF
     kubectl apply -f /tmp/openstack_endpoint_service.yaml
 
+- name: Create openstack ingress service
+  when: ingress_osh_infra_setup
+  become: false
+  shell: |
+    tee > /tmp/osh_infra_endpoint_service.yaml <<EOF
+    ---
+    apiVersion: v1
+    kind: Namespace
+    metadata:
+      labels:
+        kubernetes.io/metadata.name: osh-infra
+        name: osh-infra
+      name: osh-infra
+    ---
+    kind: Service
+    apiVersion: v1
+    metadata:
+      name: public-osh-infra
+      namespace: osh-infra
+      annotations:
+        metallb.universe.tf/loadBalancerIPs: "{{ metallb_osh_infra_endpoint_cidr | ipaddr('address') }}"
+    spec:
+      externalTrafficPolicy: Cluster
+      type: LoadBalancer
+      selector:
+        app: ingress-api
+      ports:
+        - name: http
+          port: 80
+        - name: https
+          port: 443
+    EOF
+    kubectl apply -f /tmp/osh_infra_endpoint_service.yaml
+
 - name: Set dnsmasq listen ip
   set_fact:
     nameserver_ip: "{{ (groups['primary'] | map('extract', hostvars, ['ansible_default_ipv4', 'address']))[0] }}"
@@ -61,6 +95,7 @@
       --no-hosts
       --bind-interfaces
       --address="/openstack.svc.cluster.local/{{ metallb_openstack_endpoint_cidr | ipaddr('address') }}"
+      --address="/osh-infra.svc.cluster.local/{{ metallb_osh_infra_endpoint_cidr | ipaddr('address') }}"
       --listen-address="{{ nameserver_ip }}"
       --no-resolv
       --server=8.8.8.8

roles/deploy-env/tasks/main.yaml

@@ -91,9 +91,9 @@
     file: metallb.yaml
   when: metallb_setup
 
-- name: Include Openstack Metallb endpoint tasks
+- name: Include Ingress Metallb endpoint tasks
   include_tasks:
-    file: openstack_metallb_endpoint.yaml
+    file: ingress_metallb_endpoint.yaml
   when:
     - metallb_setup
     - inventory_hostname in (groups['primary'] | default([]))

tools/deployment/monitoring/grafana.sh

@@ -22,6 +22,7 @@ FEATURES="calico ceph containers coredns elasticsearch kubernetes nginx nodes op
 #NOTE: Deploy command
 helm upgrade --install grafana ${OSH_HELM_REPO}/grafana \
   --namespace=osh-infra \
+  --set network.grafana.ingress.classes.namespace="nginx-osh-infra" \
   ${OSH_EXTRA_HELM_ARGS:=} \
   ${OSH_EXTRA_HELM_ARGS_GRAFANA}
 

tools/deployment/monitoring/nagios.sh

@@ -21,6 +21,7 @@ set -xe
 #NOTE: Deploy command
 helm upgrade --install nagios ${OSH_HELM_REPO}/nagios \
   --namespace=osh-infra \
+  --set network.nagios.ingress.classes.namespace=nginx-osh-infra \
   ${OSH_EXTRA_HELM_ARGS:=} \
   ${OSH_EXTRA_HELM_ARGS_NAGIOS}
 

tools/deployment/monitoring/prometheus.sh

@@ -23,6 +23,7 @@ FEATURES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql
 #NOTE: Deploy command
 helm upgrade --install prometheus ${OSH_HELM_REPO}/prometheus \
     --namespace=osh-infra \
+    --set network.prometheus.ingress.classes.namespace=nginx-osh-infra \
     ${VOLUME_HELM_ARGS:="--set storage.enabled=false --set storage.use_local_path.enabled=true"} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_PROMETHEUS}

zuul.d/infra_jobs.yaml

@@ -37,7 +37,9 @@
     name: openstack-helm-monitoring
     parent: openstack-helm-deploy
     nodeset: openstack-helm-1node-ubuntu_jammy
+    timeout: 10800
     vars:
+      ingress_osh_infra_setup: true
       osh_params:
         openstack_release: "2025.1"
         container_distro_name: ubuntu

zuul.d/project.yaml

@@ -48,10 +48,10 @@
         - openstack-helm-skyline-2025-2-ubuntu_noble  # 3 nodes
         # Infra jobs
         # NOTE(kozhukalov): Temporarily disabled to unblock CI.
-        # These jobs are currently broken due to outdated kubernetes-entrypoint images
-        # used in nagios and elasticsearch deployments.
+        # These job is currently broken due to outdated kubernetes-entrypoint images
+        # used in elasticsearch deployment.
         # - openstack-helm-logging
-        # - openstack-helm-monitoring
+        - openstack-helm-monitoring
         - openstack-helm-metacontroller
     gate:
       jobs: