Chg: update image tag in helm values to v4.2.0

Slight adjustment for os-shell image for older kafka helm chart

.gitignore

@@ -2,6 +2,6 @@
 chart/charts/*
 chart/Chart.lock
 chart/environment-values/wlan-cloud-ucentral-deploy/
-/docker-compose/certs/
-/docker-compose/*_data
-/docker-compose/owls/*_data
+docker-compose/certs/websocket*pem
+docker-compose/*_data
+docker-compose/owls/*_data

cgw/helmfile.yaml

@@ -63,6 +63,20 @@ releases:
     group: base
     app: kafka
   values:
+    - image:
+        repository: bitnamilegacy/kafka
+    - defaultInitContainers:
+        volumePermissions:
+          image:
+            repository: bitnamilegacy/os-shell
+    - autoDiscovery:
+        volumePermissions:
+          image:
+            repository: bitnamilegacy/kubectl
+    - metrics:
+        jmx:
+          image:
+            repository: bitnamilegacy/jmx-exporter
     - fullnameOverride: kafka
     - volumePermissions:
         enabled: true
@@ -131,6 +145,14 @@ releases:
     group: base
     app: postgres
   values:
+    - image:
+        repository: bitnamilegacy/postgresql
+    - volumePermissions:
+        image:
+          repository: bitnamilegacy/os-shell
+    - metrics:
+        image:
+          repository: bitnamilegacy/postgres-exporter
     - fullnameOverride: pgsql
     # workaround for: postgresql.conf file not detected. Generating it...
     # cp: cannot create regular file '/bitnami/postgresql/conf/postgresql.conf': Permission denied
@@ -173,6 +195,23 @@ releases:
     group: base
     app: redis
   values:
+    - image:
+        repository: bitnamilegacy/redis
+    - sentinel:
+        image:
+          repository: bitnamilegacy/redis-sentinel
+    - metrics:
+        image:
+          repository: bitnamilegacy/redis-exporter
+    - volumePermissions:
+        image:
+          repository: bitnamilegacy/os-shell
+    - kubectl:
+        image:
+          repository: bitnamilegacy/kubectl
+    - sysctl:
+        image:
+          repository: bitnamilegacy/os-shell
     - architecture: standalone
     - auth:
         enabled: false

chart/Chart.yaml

@@ -2,10 +2,10 @@ apiVersion: v2
 name: openwifi
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-version: 4.1.0
+version: 4.2.0
 dependencies:
 - name: owgw
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v4.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v4.2.0"
   version: 0.1.0
 - name: owsec
   repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v4.1.0"
@@ -20,7 +20,7 @@ dependencies:
   repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v3.2.0"
   version: 0.1.0
 - name: owgwui
-  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v4.1.0"
+  repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v4.2.0"
   version: 0.1.0
 - name: owprovui
   repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v4.0.0"

chart/README.md

@@ -144,7 +144,7 @@ The following table lists the configurable parameters that overrides microservic
 | `kafka.enabled` | boolean | Enables [kafka](https://github.com/bitnami/charts/blob/master/bitnami/kafka/) deployment | `true` |
 | `kafka.fullnameOverride` | string | Overrides Kafka Kubernetes service name so it could be predictable and set in microservices configs | `'kafka'` |
 | `kafka.image.registry` | string | Kafka Docker image registry | `'docker.io'` |
-| `kafka.image.repository` | string | Kafka Docker image repository | `'bitnami/kafka'` |
+| `kafka.image.repository` | string | Kafka Docker image repository | `'bitnamilegacy/kafka'` |
 | `kafka.image.tag` | string | Kafka Docker image tag | `'2.8.0-debian-10-r43'` |
 | `kafka.minBrokerId` | number | Sets Kafka minimal broker ID (useful for multi-node Kafka installations) | `100` |
 | `clustersysteminfo.enabled` | boolean | Enables post-install check that makes sure that all services are working correctly using systeminfo RESTAPI method | `false` |

chart/values.yaml

@@ -52,6 +52,19 @@ owsub:
 kafka:
   enabled: true
   fullnameOverride: kafka
+  image:
+    repository: bitnamilegacy/kafka
+  volumePermissions:
+    image:
+      repository: bitnamilegacy/os-shell
+  autoDiscovery:
+    volumePermissions:
+      image:
+        repository: bitnamilegacy/kubectl
+  metrics:
+    jmx:
+      image:
+        repository: bitnamilegacy/jmx-exporter
 
 # clustersysteminfo check
 clustersysteminfo:
@@ -60,7 +73,7 @@ clustersysteminfo:
   images:
     clustersysteminfo:
       repository: tip-tip-wlan-cloud-ucentral.jfrog.io/clustersysteminfo
-      tag: v4.1.0
+      tag: v4.2.0
       pullPolicy: Always
 #      regcred:
 #        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -108,6 +121,8 @@ owlsui:
 
 # HAproxy (https://github.com/bitnami/charts/tree/master/bitnami/haproxy)
 haproxy:
+  image:
+    repository: bitnamilegacy/haproxy
   enabled: true
   fullnameOverride: proxy
   replicaCount: 1
@@ -402,6 +417,14 @@ restapiCerts:
   clusterDomain: cluster.local
 
 postgresql:
+  image:
+    repository: bitnamilegacy/postgresql
+  volumePermissions:
+    image:
+      repository: bitnamilegacy/os-shell
+  metrics:
+    image:
+      repository: bitnamilegacy/postgres-exporter
   enabled: false
   nameOverride: pgsql
   fullnameOverride: pgsql
@@ -416,6 +439,18 @@ postgresql:
       - owsub
 
 postgresql-ha:
+  postgresql:
+    image:
+      repository: bitnamilegacy/postgresql-repl
+  pgpool:
+    image:
+      repository: bitnamilegacy/pgpool
+  volumePermissions:
+    image:
+      repository: bitnamilegacy/os-shell
+  metrics:
+    image:
+      repository: bitnamilegacy/postgres-exporter
   enabled: false
   nameOverride: pgsql
   fullnameOverride: pgsql

docker-compose/.env

@@ -1,10 +1,12 @@
 COMPOSE_PROJECT_NAME=openwifi
 # set either default, selfsigned or letsencrypt
+# if not default then please look at .env.letsencrypt or .env.selfsigned
+# instead for configuration!
 DEPLOY_TYPE=default
 
 # Image tags
-OWGW_TAG=v4.1.0
-OWGWUI_TAG=v4.1.0
+OWGW_TAG=v4.2.0
+OWGWUI_TAG=v4.2.0
 OWSEC_TAG=v4.1.0
 OWFMS_TAG=v3.2.0
 OWPROV_TAG=v4.1.0

docker-compose/.env.letsencrypt

@@ -1,8 +1,8 @@
 COMPOSE_PROJECT_NAME=openwifi
 
 # Image tags
-OWGW_TAG=v4.1.0
-OWGWUI_TAG=v4.1.0
+OWGW_TAG=v4.2.0
+OWGWUI_TAG=v4.2.0
 OWSEC_TAG=v4.1.0
 OWFMS_TAG=v3.2.0
 OWPROV_TAG=v4.1.0

docker-compose/.env.selfsigned

@@ -1,8 +1,8 @@
 COMPOSE_PROJECT_NAME=openwifi
 
 # Image tags
-OWGW_TAG=v4.1.0
-OWGWUI_TAG=v4.1.0
+OWGW_TAG=v4.2.0
+OWGWUI_TAG=v4.2.0
 OWSEC_TAG=v4.1.0
 OWFMS_TAG=v3.2.0
 OWPROV_TAG=v4.1.0

docker-compose/certs/issuer_insta.pem

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGBzCCA++gAwIBAgICCQYwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPT3Bl
+bkxBTiBSb290IENBMB4XDTI1MDUxNDA4NTY0MVoXDTQ1MDUxNDA5MjY0MVowJDEi
+MCAGA1UEAwwZT3BlbkxBTiBTZXJ2ZXIgSXNzdWluZyBDQTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBALSdJpzwPfQM9oHBGt6w8UDLDJNznxI7cpfl0u0x
+VCHN1YY7onpwxFVkFRzUx/JrQ/tbEGZH19XtngaCZ91KbGbqVao9S32H0tyn2t3e
+TJ5h+klJ7+7YAbZr8UfOi3nG4bZzNSa5dDBPaNPvI51byKDN7siXXnALV3f0l6lZ
+gDpLQco/E7ANU3lslUVjVNALfFUEonDyP7XV+lFAyidpjIn6dRn7oYs3SUwkzZUn
+tYJAhAykmxXMWox+85gDkdb+2O3G8ci0uHVbb0A9LP+MeIhzxHgnnAMfWLfEZexd
+mEd2PwVHaz/D2Xp/gYrpPDTsbqWjQ9NmgdASwqN5j8BuJ8vHDVBVCztVDltm6JPw
+3Y6GQPN1LmiSLUzst7VYpydUJRDHYIAKJhT9DYxQ126VfiyMo6Xl4IQO8YZ/J6r8
+yR7gyvyUiBW+wvvC1bCY5+VuI4P/cY+6iA1qwC1SOWjYlccy+tbfGj9zr32Qf27e
+9RXSAkcATHen1rc/9AGEeAuSpKrzhmZIIvM4+EtYgbBvf91NkP51zbGpvsAbfWN/
+ecNmqH9SeyrrVgv68Z34hMijCcvJNyIvloo3nkb/gHYV4tAiwTTrX13Rio/8qNF4
+nwHLsjw0t7jEyRiXdOciePyhGbtdicuiUxrShzbGY7ID0yNwyTKcJYhorL/8r+YF
+psXrAgMBAAGjggFLMIIBRzAfBgNVHSMEGDAWgBSUaFuoOPk4QLByZP47kj4p1IbC
+JjAdBgNVHQ4EFgQUBwUkiaCh5hdY+ZH6O8NmEE/nH5EwDgYDVR0PAQH/BAQDAgGG
+MBIGA1UdEwEB/wQIMAYBAf8CAQAwRwYDVR0fBEAwPjA8oDqgOIY2aHR0cDovL2Ny
+bC5jZXJ0aWZpY2F0ZXMub3Blbi1sYW4ub3JnL29wZW5sYW5yb290Y2EuY3JsMIGX
+BggrBgEFBQcBAQSBijCBhzBEBggrBgEFBQcwAoY4aHR0cDovL2NlcnRzLmNlcnRp
+ZmljYXRlcy5vcGVuLWxhbi5vcmcvb3BlbmxhbnJvb3RjYS5jZXIwPwYIKwYBBQUH
+MAGGM2h0dHA6Ly9vY3NwLmNlcnRpZmljYXRlcy5vcGVuLWxhbi5vcmcvb3Blbmxh
+bnJvb3RjYTANBgkqhkiG9w0BAQsFAAOCAgEAqEk5ZJdpMVr2U0YhmqEU6gqxEeih
+9MWKcQfmsT/lhf5m5V7VuLMc3r+EBCsPssw60umdQcAU2IPlJXLAeWwdRyY7ZNNw
+QVgl9GBI/CM2b7x18+12/llCdXW9FOagdChTuuhwRnGTt71jcrJkleQyEYhqwwIE
+N82hxq4HSZO6XJDev4IsMRF00+qt8biJcf7OVGOSLoyiU6Dm/EzxoB+DZf3HdUc0
+vzfVjD4Im+yYzqXuwWV6c9oIBQH6obzaqlpg926CtEBFR8E1LQe93ahMvF7pExpI
+OkE5PTuqONvy7Xn3Ui8NRxHhmm8j/unql6bUTGENz9s68n8Im7weq6awC9Hfu8aG
+WjcnXI7tsDY5uJEguP5fSwCUrdTE85XgPgPHeKaIwBZsyRZTqVSvbky+c15Yv6IT
+XLWoA0AUxz9ste3WpqiWCNJVI90MCruSYKdpXGV0KU3QQXJDMKhHJBF5DLpuKibo
+Ffh9O8pB7B4/tJ76JpAc6Z0rfaQUo2vxSpb3Sbd/IHNcL08zB8Ay+YUBULspxe+1
+StKthmCzCHI9DOhIgeASyNBpcL7uZPjCXiYGhUuzsFGv4sQ+d267Jyvql/Piw/vY
+g1k2aVBfdIoIU4TpIEVyQqPz4aAW+0SgL7OM+/zD9jxn3gVdusCpmHcoTzOfZRri
+H0FGIeDSQydpOJU=
+-----END CERTIFICATE-----

docker-compose/certs/root_insta.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFTCCAv2gAwIBAgICAxIwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPT3Bl
+bkxBTiBSb290IENBMCAXDTI1MDUxNDA4NDcxMFoYDzIwNTUwNTE0MDg0NzEwWjAa
+MRgwFgYDVQQDDA9PcGVuTEFOIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDGibJ04A55kSURTBSKgcBmLnND2I5wws1taKqqU9aaRhB7NtvM
+Hwh2voH9b1brUiulZaZwTN/9kzd4AnXeKQ+0u5tV7Ofk0fzF2MK47n17TS30Yenq
+c4NuQEKdpKK/pM3VvOEppR/bqtgyLtDmbDnmFOx+zTj/+smTgouwA+Iier0P4s5O
+ohYxn/bjOqwQbHbU79VpGBIWv6/kt55AhH7zvsqqKHkrzTxnsRBv3SBIufrjJr9P
+IhZBLDrqr56P6KgAi0eoutNt2ToiJbE0WfjU7GI1RSiSN5bGj1zXhjNVzQWs1H9Q
+zRf3c9pl3+haHQZ7FZ1UqiTRewmbNrQ6I9k81au3SttUlb87MyAuDSzatkiq7CjQ
+8VE1J6te6ZBt2zWpUhHsR/Lg7g3eOw5dL4oZJdK5GgGu/MUajLUXifIqM13Mvg0V
+TzDhN69VLXLSL0gPcicsQCwJuAza1IC/VqmBGx19fAkyJhOurCXWOgisi0g1+xzP
+KRphUNwMPUf8vBVOM/Vc6xDIvwVGE3+eWXyhixneFlSpAI03nWWjpwWXihTBoxbf
+RXO3Y/ilJqrgFN+U4PJcCPA+Wo7ThH0mgX6bOTPcgXMUzT3v3FF6Bx5/PNV3kYrw
+2yLzribUiS6AGvVGnW4hX2Z6OQvA/aHME8KF+6y6m4pC7FkUjVaRlzWu/wIDAQAB
+o2MwYTAfBgNVHSMEGDAWgBSUaFuoOPk4QLByZP47kj4p1IbCJjAdBgNVHQ4EFgQU
+lGhbqDj5OECwcmT+O5I+KdSGwiYwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAB+/RUC2X6eVoPsFNMkaXO5Iib/ub0Jo
+WhODQm8j2Mr5dpGXESSpXjfDcqDOLuJbWWoflXBLdr8BsVCBqOA9YgCX0H8Br7dU
+WmCScixxLW0he592/424EvdwifxcKHZLjv9CKV5Txhqnm2djc5RY/nTH5MYVrIh/
+If2TNO5ydDP6+vgy9GQ4en04VK7rz+PW17O8l7k9/lOmYptZmHgSDAPj/cT3PlG+
+McqaI5rMSHeEHlzH+PvgWjtSeEhF4FwFBXroDl4/yb4l2JB8bqAZ3vsOXSkigFcZ
+h5MXPe+zuSSW+G8iLr4xoi0CFsP2DaHEyxgqP4B1FtE9nFPo6cvWbwqTVT7QSzqf
+H+jPJuQvpFXeRF5UFegNZTFT5/uFFPamihakFslEYxeJey1y+OJdLcP6ef87ruSt
+8amsq56OAETYpnW4JFowlEh0C+QwLGHGGY6WrOgHY/90hJmPgXBdBVg/IoOhzbvk
+5A+LqZDvxV2/rLNfClw8Kr3g5e8obcB6dWgMCy2z+us0H79ucnmhzQKsjpxM9T1n
+cHovAQfiD3jVqfHULY53avh0wIAjosoTGbe8dyx80quHe+16qWan7C9idXeAYYJX
+bZt5hs6hLw4I8M1LsjTg6vwsqiaHZpsmDyyQLdFjNJldG7aosfS9F+BIpuwijF+1
+dashL0CPsbIJ
+-----END CERTIFICATE-----

docker-compose/dco

@@ -5,6 +5,14 @@
 # It captures $1 == launch or l and runs: ... up -d,
 # but passes everything else straight to the docker-compose command.
 cmd="docker-compose"
+if command -v docker-compose > /dev/null 2>&1 ; then
+    cmd="docker-compose"
+elif command -v docker > /dev/null 2>&1 ; then
+    cmd="docker compose"
+else
+    echo "Could not find docker-compose or docker commands."
+    exit 1
+fi
 deploy_type=$(grep "^DEPLOY_TYPE=" .env | awk -F= '{ print $2 }')
 [ -z "$deploy_type" ] && deploy_type="default"
 if [[ "$deploy_type" == "letsencrypt" ]] ; then
@@ -26,6 +34,11 @@ if [[ "$1" == "clean" ]] ; then
 elif [[ "$1" == "launch" || "$1" == "l" ]] ; then
     set -x
     $cmd up -d
+elif [[ "$1" == "relaunch" || "$1" == "rel" ]] ; then
+    set -x
+    $cmd down
+    sleep 5
+    $cmd up -d
 else
     set -x
     $cmd "$@"

docker-compose/docker-compose.lb.letsencrypt.yml

@@ -177,7 +177,7 @@ services:
       - ./certs:/${OWSUB_ROOT}/certs
 
   kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     env_file:
@@ -187,7 +187,7 @@ services:
       - kafka_data:/bitnami/kafka
 
   init-kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     depends_on:

docker-compose/docker-compose.lb.selfsigned.yml

@@ -175,7 +175,7 @@ services:
       - ./certs:/${OWSUB_ROOT}/certs
 
   kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     env_file:
@@ -185,7 +185,7 @@ services:
       - kafka_data:/bitnami/kafka
 
   init-kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     depends_on:

docker-compose/docker-compose.yml

@@ -196,7 +196,7 @@ services:
       - "16106:16106"
 
   kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     env_file:
@@ -206,7 +206,7 @@ services:
       - kafka_data:/bitnami/kafka
 
   init-kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       openwifi:
     depends_on:

docker-compose/owls/docker-compose.lb.letsencrypt.yml

@@ -105,7 +105,7 @@ services:
       - "16007:16007"
 
   kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       owls:
     env_file:
@@ -115,7 +115,7 @@ services:
       - kafka_data:/bitnami/kafka
 
   init-kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       owls:
     depends_on:

docker-compose/owls/docker-compose.yml

@@ -85,7 +85,7 @@ services:
       - "443:443"
 
   kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       owls:
     env_file:
@@ -95,7 +95,7 @@ services:
       - kafka_data:/bitnami/kafka
 
   init-kafka:
-    image: "docker.io/bitnami/kafka:${KAFKA_TAG}"
+    image: "docker.io/bitnamilegacy/kafka:${KAFKA_TAG}"
     networks:
       owls:
     depends_on: