[PDP-3609] 2024 week 50 update (#37)

* [PDP-3609] 2024 week 50 update * improve gke recipe
TIBCOSoftware · Dec 11, 2024 · 43de891 · 43de891
1 parent e1e0bfb
commit 43de891
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 16 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.83"
+version: "1.0.86"
 appVersion: "2.0.0"
 home: https://github.com/TIBCOSoftware/tp-helm-charts
 maintainers:

diff --git a/charts/provisioner-config-local/config/pp-deploy-cp-core-upgrade.yaml b/charts/provisioner-config-local/config/pp-deploy-cp-core-upgrade.yaml
@@ -105,8 +105,8 @@ recipe: |
     repo:
       helm:
         url: ${CP_CHART_REPO}
-        username: ${CP_CHART_REPO_USER_NAME}
-        password: ${CP_CHART_REPO_TOKEN}
+        username: "${CP_CHART_REPO_USER_NAME}"
+        password: "${CP_CHART_REPO_TOKEN}"
     values:
       keepPrevious: true
       content: |
@@ -125,8 +125,8 @@ recipe: |
     repo:
       helm:
         url: ${CP_CHART_REPO}
-        username: ${CP_CHART_REPO_USER_NAME}
-        password: ${CP_CHART_REPO_TOKEN}
+        username: "${CP_CHART_REPO_USER_NAME}"
+        password: "${CP_CHART_REPO_TOKEN}"
     values:
       keepPrevious: true
       content: |

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
@@ -137,6 +137,7 @@ meta:
     # node
     CP_NODE_CIDR: ${GUI_TP_CLUSTER_NODE_CIDR:-"10.180.0.0/16"}
     CP_POD_CIDR: ${GUI_TP_CLUSTER_POD_CIDR:-"10.180.0.0/16"}
+    CP_SERVICE_CIDR: ${GUI_TP_SERVICE_CIDR:-"10.96.0.0/12"}
     # third party
     CP_EXT_NAMESPACE: ${GUI_CP_EXT_NAMESPACE:-"tibco-ext"}
     # network policies
@@ -455,8 +456,8 @@ helmCharts:
   repo:
     helm:
       url: ${CP_CHART_REPO}
-      username: ${CP_CHART_REPO_USER_NAME}
-      password: ${CP_CHART_REPO_TOKEN}
+      username: "${CP_CHART_REPO_USER_NAME}"
+      password: "${CP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -538,6 +539,7 @@ helmCharts:
           clusterInfo:
             nodeCIDR: ${CP_NODE_CIDR}
             podCIDR: ${CP_POD_CIDR}
+            serviceCIDR: ${CP_SERVICE_CIDR}
           dnsDomain: ${CP_SERVICE_DNS_DOMAIN}
           dnsTunnelDomain: ${CP_TUNNEL_DNS_DOMAIN}
           provider: ${CP_PROVIDER}
@@ -732,8 +734,8 @@ helmCharts:
   repo:
     helm:
       url: ${CP_CHART_REPO}
-      username: ${CP_CHART_REPO_USER_NAME}
-      password: ${CP_CHART_REPO_TOKEN}
+      username: "${CP_CHART_REPO_USER_NAME}"
+      password: "${CP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -779,6 +781,12 @@ helmCharts:
         enabled: ${CP_INSTALL_MSG_CONTRIB}
       tp-cp-hawk:
         enabled: ${CP_INSTALL_HAWK}
+        tp-cp-hawk-infra-prometheus:
+          prometheus:
+            resources:
+              requests:
+                cpu: ${CP_RESOURCES_REQUEST_CPU}
+                memory: ${CP_RESOURCES_REQUEST_MEMORY}
       tp-cp-recipes:
         enabled: ${CP_INSTALL_RECIPES}
       tp-cp-integration:

diff --git a/docs/recipes/controlplane/tp-cp.yaml b/docs/recipes/controlplane/tp-cp.yaml
@@ -52,6 +52,7 @@ meta:
     # node
     CP_NODE_CIDR: ${GUI_TP_CLUSTER_NODE_CIDR:-"10.180.0.0/16"}
     CP_POD_CIDR: ${GUI_TP_CLUSTER_POD_CIDR:-"10.180.0.0/16"}
+    CP_SERVICE_CIDR: ${GUI_TP_SERVICE_CIDR:-"10.96.0.0/12"}
     # third party
     CP_EXT_NAMESPACE: ${GUI_CP_EXT_NAMESPACE:-"tibco-ext"}
     # network policies
@@ -370,8 +371,8 @@ helmCharts:
   repo:
     helm:
       url: ${CP_CHART_REPO}
-      username: ${CP_CHART_REPO_USER_NAME}
-      password: ${CP_CHART_REPO_TOKEN}
+      username: "${CP_CHART_REPO_USER_NAME}"
+      password: "${CP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -453,6 +454,7 @@ helmCharts:
           clusterInfo:
             nodeCIDR: ${CP_NODE_CIDR}
             podCIDR: ${CP_POD_CIDR}
+            serviceCIDR: ${CP_SERVICE_CIDR}
           dnsDomain: ${CP_SERVICE_DNS_DOMAIN}
           dnsTunnelDomain: ${CP_TUNNEL_DNS_DOMAIN}
           provider: ${CP_PROVIDER}
@@ -647,8 +649,8 @@ helmCharts:
   repo:
     helm:
       url: ${CP_CHART_REPO}
-      username: ${CP_CHART_REPO_USER_NAME}
-      password: ${CP_CHART_REPO_TOKEN}
+      username: "${CP_CHART_REPO_USER_NAME}"
+      password: "${CP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -694,6 +696,12 @@ helmCharts:
         enabled: ${CP_INSTALL_MSG_CONTRIB}
       tp-cp-hawk:
         enabled: ${CP_INSTALL_HAWK}
+        tp-cp-hawk-infra-prometheus:
+          prometheus:
+            resources:
+              requests:
+                cpu: ${CP_RESOURCES_REQUEST_CPU}
+                memory: ${CP_RESOURCES_REQUEST_MEMORY}
       tp-cp-recipes:
         enabled: ${CP_INSTALL_RECIPES}
       tp-cp-integration:

diff --git a/docs/recipes/k8s/cloud/deploy-tp-aks.yaml b/docs/recipes/k8s/cloud/deploy-tp-aks.yaml
@@ -16,6 +16,8 @@ meta:
     # github
     GITHUB_TOKEN: ${GUI_GITHUB_TOKEN}
     TP_CHART_REPO: ${GUI_TP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"}
+    TP_CHART_REPO_USER_NAME: ${GUI_TP_CHART_REPO_USER_NAME}
+    TP_CHART_REPO_TOKEN: ${GUI_TP_CHART_REPO_TOKEN}
     PLATFORM_PROVISIONER_REPO: ${GUI_PLATFORM_PROVISIONER_REPO:-github.com/TIBCOSoftware/platform-provisioner}
 
     # Azure env
@@ -187,6 +189,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     content: |
@@ -230,6 +234,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     content: |
@@ -325,6 +331,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     content: |
@@ -396,6 +404,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     base64Encoded: false
@@ -438,6 +448,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     base64Encoded: false

diff --git a/docs/recipes/k8s/cloud/deploy-tp-eks.yaml b/docs/recipes/k8s/cloud/deploy-tp-eks.yaml
@@ -16,6 +16,8 @@ meta:
     # github
     GITHUB_TOKEN: ${GUI_GITHUB_TOKEN}
     TP_CHART_REPO: ${GUI_TP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"}
+    TP_CHART_REPO_USER_NAME: ${GUI_TP_CHART_REPO_USER_NAME}
+    TP_CHART_REPO_TOKEN: ${GUI_TP_CHART_REPO_TOKEN}
     PLATFORM_PROVISIONER_REPO: github.com/TIBCOSoftware/platform-provisioner
     # cluster
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME}
@@ -207,6 +209,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -313,6 +317,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -386,6 +392,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: false
     content: |
@@ -455,6 +463,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     content: |

diff --git a/docs/recipes/k8s/cloud/deploy-tp-gke.yaml b/docs/recipes/k8s/cloud/deploy-tp-gke.yaml
@@ -16,6 +16,8 @@ meta:
     # github
     GITHUB_TOKEN: ${GUI_GITHUB_TOKEN} # don't need it for public repo
     TP_CHART_REPO: ${GUI_TP_CHART_REPO:-"https://tibcosoftware.github.io/tp-helm-charts"}
+    TP_CHART_REPO_USER_NAME: ${GUI_TP_CHART_REPO_USER_NAME}
+    TP_CHART_REPO_TOKEN: ${GUI_TP_CHART_REPO_TOKEN}
     PLATFORM_PROVISIONER_REPO: ${GUI_PLATFORM_PROVISIONER_REPO:-github.com/TIBCOSoftware/platform-provisioner}
 
     # GCP setting
@@ -26,7 +28,8 @@ meta:
 
     # cluster
     TP_CLUSTER_NAME: ${GUI_TP_CLUSTER_NAME:-tp-cluster}
-    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-"1.30.5-gke.1014001"}
+    TP_CLUSTER_VERSION: ${GUI_TP_CLUSTER_VERSION:-"1.30"}
+    TP_CLUSTER_REGION: ${GUI_GCP_REGION:-us-west1}
     TP_AUTHORIZED_IP: ${GUI_TP_AUTHORIZED_IP} # your ip x.x.x.x/32
     TP_CLUSTER_VPC_CIDR: ${GUI_TP_CLUSTER_VPC_CIDR:-"10.0.0.0/20"}
     TP_CLUSTER_CIDR: ${GUI_TP_CLUSTER_CIDR:-"10.1.0.0/16"}
@@ -362,6 +365,8 @@ helmCharts:
   repo:
     helm:
       url: ${TP_CHART_REPO}
+      username: "${TP_CHART_REPO_USER_NAME}"
+      password: "${TP_CHART_REPO_TOKEN}"
   values:
     keepPrevious: true
     content: |

diff --git a/docs/recipes/k8s/cloud/scripts/gke/create-gke.sh b/docs/recipes/k8s/cloud/scripts/gke/create-gke.sh
@@ -107,5 +107,4 @@ gcloud beta container \
   --binauthz-evaluation-mode=DISABLED \
   --no-enable-managed-prometheus \
   --workload-pool "${GCP_PROJECT_ID}.svc.id.goog" \
-  --enable-shielded-nodes \
-  --node-locations "${GCP_REGION}-a"
+  --enable-shielded-nodes