diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52f77c3df1c2fc38e633162163e244512da6d929..b063e9ac2903d505777b0cc0a91c9fc4515494e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+## 2.3.3 - 2023-09-09
+
+### Changed
+- added rancher monitoring chart, this can now be managed through argocd.
+
## 2.3.2 - 2023-08-30
CRITICAL the version 2.2.0 - 2.3.1 could result in all nodes in the cluster being deleted in the case of changes to the userdata.
diff --git a/charts/apps/templates/monitoring/monitoring.yaml b/charts/apps/templates/monitoring/monitoring.yaml
index c6da14f776c2ce7631dc53f2e98c696ddec8be3f..35537d63aa1036961baefd4d4401c144b86585a1 100644
--- a/charts/apps/templates/monitoring/monitoring.yaml
+++ b/charts/apps/templates/monitoring/monitoring.yaml
@@ -26,7 +26,7 @@ spec:
source:
repoURL: https://charts.rancher.io
chart: rancher-monitoring
- targetRevision: {{ .Values.rancherMonitoring.version | quote }}
+ targetRevision: {{ .Values.monitoring.version | quote }}
helm:
version: v3
releaseName: rancher-monitoring
@@ -37,6 +37,13 @@ spec:
clusterName: {{ .Values.cluster.name }}
systemDefaultRegistry: ""
systemDefaultRegistry: ""
+ ignoreDifferences:
+ - group: ""
+ kind: ConfigMap
+ name: rancher-default-dashboards-k8s
+ namespace: cattle-dashboards
+ jsonPointers:
+ - /data
---
apiVersion: argoproj.io/v1alpha1
kind: Application
@@ -66,7 +73,7 @@ spec:
source:
repoURL: https://charts.rancher.io
chart: rancher-monitoring-crd
- targetRevision: {{ .Values.rancherMonitoring.version | quote }}
+ targetRevision: {{ .Values.monitoring.version | quote }}
helm:
version: v3
releaseName: rancher-monitoring-crd
diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
index 68bc1b63f7e15a678afb48a484823ed3de202b7e..a327befe15419b5dfc48ef16bd45f0d8f3ada2be 100644
--- a/charts/apps/values.yaml
+++ b/charts/apps/values.yaml
@@ -49,7 +49,7 @@ sealedsecrets:
monitoring:
enabled: false
- version: "101.*"
+ version: "102.*"
healthmonitor:
enabled: false
diff --git a/terraform/modules/argocd/variables.tf b/terraform/modules/argocd/variables.tf
index 335651f1f479a2f8f5b679d14e8194e0d0844ddc..eece7bbefd897f710e5344e3caedda5bbe7ea87b 100644
--- a/terraform/modules/argocd/variables.tf
+++ b/terraform/modules/argocd/variables.tf
@@ -102,8 +102,8 @@ variable "argocd_annotations" {
variable "monitoring_enabled" {
type = bool
- description = "Enable monitoring in rancher"
- default = true
+ description = "Enable monitoring using prometheus"
+ default = false
}
variable "cinder_enabled" {
diff --git a/terraform/modules/rke1/variables.tf b/terraform/modules/rke1/variables.tf
index 913ac783cbe87391aa94d47a6b569499d35724bc..589c5375e7fcd99ee00f0c1c23173a542511cc34 100644
--- a/terraform/modules/rke1/variables.tf
+++ b/terraform/modules/rke1/variables.tf
@@ -28,18 +28,21 @@ variable "cluster_machines" {
# APPLICATIONS
# ----------------------------------------------------------------------
+# DEPRECATED - will move to argocd
variable "monitoring_enabled" {
type = bool
description = "Enable monitoring in rancher"
default = true
}
+# DEPRECATED - will move to argocd
variable "longhorn_enabled" {
type = bool
description = "Enable longhorn storage"
default = true
}
+# DEPRECATED - will move to argocd
variable "longhorn_replicas" {
type = string
description = "Number of replicas"
@@ -125,14 +128,14 @@ variable "openstack_external_net" {
default = "ext-net"
}
-# DEPRECATED, new key will always be created
+# DEPRECATED - new key will always be created
variable "openstack_ssh_key" {
type = string
description = "existing SSH key to use, leave blank for a new one"
default = ""
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "openstack_zone" {
type = string
description = "default zone to use for openstack nodes"
@@ -149,6 +152,7 @@ variable "openstack_security_kubernetes" {
}
}
+// TODO change this to be ncsa only
variable "openstack_security_ssh" {
type = map(any)
description = "IP address to allow connections to ssh, default is open to the world"
@@ -170,56 +174,56 @@ variable "openstack_os_image" {
# OPENSTACK NODES
# ----------------------------------------------------------------------
-# DEPRECATED
+# DEPRECATED - will always start at 1 with cluster.json
variable "old_hostnames" {
type = bool
description = "should old hostname be used (base 0)"
default = false
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "os" {
type = string
description = "Base image to use for the OS"
default = "CentOS-7-GenericCloud-Latest"
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "controlplane_count" {
type = string
description = "Desired quantity of control-plane nodes"
default = 1
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "controlplane_flavor" {
type = string
description = "Desired flavor of control-plane nodes"
default = "m1.medium"
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "controlplane_disksize" {
type = string
description = "Desired disksize of control-plane nodes"
default = 40
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "worker_count" {
type = string
description = "Desired quantity of worker nodes"
default = 1
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "worker_flavor" {
type = string
description = "Desired flavor of worker nodes"
default = "m1.large"
}
-# DEPRECATED
+# DEPRECATED - use cluster.json
variable "worker_disksize" {
type = string
description = "Desired disksize of worker nodes"