Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/tibco-developer-hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.3.22
version: 1.3.27

appVersion: "1.3.0-HF1"
appVersion: "1.3.0-HF3"

dependencies:
- name: common
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# in the license file that is distributed with this file.

{{- $installDir := .Values.backstage.installDir -}}
{{ $cpHostname := (.Values.global.cp).cpHostname | required ".Values.global.cp.cpHostname is required." }}
---
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
Expand Down Expand Up @@ -170,6 +171,8 @@ spec:
env:
- name: APP_CONFIG_backend_listen_port
value: {{ .Values.backstage.containerPorts.backend | quote }}
- name: CP_URL
value: {{ $cpHostname }}
{{- if .Values.postgresql.enabled }}
- name: POSTGRES_HOST
value: {{ include "backstage.postgresql.host" . }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# This file is subject to the license terms contained
# in the license file that is distributed with this file.
{{ if eq .Values.publicApi.ingress.controllerName "nginx" -}}
{{ $cpHostname := (.Values.global.cp).cpHostname | required ".Values.global.cp.cpHostname is required." }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -15,11 +14,7 @@ metadata:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
nginx.ingress.kubernetes.io/upstream-vhost: {{ $cpHostname }}
nginx.ingress.kubernetes.io/rewrite-target: /.well-known/openid-configuration
nginx.ingress.kubernetes.io/configuration-snippet: |
proxy_set_header x-cp-host {{ $cpHostname }};
nginx.ingress.kubernetes.io/proxy-buffer-size: 16k
{{- with .Values.global.cp.resources.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
Expand All @@ -31,9 +26,9 @@ spec:
paths:
- backend:
service:
name: {{ include "common.names.fullname" . }}-wkc
name: {{ include "common.names.fullname" . }}
port:
number: 443
number: {{ .Values.service.ports.backend }}
path: /tibco/hub/.well-known/openid-configuration
pathType: Exact
{{- end }}
2 changes: 1 addition & 1 deletion charts/tibco-developer-hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ backstage:
# -- Backstage image name
name: dx-tibco-hub
# -- Backstage image tag (immutable tags are recommended)
tag: "591"
tag: "636-1.3.0-HF3"

# -- Specify a imagePullPolicy.
# Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down
4 changes: 2 additions & 2 deletions charts/tp-cp-tibcohub-contrib/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "1.3.5"
version: "1.3.7"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.3.0"
appVersion: "1.3.0-HF3"
4 changes: 0 additions & 4 deletions charts/tp-cp-tibcohub-contrib/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,3 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- include "cp-env.get" (dict "key" "CP_INSTANCE_ID" "default" "cp1" "required" "false" "Release" .Release )}}
{{- end }}

{{/* Control plane provider */}}
{{- define "tp-cp-tibcohub-contrib.cp-provider" -}}
{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false" "Release" .Release )}}
{{- end }}
7 changes: 6 additions & 1 deletion charts/tp-cp-tibcohub-contrib/templates/job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- name: SOURCE_DOCKER_IMAGE
value: "{{ include "tp-cp-tibcohub-contrib.image.registry" .}}/{{ include "tp-cp-tibcohub-contrib.image.repository" .}}/{{ .Values.tibcoHub.image.name }}:{{ .Values.tibcoHub.image.tag }}" # source docker image name
- name: IMAGE_TEMP_DIR
value: "/efs/tmp-{{ .Values.capability.name }}" # temporary directory to be used by container-image-extractor for downloading and extracting docker image
value: "/tmp/tmp-{{ .Values.capability.name }}" # temporary directory to be used by container-image-extractor for downloading and extracting docker image
- name: SOURCE_DIRS
value: {{ .Values.source.directory | quote }} # directory in SOURCE_DOCKER_IMAGE which needs to be copied to TARGET_DIRS
- name: TARGET_DIRS
Expand All @@ -52,12 +52,17 @@ spec:
- mountPath: /efs
name: store-vol
subPath: tsc/contributors
- mountPath: /tmp
name: temp
# mount this secret only if private container registry is configured for CP.
{{- if (include "tp-cp-tibcohub-contrib.container-registry.secret" .) }}
- mountPath: /tibco/containerregistry
name: container-registry-secret
{{- end }}
volumes:
- name: temp
emptyDir:
sizeLimit: 500Mi
- name: store-vol
persistentVolumeClaim:
claimName: {{ include "tp-cp-tibcohub-contrib.pvc-name" . }}
Expand Down
4 changes: 2 additions & 2 deletions charts/tp-cp-tibcohub-recipes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ name: tp-cp-tibcohub-recipes
description: TIBCO Developer Hub Data Plane Recipes
home: https://github.com/tibco/tp-dev-hub.git
type: application
version: 1.3.20
appVersion: "1.3.0-HF1"
version: 1.3.26
appVersion: "1.3.0-HF3"
keywords:
- tibco-platform
- control-plane
Expand Down
5 changes: 0 additions & 5 deletions charts/tp-cp-tibcohub-recipes/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,3 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- define "tp-cp-tibcohub-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-tibcohub-recipes.cp-provider" -}}
{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false" "Release" .Release )}}
{{- end }}
2 changes: 1 addition & 1 deletion charts/tp-cp-tibcohub-recipes/templates/tibcohub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ data:
recipe:
helmCharts:
- name: tibco-developer-hub
version: 1.3.22
version: 1.3.27
namespace: ${NAMESPACE}
repository:
chartMuseum:
Expand Down
Loading