Merged 1.3.0-HF3 changes for BW and flogo charts (#124)

TIBCOSoftware · Dec 10, 2024 · 0c6e85a · 0c6e85a
1 parent 91a923d
commit 0c6e85a
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 81 deletions.
diff --git a/charts/bwprovisioner/Chart.yaml b/charts/bwprovisioner/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: bwprovisioner
-version: 1.3.13
-appVersion: "1.3.0"
+version: 1.3.16
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Dataplane Capabilty -- BW Provisioner
 home: https://github.com/tibco/tp-iapp-bw-provisioner.git
 icon: https://pbs.twimg.com/profile_images/1064638558110007296/K6HqaXwh_400x400.jpg

diff --git a/charts/bwprovisioner/templates/ingress_public_nginx.yaml b/charts/bwprovisioner/templates/ingress_public_nginx.yaml
@@ -11,15 +11,9 @@ metadata:
     nginx.ingress.kubernetes.io/auth-response-headers: X-Auth-Request-User,X-Auth-Request-Email,X-Forwarded-Access-Token,X-Auth-Request-Access-Token,X-Atmosphere-Token
     nginx.ingress.kubernetes.io/auth-signin: https://{{ .Values.publicApi.ingress.config.fqdn }}{{ .Values.publicApi.ingress.config.pathPrefix }}/oauth2/start?rd=$escaped_request_uri
     nginx.ingress.kubernetes.io/auth-url: https://{{ .Values.publicApi.ingress.config.fqdn }}{{ .Values.publicApi.ingress.config.pathPrefix }}/oauth2/auth
-    nginx.ingress.kubernetes.io/configuration-snippet: "auth_request_set $token $upstream_http_authorization;\nproxy_set_header
-      Authorization $token;\nproxy_pass_header Authorization; \n"
     nginx.ingress.kubernetes.io/proxy-buffer-size: 16k
     nginx.ingress.kubernetes.io/proxy-body-size: "200m"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
-    nginx.ingress.kubernetes.io/auth-snippet: |
-      if ( $request_uri !~ "{{ .Values.publicApi.ingress.config.pathPrefix }}/(.*)" ) {
-            return 200;
-      }
     nginx.ingress.kubernetes.io/x-forwarded-prefix: {{ .Values.publicApi.ingress.config.pathPrefix }}
     nginx.ingress.kubernetes.io/use-regex: "true"
     {{- with .Values.global.cp.resources.ingress.annotations }}

diff --git a/charts/flogoprovisioner/Chart.yaml b/charts/flogoprovisioner/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: flogoprovisioner
-version: 1.3.16
-appVersion: "1.3.0-HF1"
+version: 1.3.18
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Dataplane Capabilty -- Flogo Provisioner
 home: https://github.com/tibco/tp-iapp-flogo-provisioner.git
 icon: https://pbs.twimg.com/profile_images/1064638558110007296/K6HqaXwh_400x400.jpg

diff --git a/charts/flogoprovisioner/templates/ingress_public_nginx.yaml b/charts/flogoprovisioner/templates/ingress_public_nginx.yaml
@@ -11,14 +11,8 @@ metadata:
     nginx.ingress.kubernetes.io/auth-response-headers: X-Auth-Request-User,X-Auth-Request-Email,X-Forwarded-Access-Token,X-Auth-Request-Access-Token,X-Atmosphere-Token
     nginx.ingress.kubernetes.io/auth-signin: https://{{ .Values.publicApi.ingress.config.fqdn }}{{ .Values.publicApi.ingress.config.pathPrefix }}/oauth2/start?rd=$escaped_request_uri
     nginx.ingress.kubernetes.io/auth-url: https://{{ .Values.publicApi.ingress.config.fqdn }}{{ .Values.publicApi.ingress.config.pathPrefix }}/oauth2/auth
-    nginx.ingress.kubernetes.io/configuration-snippet: "auth_request_set $token $upstream_http_authorization;\nproxy_set_header
-      Authorization $token;\nproxy_pass_header Authorization; \n"
     nginx.ingress.kubernetes.io/proxy-buffer-size: 16k
     nginx.ingress.kubernetes.io/rewrite-target: /$1
-    nginx.ingress.kubernetes.io/auth-snippet: |
-      if ( $request_uri !~ "{{ .Values.publicApi.ingress.config.pathPrefix }}/(.*)" ) {
-            return 200;
-      }
     nginx.ingress.kubernetes.io/x-forwarded-prefix: {{ .Values.publicApi.ingress.config.pathPrefix }}
     nginx.ingress.kubernetes.io/use-regex: "true"
     {{- with .Values.global.cp.resources.ingress.annotations }}

diff --git a/charts/tp-cp-bwce-recipes/Chart.yaml b/charts/tp-cp-bwce-recipes/Chart.yaml
@@ -6,8 +6,8 @@ apiVersion: v2
 name: tp-cp-bwce-recipes
 description: TIBCO Platform BusinessWorks Data Plane recipes
 type: application
-version: 1.3.35
-appVersion: "1.3.0"
+version: 1.3.39
+appVersion: "1.3.0-HF3"
 keywords:
   - tibco-platform
   - control-plane

diff --git a/charts/tp-cp-bwce-recipes/templates/_helpers.tpl b/charts/tp-cp-bwce-recipes/templates/_helpers.tpl
@@ -105,8 +105,3 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "dp-bwce-recipes.cp-instance-id" }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
-
-{{/* Control plane provider */}}
-{{- define "dp-bwce-recipes.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
diff --git a/charts/tp-cp-bwce-recipes/templates/bwce.yaml b/charts/tp-cp-bwce-recipes/templates/bwce.yaml
@@ -84,7 +84,7 @@ data:
       helmCharts:
         - name: bwprovisioner
           namespace: ${NAMESPACE}
-          version: "1.3.13"
+          version: "1.3.16"
           repository:
             chartMuseum:
               host: ${HELM_REPO}

diff --git a/charts/tp-cp-bwce-utilities/Chart.yaml b/charts/tp-cp-bwce-utilities/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: tp-cp-bwce-utilities
-version: 1.3.13
-appVersion: 1.3.0
+version: 1.3.15
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- BWCE Utilities
 dependencies:
   - name: bwce-utilities

diff --git a/charts/tp-cp-bwce-utilities/charts/bwce-utilities/templates/_helpers.tpl b/charts/tp-cp-bwce-utilities/charts/bwce-utilities/templates/_helpers.tpl
@@ -92,11 +92,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "bwce-utilities.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "bwce-utilities.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-flogo-recipes/Chart.yaml b/charts/tp-cp-flogo-recipes/Chart.yaml
@@ -6,8 +6,8 @@ apiVersion: v2
 name: tp-cp-flogo-recipes
 description: TIBCO Platform Flogo Data Plane recipes
 type: application
-version: 1.3.30
-appVersion: "1.3.0-HF1"
+version: 1.3.33
+appVersion: "1.3.0-HF3"
 keywords:
   - tibco-platform
   - control-plane

diff --git a/charts/tp-cp-flogo-recipes/templates/_helpers.tpl b/charts/tp-cp-flogo-recipes/templates/_helpers.tpl
@@ -106,8 +106,3 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "tp-cp-flogo-recipes.cp-instance-id" }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
-
-{{/* Control plane provider */}}
-{{- define "tp-cp-flogo-recipes.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
diff --git a/charts/tp-cp-flogo-recipes/templates/flogo.yaml b/charts/tp-cp-flogo-recipes/templates/flogo.yaml
@@ -74,7 +74,7 @@ data:
       helmCharts:
         - name: flogoprovisioner
           namespace: ${NAMESPACE}
-          version: "1.3.16"
+          version: "1.3.18"
           repository:
             chartMuseum:
               host: ${HELM_REPO}

diff --git a/charts/tp-cp-flogo-utilities/Chart.yaml b/charts/tp-cp-flogo-utilities/Chart.yaml
@@ -4,8 +4,8 @@
 #
 apiVersion: v2
 name: tp-cp-flogo-utilities
-version: 1.3.20
-appVersion: 1.3.0
+version: 1.3.22
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- FLOGO Utilities
 dependencies:
   - name: flogo-utilities

diff --git a/charts/tp-cp-flogo-utilities/charts/flogo-utilities/templates/_helpers.tpl b/charts/tp-cp-flogo-utilities/charts/flogo-utilities/templates/_helpers.tpl
@@ -98,11 +98,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "flogo-utilities.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "flogo-utilities.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-integration-bw5/Chart.yaml b/charts/tp-cp-integration-bw5/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: tp-cp-integration-bw5
-version: 1.3.22
-appVersion: 1.3.0
+version: 1.3.24
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- BW5 Integration
 dependencies:
   - name: bw5-webserver

diff --git a/charts/tp-cp-integration-bw5/charts/bw5-webserver/templates/_helpers.tpl b/charts/tp-cp-integration-bw5/charts/bw5-webserver/templates/_helpers.tpl
@@ -113,11 +113,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "bw5-webserver.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "bw5-webserver.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-integration-bw6/Chart.yaml b/charts/tp-cp-integration-bw6/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: tp-cp-integration-bw6
-version: 1.3.32
-appVersion: 1.3.0
+version: 1.3.34
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- BW6 Integration
 dependencies:
   - name: bw6-webserver

diff --git a/charts/tp-cp-integration-bw6/charts/bw6-webserver/templates/_helpers.tpl b/charts/tp-cp-integration-bw6/charts/bw6-webserver/templates/_helpers.tpl
@@ -113,11 +113,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "bw6-webserver.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "bw6-webserver.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-integration-bwce/Chart.yaml b/charts/tp-cp-integration-bwce/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: tp-cp-integration-bwce
-version: 1.3.19
-appVersion: 1.3.0
+version: 1.3.21
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- Integration for BWCE
 dependencies:
   - name: bw-webserver

diff --git a/charts/tp-cp-integration-bwce/charts/bw-webserver/templates/_helpers.tpl b/charts/tp-cp-integration-bwce/charts/bw-webserver/templates/_helpers.tpl
@@ -115,11 +115,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "bw-webserver.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "bw-webserver.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-integration-common/Chart.yaml b/charts/tp-cp-integration-common/Chart.yaml
@@ -4,8 +4,8 @@
 
 apiVersion: v2
 name: tp-cp-integration-common
-version: 1.3.5
-appVersion: 1.3.0
+version: 1.3.7
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- Integration Common
 dependencies:
   - name: fileserver

diff --git a/charts/tp-cp-integration-common/charts/fileserver/templates/_helpers.tpl b/charts/tp-cp-integration-common/charts/fileserver/templates/_helpers.tpl
@@ -86,11 +86,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "fileserver.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "fileserver.service-account-name" }}
 {{- if .Values.serviceAccount }}

diff --git a/charts/tp-cp-integration-flogo/Chart.yaml b/charts/tp-cp-integration-flogo/Chart.yaml
@@ -4,8 +4,8 @@
 #
 apiVersion: v2
 name: tp-cp-integration-flogo
-version: 1.3.12
-appVersion: 1.3.0
+version: 1.3.14
+appVersion: "1.3.0-HF3"
 description: TIBCO Platform Control Plane -- Integration for Flogo
 dependencies:
   - name: flogo-webserver

diff --git a/charts/tp-cp-integration-flogo/charts/flogo-webserver/templates/_helpers.tpl b/charts/tp-cp-integration-flogo/charts/flogo-webserver/templates/_helpers.tpl
@@ -103,11 +103,6 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
   {{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false"  "Release" .Release )}}
 {{- end }}
 
-{{/* Control plane provider */}}
-{{- define "flogo-webserver.cp-provider" -}}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-
 {{/* Service account configured for control plane. fail if service account not exist */}}
 {{- define "flogo-webserver.service-account-name" }}
 {{- if .Values.serviceAccount }}