[PDP-3532] remove dpMetadata

TIBCOSoftware · Nov 22, 2024 · e05b9ee · e05b9ee
1 parent d36feb2
commit e05b9ee
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/charts/provisioner-config-local/Chart.yaml b/charts/provisioner-config-local/Chart.yaml
@@ -8,7 +8,7 @@ apiVersion: v2
 name: provisioner-config-local
 description: Platform Provisioner local config
 type: application
-version: "1.0.69"
+version: "1.0.72"
 appVersion: "2.0.0"
 home: https://github.com/TIBCOSoftware/tp-helm-charts
 maintainers:

diff --git a/charts/provisioner-config-local/config/pp-ingress-tracing.yaml b/charts/provisioner-config-local/config/pp-ingress-tracing.yaml
@@ -51,7 +51,6 @@ recipe: |
       DP_CHART_REPO: https://tibcosoftware.github.io/tp-helm-charts
     tools:
       yq: "4.40"
-      helm: "3.13"
   helmCharts:
     - name: dp-config-aws
       version: ${DP_CONFIG_AWS_VERSION}

diff --git a/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml b/charts/provisioner-config-local/config/pp-o11y-dp-config-es.yaml
@@ -107,7 +107,6 @@ recipe: |
       DP_CHART_REPO: https://${GUI_GITHUB_TOKEN}@raw.githubusercontent.com/tibco/tp-helm-charts/gh-pages
     tools:
       yq: "4.40"
-      helm: "3.13"
   helmCharts:
     - name: eck-operator
       version: ${DP_ECK_VERSION}

diff --git a/charts/provisioner-config-local/config/pp-o11y-full.yaml b/charts/provisioner-config-local/config/pp-o11y-full.yaml
@@ -53,11 +53,11 @@ recipe: |
       GUI_DP_STORAGE_CLASS: "hostpath"
       GUI_DP_DOMAIN: "localhost.dataplanes.pro"
       GUI_DP_CONFIG_CHART_VERSION: "^1.0.0"
-      GUI_DP_CONFIG_ES_VERSION: "8.12.1"
+      GUI_DP_CONFIG_ES_VERSION: "8.16.1"
       GUI_DP_CONFIG_ES_NAMESPACE: "elastic-system"
       GUI_DP_DEPLOY_ECK: true
-      GUI_DP_ECK_VERSION: "2.11.1"
-      GUI_DP_KUBE_PROMETHEUS_STACK_VERSION: "57.0.3"
+      GUI_DP_ECK_VERSION: "2.15.0"
+      GUI_DP_KUBE_PROMETHEUS_STACK_VERSION: "66.2.1"
       GUI_DP_OPEN_TELEMETRY_VERSION: "0.74.1"
     globalEnvVariable:
       REPLACE_RECIPE: true
@@ -69,15 +69,14 @@ recipe: |
       DP_STORAGE_CLASS: ${GUI_DP_STORAGE_CLASS} # hostpath for docker desktop, standard for minikube
       DP_ES_RELEASE_NAME: dp-config-es
       DP_CONFIG_CHART_VERSION: "${GUI_DP_CONFIG_CHART_VERSION}"
-      DP_CONFIG_ES_VERSION: "${GUI_DP_CONFIG_ES_VERSION}"
+      DP_CONFIG_ES_VERSION: "${GUI_DP_CONFIG_ES_VERSION}" # https://www.elastic.co/guide/en/elasticsearch/reference/current/es-release-notes.html
       DP_CONFIG_ES_NAMESPACE: "${GUI_DP_CONFIG_ES_NAMESPACE}"
       DP_DEPLOY_ECK: ${GUI_DP_DEPLOY_ECK}
-      DP_ECK_VERSION: "${GUI_DP_ECK_VERSION}" 
+      DP_ECK_VERSION: "${GUI_DP_ECK_VERSION}" # helm search repo elastic/eck-operator https://www.elastic.co/guide/en/cloud-on-k8s/master/eck-release-notes.html
       DP_KUBE_PROMETHEUS_STACK_VERSION: "${GUI_DP_KUBE_PROMETHEUS_STACK_VERSION}" # https://github.com/prometheus-community/helm-charts/releases
-      DP_OPEN_TELEMETRY_VERSION: "${GUI_DP_OPEN_TELEMETRY_VERSION}"
+      DP_OPEN_TELEMETRY_VERSION: "${GUI_DP_OPEN_TELEMETRY_VERSION}" # https://github.com/open-telemetry/opentelemetry-helm-charts/releases
     tools:
       yq: "4.40"
-      helm: "3.13"
   helmCharts:
     - name: eck-operator
       version: ${DP_ECK_VERSION}
@@ -146,6 +145,9 @@ recipe: |
               ingressClassName: ${DP_INGRESS_CLASS}
               hosts:
               - grafana.${DP_DOMAIN}
+          prometheus-node-exporter:
+            hostRootFsMount: 
+              enabled: false
           prometheus:
             prometheusSpec:
               enableRemoteWriteReceiver: true
@@ -202,6 +204,8 @@ recipe: |
         content: |
           mode: "daemonset"
           fullnameOverride: otel-kubelet-stats
+          # image:
+          #  repository: "otel/opentelemetry-collector-contrib"
           podLabels:
             platform.tibco.com/workload-type: "infra"
             networking.platform.tibco.com/kubernetes-api: enable

diff --git a/charts/provisioner-config-local/config/pp-o11y-otel-daemon.yaml b/charts/provisioner-config-local/config/pp-o11y-otel-daemon.yaml
@@ -46,7 +46,6 @@ recipe: |
       DP_OTEL_CHART_VERSION: "${GUI_DP_OTEL_CHART_VERSION}"
     tools:
       yq: "4.40"
-      helm: "3.13"
   helmCharts:
     - name: opentelemetry-collector
       version: "${DP_OTEL_CHART_VERSION}"

diff --git a/charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml b/charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml
@@ -456,6 +456,7 @@ helmCharts:
     content: |
       tp-cp-bootstrap:
         compute-services:
+          enabled: true
           resources:
             requests:
               cpu: ${CP_RESOURCES_REQUEST_CPU}
@@ -472,10 +473,6 @@ helmCharts:
                 repoUrl: ${DP_CHART_REPO}
               default: true
               type: chart-museum
-          dpMetadata:
-            dpConfigureNamespaceChartVersion: '*'
-            dpCoreInfrastructureChartVersion: '*'
-          enabled: true
         hybrid-proxy:
           enabled: true
           resources:

diff --git a/docs/recipes/controlplane/tp-cp.yaml b/docs/recipes/controlplane/tp-cp.yaml
@@ -373,6 +373,7 @@ helmCharts:
     content: |
       tp-cp-bootstrap:
         compute-services:
+          enabled: true
           resources:
             requests:
               cpu: ${CP_RESOURCES_REQUEST_CPU}
@@ -389,10 +390,6 @@ helmCharts:
                 repoUrl: ${DP_CHART_REPO}
               default: true
               type: chart-museum
-          dpMetadata:
-            dpConfigureNamespaceChartVersion: '*'
-            dpCoreInfrastructureChartVersion: '*'
-          enabled: true
         hybrid-proxy:
           enabled: true
           resources: