From 4945a28dee74a857af0359c28c7f383532bc0346 Mon Sep 17 00:00:00 2001 From: cbbmiller <147663581+cbbmiller@users.noreply.github.com> Date: Fri, 23 Feb 2024 09:59:16 -0600 Subject: [PATCH] image tags --- charts/clearblade-iot-enterprise/Chart.yaml | 16 +++++++------- .../charts/cb-console/Chart.yaml | 2 +- .../charts/cb-file-hosting/Chart.yaml | 2 +- .../charts/cb-haproxy/Chart.yaml | 2 +- .../charts/cb-iotcore/Chart.yaml | 2 +- .../charts/cb-postgres/Chart.yaml | 2 +- .../charts/cb-redis/Chart.yaml | 2 +- .../charts/cb-redis/values.yaml | 2 +- .../charts/clearblade/Chart.yaml | 2 +- .../templates/clearblade-statefulset.yaml | 2 +- .../charts/clearblade/values.yaml | 2 -- charts/clearblade-monitoring/Chart.yaml | 6 ++--- .../charts/cb-haproxy/Chart.yaml | 2 +- .../charts/cb-monitoring/Chart.yaml | 2 +- .../cb-monitoring/templates/grafana.yaml | 2 +- .../cb-monitoring/templates/prometheus.yaml | 2 +- gke-default-monitoring-values.yaml | 22 +++++++------------ 17 files changed, 32 insertions(+), 40 deletions(-) diff --git a/charts/clearblade-iot-enterprise/Chart.yaml b/charts/clearblade-iot-enterprise/Chart.yaml index ec1673c..1a96968 100644 --- a/charts/clearblade-iot-enterprise/Chart.yaml +++ b/charts/clearblade-iot-enterprise/Chart.yaml @@ -2,31 +2,31 @@ apiVersion: v2 name: clearblade-iot-enterprise description: ClearBlade IoT Enterprise type: application -version: 2.13.2 +version: 2.13.3 dependencies: - name: cb-postgres - version: 2.13.2 + version: 2.13.3 condition: cb-postgres.enabled repository: file://charts/cb-postgres - name: cb-haproxy - version: 2.13.2 + version: 2.13.3 condition: cb-haproxy.enabled repository: file://charts/cb-haproxy - name: clearblade - version: 2.13.2 + version: 2.13.3 repository: file://charts/clearblade - name: cb-console - version: 2.13.2 + version: 2.13.3 repository: file://charts/cb-console - name: cb-file-hosting - version: 2.13.2 + version: 2.13.3 repository: file://charts/cb-file-hosting - name: cb-redis - version: 2.13.2 + version: 2.13.3 condition: cb-redis.enabled repository: file://charts/cb-redis - name: cb-iotcore - version: 2.13.2 + version: 2.13.3 condition: global.iotCore.enabled repository: file://charts/cb-iotcore diff --git a/charts/clearblade-iot-enterprise/charts/cb-console/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-console/Chart.yaml index 921b77d..6039114 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-console/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-console/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-console description: ClearBlade IoT Enterprise - ClearBlade Developer Console type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/cb-file-hosting/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-file-hosting/Chart.yaml index be7d5e3..10ec544 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-file-hosting/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-file-hosting/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-file-hosting description: ClearBlade IoT Enterprise - File Hosting type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/cb-haproxy/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-haproxy/Chart.yaml index 9207f71..9193ec5 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-haproxy/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-haproxy/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-haproxy description: ClearBlade IoT Enterprise - ClearBlade Load Balancer type: application -version: 2.13.2 \ No newline at end of file +version: 2.13.3 \ No newline at end of file diff --git a/charts/clearblade-iot-enterprise/charts/cb-iotcore/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-iotcore/Chart.yaml index 826e145..deb7e1d 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-iotcore/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-iotcore/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-iotcore description: ClearBlade IoT Enterprise - IoT Core Sidecar type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/cb-postgres/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-postgres/Chart.yaml index 931dd84..dc4312c 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-postgres/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-postgres/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-postgres description: ClearBlade IoT Enterprise - Postgres type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/cb-redis/Chart.yaml b/charts/clearblade-iot-enterprise/charts/cb-redis/Chart.yaml index 38dee13..2cd1f6c 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-redis/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-redis/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-redis description: ClearBlade IoT Enterprise - Redis type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/cb-redis/values.yaml b/charts/clearblade-iot-enterprise/charts/cb-redis/values.yaml index 8c4cd2d..126f512 100644 --- a/charts/clearblade-iot-enterprise/charts/cb-redis/values.yaml +++ b/charts/clearblade-iot-enterprise/charts/cb-redis/values.yaml @@ -2,7 +2,7 @@ enabled: true monitoringEnabled: true replicas: 1 image: redis -imageTag: alpine +imageTag: 5.0-alpine resourceRequests: cpu: 1 memory: 8G diff --git a/charts/clearblade-iot-enterprise/charts/clearblade/Chart.yaml b/charts/clearblade-iot-enterprise/charts/clearblade/Chart.yaml index 973c77e..c92d68f 100644 --- a/charts/clearblade-iot-enterprise/charts/clearblade/Chart.yaml +++ b/charts/clearblade-iot-enterprise/charts/clearblade/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: clearblade description: ClearBlade IoT Enterprise - ClearBlade Node type: application -version: 2.13.2 +version: 2.13.3 diff --git a/charts/clearblade-iot-enterprise/charts/clearblade/templates/clearblade-statefulset.yaml b/charts/clearblade-iot-enterprise/charts/clearblade/templates/clearblade-statefulset.yaml index b752cf9..f56d9b3 100644 --- a/charts/clearblade-iot-enterprise/charts/clearblade/templates/clearblade-statefulset.yaml +++ b/charts/clearblade-iot-enterprise/charts/clearblade/templates/clearblade-statefulset.yaml @@ -36,7 +36,7 @@ spec: do echo waiting for database; sleep 2; done; {{- end }} - name: check-redis-readiness - image: redis:latest + image: redis:5.0-alpine {{- if (.Values.global.advanced.memoryStore).enabled }} command: - sh diff --git a/charts/clearblade-iot-enterprise/charts/clearblade/values.yaml b/charts/clearblade-iot-enterprise/charts/clearblade/values.yaml index c624db8..a001479 100644 --- a/charts/clearblade-iot-enterprise/charts/clearblade/values.yaml +++ b/charts/clearblade-iot-enterprise/charts/clearblade/values.yaml @@ -5,8 +5,6 @@ logLevel: debug storeCodeLogs: true storeMessageHistory: true license: - key: "L77NCVoQo1auwQH7PwfIN1Simdpq+r1qjpc3Id9OljU6TqQmi+2k/NYm3KLQsLXqtw6V8E8mOhxjFnOx6sTuw645zl3Xp32ngzS5Lt4En3TKARp9RdeyW04=" - instanceID: "michael-ops-testing" autoRenew: enabled: true days: 15 diff --git a/charts/clearblade-monitoring/Chart.yaml b/charts/clearblade-monitoring/Chart.yaml index 58b144e..d60fb6c 100644 --- a/charts/clearblade-monitoring/Chart.yaml +++ b/charts/clearblade-monitoring/Chart.yaml @@ -2,14 +2,14 @@ apiVersion: v2 name: clearblade-monitoring description: ClearBlade IoT Enterprise monitoring type: application -version: 2.13.2 +version: 2.13.3 dependencies: - name: cb-monitoring - version: 2.13.2 + version: 2.13.3 condition: cb-monitoring.enabled repository: file://charts/cb-monitoring - name: cb-haproxy - version: 2.13.2 + version: 2.13.3 condition: cb-haproxy.enabled repository: file://charts/cb-haproxy diff --git a/charts/clearblade-monitoring/charts/cb-haproxy/Chart.yaml b/charts/clearblade-monitoring/charts/cb-haproxy/Chart.yaml index 9207f71..9193ec5 100644 --- a/charts/clearblade-monitoring/charts/cb-haproxy/Chart.yaml +++ b/charts/clearblade-monitoring/charts/cb-haproxy/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: cb-haproxy description: ClearBlade IoT Enterprise - ClearBlade Load Balancer type: application -version: 2.13.2 \ No newline at end of file +version: 2.13.3 \ No newline at end of file diff --git a/charts/clearblade-monitoring/charts/cb-monitoring/Chart.yaml b/charts/clearblade-monitoring/charts/cb-monitoring/Chart.yaml index 2a6037d..2c814e8 100644 --- a/charts/clearblade-monitoring/charts/cb-monitoring/Chart.yaml +++ b/charts/clearblade-monitoring/charts/cb-monitoring/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 name: cb-monitoring description: ClearBlade IoT Enterprise - Monitoring type: application -version: 2.13.2 \ No newline at end of file +version: 2.13.3 \ No newline at end of file diff --git a/charts/clearblade-monitoring/charts/cb-monitoring/templates/grafana.yaml b/charts/clearblade-monitoring/charts/cb-monitoring/templates/grafana.yaml index 131fb9f..967183d 100644 --- a/charts/clearblade-monitoring/charts/cb-monitoring/templates/grafana.yaml +++ b/charts/clearblade-monitoring/charts/cb-monitoring/templates/grafana.yaml @@ -27,7 +27,7 @@ spec: serviceAccountName: clearblade-gsm-read containers: - name: grafana - image: grafana/grafana + image: grafana/grafana:10.3.3 imagePullPolicy: IfNotPresent ports: - containerPort: 3000 diff --git a/charts/clearblade-monitoring/charts/cb-monitoring/templates/prometheus.yaml b/charts/clearblade-monitoring/charts/cb-monitoring/templates/prometheus.yaml index 3f7305b..fee080d 100644 --- a/charts/clearblade-monitoring/charts/cb-monitoring/templates/prometheus.yaml +++ b/charts/clearblade-monitoring/charts/cb-monitoring/templates/prometheus.yaml @@ -21,7 +21,7 @@ spec: kubernetes.io/arch: amd64 containers: - name: prometheus-frontend - image: prom/prometheus + image: prom/prometheus:v2.49.1 args: - "--config.file=/etc/prometheus/prometheus.yml" - "--storage.tsdb.path=/prometheus/" diff --git a/gke-default-monitoring-values.yaml b/gke-default-monitoring-values.yaml index ce174c4..2b1fb3d 100644 --- a/gke-default-monitoring-values.yaml +++ b/gke-default-monitoring-values.yaml @@ -1,12 +1,6 @@ -# Required Infrastructure -# 1. Static external IP address (cb-haproxy.ip.primary below) -# 2. DNS Record for IP -# 3. TLS certificate for URL stored in gcloud secret named "_tls-certificates" (use monitoring namespace, not clearblade namespace) -# 4. GCP service account that can access secret (can be same one as clearblade deployment) - global: - namespace: monitoring # Namespace for the monitoring resources (one per cluster, must be unique per deployment if non-wildcard TLS certificates are used) - deploymentnamespace: REPLACE # the namespace that clearblade is deployed in. Only necessary for non GMP + namespace: monitoring # Namespace to be created for the monitoring resources (one per cluster, must be unique per deployment if non-wildcard TLS certificates are used) + deploymentnamespace: REPLACE # the existing namespace that clearblade is deployed in. Not necessary for GMP nodeSelector: REPLACE # Optional nodeSelector. Leave blank if not utilizing. tolerations: # Optional taint tolerations. Add as many key blocks as necessary. Leave blank if not utilizing. # - key: "key1" @@ -16,7 +10,7 @@ global: gcp: project: REPLACE region: REPLACE - gsmReadServiceAccount: clearblade-gsm-read + gsmReadServiceAccount: clearblade-gsm-read # GCP Service account to be used in helm install command. Needs secret access and workload identity advanced: predefinedNamespace: false # Set to true if you manage the namespace outside of helm. secrets: @@ -28,7 +22,7 @@ cb-haproxy: imageTag: 2.6-alpine grafanaEnabled: true # Bundled Grafana ip: - primary: REPLACE + primary: REPLACE # static external IP in DNS record prometheus: user: REPLACE # Prometheus frontend username sha256password: REPLACE # Generated with: mkpasswd -m sha-256 mypassword123. See: https://www.haproxy.com/documentation/haproxy-configuration-tutorials/authentication/basic-authentication/ @@ -43,7 +37,7 @@ cb-monitoring: monitoringURL: REPLACE grafana: enabled: true # Bundled Grafana - clusterName: REPLACE # Used to filter dashboard queries to this cluster only. Leave blank and all clusters in the project area will show in the dashboard. + clusterName: REPLACE # Used to filter dashboard queries to this cluster only. adminUsername: REPLACE # Grafana frontend login base64password: REPLACE # Base64 Encoded password of your choice resourceRequests: @@ -52,8 +46,8 @@ cb-monitoring: resourceLimits: cpu: 1 memory: 4G - clearbladereplicas: 1 # Used for prometheus scrape config. Only necessary for Non GMP - haproxyreplicas: 1 # Used for prometheus scrape config. Only necessary for Non GMP - postgresreplicas: 1 # Used for prometheus scrape config. Only necessary for Non GMP + clearbladereplicas: 1 # Number of ClearBlade pods in deployment. Used for prometheus scrape config. Not necessary for GMP + haproxyreplicas: 1 # Number of HAProxy pods in deployment. Used for prometheus scrape config. Not necessary for GMP + postgresreplicas: 1 # Number of Postgres pods in deployment. Used for prometheus scrape config. not necessary for GMP prometheusDisk: REPLACE #OPTIONAL disk for prometheus data. Leave blank if not using. Not necessary for GMP deployments prometheusDiskSize: REPLACE #OPTIONAL size of disk above, include unit. example: 200G \ No newline at end of file