Skip to content

Commit

Permalink
image tags
Browse files Browse the repository at this point in the history
  • Loading branch information
cbbmiller committed Feb 23, 2024
1 parent 48a2c41 commit 4945a28
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 40 deletions.
16 changes: 8 additions & 8 deletions charts/clearblade-iot-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: cb-haproxy
description: ClearBlade IoT Enterprise - ClearBlade Load Balancer
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: cb-postgres
description: ClearBlade IoT Enterprise - Postgres
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: cb-redis
description: ClearBlade IoT Enterprise - Redis
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ enabled: true
monitoringEnabled: true
replicas: 1
image: redis
imageTag: alpine
imageTag: 5.0-alpine
resourceRequests:
cpu: 1
memory: 8G
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: clearblade
description: ClearBlade IoT Enterprise - ClearBlade Node
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/clearblade-monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion charts/clearblade-monitoring/charts/cb-haproxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: cb-haproxy
description: ClearBlade IoT Enterprise - ClearBlade Load Balancer
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
name: cb-monitoring
description: ClearBlade IoT Enterprise - Monitoring
type: application
version: 2.13.2
version: 2.13.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
22 changes: 8 additions & 14 deletions gke-default-monitoring-values.yaml
Original file line number Diff line number Diff line change
@@ -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 "<namespace>_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"
Expand All @@ -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:
Expand All @@ -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/
Expand All @@ -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:
Expand All @@ -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

0 comments on commit 4945a28

Please sign in to comment.