Update Helm Charts

Signed-off-by: Cédric Ollivier <[email protected]>

defaults/main.yml

@@ -77,50 +77,65 @@ jenkins_agent_docker_tag: 4.9-bullseye
 jenkins_agent_auto_docker_image: opnfv/xtesting-jenkins-agent-auto
 jenkins_agent_auto_docker_tag: 4.9-bullseye
 gitlab_docker_image: gitlab/gitlab-ce
-gitlab_docker_tag: 13.12.3-ce.0
+gitlab_version: 15.7.5
+gitlab_docker_tag: '{{ gitlab_version }}-ce.0'
 nexus_docker_image: sonatype/nexus3
 nexus_docker_tag: 3.30.0
 influxdb_docker_image: influxdb
-influxdb_docker_tag: 2.0.6-alpine
+influxdb_docker_tag: 2.3.0-alpine
+influxdb_k8s_image: '{{ influxdb_docker_image }}'
+influxdb_k8s_tag: '{{ influxdb_docker_tag }}'
 minio_docker_image: minio/minio
 minio_docker_tag: RELEASE.2021-09-03T03-56-13Z
 minio_s3www_docker_image: opnfv/xtesting-s3www
 minio_s3www_docker_tag: v0.5.3
 radosgw_docker_image: ceph/daemon
 radosgw_docker_tag: latest
 mongo_docker_image: mongo
-mongo_docker_tag: 4.4
+mongo_docker_tag: 6.0
 mongo_k8s_image: bitnami/mongodb
-mongo_k8s_tag: 4.4.10-debian-10-r44
+mongo_k8s_tag: 6.0.3-debian-11-r20
 postgres_docker_image: postgres
-postgres_docker_tag: 13-alpine
+postgres_docker_tag: 15.1-alpine
 postgres_k8s_image: bitnami/postgresql
-postgres_k8s_tag: 13.5.0
+postgres_k8s_tag: 15.1.0-debian-11-r20
 cachet_docker_image: cachethq/docker
 cachet_docker_tag: latest
 cachet_url_monitor_docker_image: mtakaki/cachet-url-monitor
 cachet_url_monitor_docker_tag: release-0.6.10
-elasticsearch_docker_image: docker.elastic.co/elasticsearch/elasticsearch-oss
-elasticsearch_docker_tag: 7.10.2
+elasticsearch_docker_image: elasticsearch
+elasticsearch_docker_tag: 8.5.1
 elasticsearch_k8s_image: "{{ elasticsearch_docker_image }}"
 elasticsearch_k8s_tag: "{{ elasticsearch_docker_tag }}"
-kibana_docker_image: docker.elastic.co/kibana/kibana-oss
-kibana_docker_tag: 7.9.3
+kibana_docker_image: kibana
+kibana_docker_tag: 8.5.1
 kibana_k8s_image: "{{ kibana_docker_image }}"
 kibana_k8s_tag: "{{ kibana_docker_tag }}"
 fluentd_docker_image: fluent/fluentd
 fluentd_docker_tag: v1.11-1
 gitea_docker_image: gitea/gitea
 gitea_docker_tag: 1.13.2
 grafana_docker_image: grafana/grafana
-grafana_docker_tag: 8.5.2
+grafana_docker_tag: 9.3.1
+grafana_k8s_image: "{{ grafana_docker_image }}"
+grafana_k8s_tag: "{{ grafana_docker_tag }}"
 registry_docker_image: registry
 registry_docker_tag: 2
 testapi_docker_image: opnfv/testapi
 testapi_docker_tag: kali
 vault_docker_image: vault
 vault_docker_tag: 1.10.3
 
+# helm
+jenkins_chart_version: 4.2.20
+gitlab_chart_version: 6.7.4
+mongo_chart_version: 13.6.2
+postgres_chart_version: 12.1.9
+elasticsearch_chart_version: 8.5.1
+grafana_chart_version: 6.50.0
+kibana_chart_version: 8.5.1
+influxdb_chart_version: 2.1.1
+
 # jenkins
 jenkins_deploy: true
 jenkins_port: 8080

tasks/elasticsearch.yml

@@ -39,7 +39,7 @@
   kubernetes.core.helm:
     name: elasticsearch
     chart_ref: elastic/elasticsearch
-    chart_version: 7.10.2
+    chart_version: '{{ elasticsearch_chart_version }}'
     release_namespace: default
     values:
       image: '{{ elasticsearch_k8s_image }}'
@@ -56,5 +56,11 @@
   when:
     - elasticsearch_deploy
     - use_kubernetes
+- name: Setting elasticsearch_url
+  ansible.builtin.set_fact:
+    elasticsearch_url: 'https://elasticsearch-master:{{ elasticsearch_port }}'
+  when:
+    - elasticsearch_deploy
+    - use_kubernetes
 - name: Flushing handlers
   ansible.builtin.meta: flush_handlers

tasks/gitlab.yml

@@ -79,11 +79,11 @@
   kubernetes.core.helm:
     name: gitlab
     chart_ref: gitlab/gitlab
-    chart_version: 5.5.2
+    chart_version: '{{ gitlab_chart_version }}'
     release_namespace: default
     values:
       global:
-        gitlabVersion: 14.5.2
+        gitlabVersion: '{{ gitlab_version }}'
         edition: ce
         hosts:
           domain: '{{ ipaddress }}.nip.io'
@@ -111,7 +111,7 @@
             kubernetes.io/os: linux
             ingress-ready: "true"
           tolerations:
-            - key: node-role.kubernetes.io/master
+            - key: node-role.kubernetes.io/control-plane
               operator: Exists
               effect: NoSchedule
       gitlab-runner:

tasks/grafana.yml

@@ -37,9 +37,12 @@
   kubernetes.core.helm:
     name: grafana
     chart_ref: grafana/grafana
-    chart_version: 6.20.1
+    chart_version: '{{ grafana_chart_version }}'
     release_namespace: default
     values:
+      image:
+        repository: '{{ grafana_k8s_image }}'
+        tag: '{{ grafana_k8s_tag }}'
       service:
         type: NodePort
         nodePort: '{{ grafana_port }}'

tasks/influxdb.yml

@@ -31,12 +31,12 @@
   kubernetes.core.helm:
     name: influxdata
     chart_ref: influxdata/influxdb2
-    chart_version: 2.0.4
+    chart_version: '{{ influxdb_chart_version }}'
     release_namespace: default
     values:
       image:
-        repository: '{{ influxdb_docker_image }}'
-        tag: '{{ influxdb_docker_tag }}'
+        repository: '{{ influxdb_k8s_image }}'
+        tag: '{{ influxdb_k8s_tag }}'
       adminUser:
         user: '{{ influxdb_username }}'
         password: '{{ influxdb_password }}'

tasks/jenkins.yml

@@ -77,7 +77,7 @@
   kubernetes.core.helm:
     name: jenkins
     chart_ref: jenkins/jenkins
-    chart_version: 3.10.2
+    chart_version: '{{ jenkins_chart_version }}'
     release_namespace: default
     values:
       controller:

tasks/kibana.yml

@@ -28,6 +28,7 @@
   kubernetes.core.helm:
     name: kibana
     chart_ref: elastic/kibana
+    chart_version: '{{ kibana_chart_version }}'
     release_namespace: default
     values:
       image: '{{ kibana_k8s_image }}'

tasks/main.yml

@@ -43,7 +43,7 @@
   ansible.builtin.include_tasks: fluentd.yml
 - name: Include gitea.yml in play
   ansible.builtin.include_tasks: gitea.yml
-- name: Include kubernevaulttes.yml in play
+- name: Include vault.yml in play
   ansible.builtin.include_tasks: vault.yml
 - name: Include nexus.yml in play
   ansible.builtin.include_tasks: nexus.yml

tasks/mongodb.yml

@@ -28,17 +28,20 @@
   kubernetes.core.helm:
     name: mongo
     chart_ref: bitnami/mongodb
-    chart_version: 13.6.2
+    chart_version: '{{ mongo_chart_version }}'
     release_namespace: default
     values:
+      architecture: standalone
       image:
         repository: '{{ mongo_k8s_image }}'
         tag: '{{ mongo_k8s_tag }}'
       auth:
         enabled: false
       service:
         type: NodePort
-        nodePort: '{{ mongo_port }}'
+        externalTrafficPolicy: Cluster
+        nodePorts:
+          mongodb: '{{ mongo_port }}'
     wait: true
   notify:
     - Waiting MongoDB

tasks/postgresql.yml

@@ -32,18 +32,22 @@
   kubernetes.core.helm:
     name: postgres
     chart_ref: bitnami/postgresql
-    chart_version: 10.13.14
+    chart_version: '{{ postgres_chart_version }}'
     release_namespace: default
     values:
+      architecture: standalone
       image:
         repository: '{{ postgres_k8s_image }}'
         tag: '{{ postgres_k8s_tag }}'
-      postgresqlUsername: '{{ postgres_username }}'
-      postgresqlPassword: '{{ postgres_password }}'
-      postgresqlDatabase: '{{ postgres_database }}'
-      service:
-        type: NodePort
-        nodePort: '{{ postgres_port }}'
+      auth:
+        postgresPassword: '{{ postgres_password }}'
+        postgresDatabase: '{{ postgres_database }}'
+      primary:
+        service:
+          externalTrafficPolicy: Cluster
+          type: NodePort
+          nodePorts:
+            postgresql: '{{ postgres_port }}'
     wait: true
   when:
     - postgres_deploy