diff --git a/charts/ping-devops/Chart.yaml b/charts/ping-devops/Chart.yaml index 17676581..5166af01 100644 --- a/charts/ping-devops/Chart.yaml +++ b/charts/ping-devops/Chart.yaml @@ -28,8 +28,9 @@ name: ping-devops # 0.3.5 - Refer to http://helm.pingidentity.com/release-notes/#release-035 # 0.3.6 - Refer to http://helm.pingidentity.com/release-notes/#release-036 # 0.3.7 - Refer to http://helm.pingidentity.com/release-notes/#release-037 +# 0.3.8 - Refer to http://helm.pingidentity.com/release-notes/#release-038 ######################################################################## -version: 0.3.7 +version: 0.3.8 description: All Ping Identity product images with integration type: application home: https://devops.pingidentity.com/ diff --git a/charts/ping-devops/templates/global/configmap.yaml b/charts/ping-devops/templates/global/configmap.yaml index da3da7d4..bc353dae 100644 --- a/charts/ping-devops/templates/global/configmap.yaml +++ b/charts/ping-devops/templates/global/configmap.yaml @@ -10,6 +10,7 @@ data: {{ include "global.private.host.port" (list $top $v "PA_ENGINE" "pingaccess") }} {{ include "global.private.host.port" (list $top $v "PA_ENGINE" "pingaccess-engine") }} {{ include "global.private.host.port" (list $top $v "PA_ADMIN" "pingaccess-admin") }} + {{ include "global.private.host.port" (list $top $v "PD_CONSOLE" "pingdataconsole") }} {{ include "global.private.host.port" (list $top $v "PDS_ENGINE" "pingdatasync") }} {{ include "global.private.host.port" (list $top $v "PDG_ENGINE" "pingdatagovernance") }} {{ include "global.private.host.port" (list $top $v "PDGP_ENGINE" "pingdatagovernancepap") }} @@ -23,6 +24,7 @@ data: {{ include "global.public.host.port" (list $top $v "PA_ENGINE" "pingaccess") }} {{ include "global.public.host.port" (list $top $v "PA_ENGINE" "pingaccess-engine") }} {{ include "global.public.host.port" (list $top $v "PA_ADMIN" "pingaccess-admin") }} + {{ include "global.public.host.port" (list $top $v "PD_CONSOLE" "pingdataconsole") }} {{ include "global.public.host.port" (list $top $v "PDS_ENGINE" "pingdatasync") }} {{ include "global.public.host.port" (list $top $v "PDG_ENGINE" "pingdatagovernance") }} {{ include "global.public.host.port" (list $top $v "PDGP_ENGINE" "pingdatagovernancepap") }} @@ -46,7 +48,7 @@ data: {{- range $serviceName, $val := .services }} {{- if ne $serviceName "clusterExternalDNSHostname" }} {{- if $val.dataService }} - {{ $envPrefix }}_{{ $serviceName | replace "-" "_" | upper }}_PRIVATE_PORT: {{ $val.servicePort | quote }} + {{ $envPrefix }}_PRIVATE_PORT_{{ $serviceName | replace "-" "_" | upper }}: {{ $val.servicePort | quote }} {{- end }} {{- end }} {{- end }} @@ -67,7 +69,7 @@ data: {{ $envPrefix }}_PUBLIC_HOSTNAME: {{ include "pinglib.ingress.hostname" (list $top $v .host) | quote }} {{- range .paths }} - {{ $envPrefix }}_{{ .backend.serviceName | replace "-" "_" | upper }}_PUBLIC_PORT: {{ (index $services .backend.serviceName).ingressPort | quote }} + {{ $envPrefix }}_PUBLIC_PORT_{{ .backend.serviceName | replace "-" "_" | upper }}: {{ (index $services .backend.serviceName).ingressPort | quote }} {{- end }} {{- end }} diff --git a/charts/ping-devops/templates/pinglib/_workload.tpl b/charts/ping-devops/templates/pinglib/_workload.tpl index b8b7add2..9dd34828 100644 --- a/charts/ping-devops/templates/pinglib/_workload.tpl +++ b/charts/ping-devops/templates/pinglib/_workload.tpl @@ -85,10 +85,10 @@ spec: {{/*--------------------- Environment -----------------*/}} envFrom: - configMapRef: - name: {{ $top.Release.Name }}-global-env-vars + name: {{ include "pinglib.addreleasename" (append . "global-env-vars") }} optional: true - configMapRef: - name: {{ $top.Release.Name }}-env-vars + name: {{ include "pinglib.addreleasename" (append . "env-vars") }} optional: true - configMapRef: name: {{ include "pinglib.fullname" . }}-env-vars diff --git a/charts/ping-devops/values.yaml b/charts/ping-devops/values.yaml index 1a681985..5c4c9527 100644 --- a/charts/ping-devops/values.yaml +++ b/charts/ping-devops/values.yaml @@ -209,12 +209,15 @@ global: tolerations: [] terminationGracePeriodSeconds: 30 + envFrom: [] # Additional envFrom configmap/secret references can be added # envFrom: - # - configMapRep: + # - configMapRef: # name: my-example-configmap + # optional: true # - secretRef: # name: my-example-secrets + # optional: true ############################################################ # Probes @@ -307,7 +310,7 @@ pingfederate-admin: SERVER_PROFILE_PATH: getting-started/pingfederate services: - admin: + https: servicePort: 9999 containerPort: 9999 ingressPort: 443 @@ -328,7 +331,7 @@ pingfederate-admin: paths: - path: / backend: - serviceName: admin + serviceName: https tls: - secretName: _defaultTlsSecret_ hosts: @@ -373,7 +376,7 @@ pingfederate-engine: # averageValue: 10000m services: - engine: + https: servicePort: 9031 containerPort: 9031 ingressPort: 443 @@ -394,7 +397,7 @@ pingfederate-engine: paths: - path: / backend: - serviceName: engine + serviceName: https tls: - secretName: _defaultTlsSecret_ hosts: @@ -585,11 +588,13 @@ pingaccess: SERVER_PROFILE_PATH: getting-started/pingaccess services: + # This will transition to https after PA 6.2 is available admin: servicePort: 9000 containerPort: 9000 ingressPort: 443 dataService: true + # This will transition to https after PA 6.2 is available engine: servicePort: 3000 containerPort: 3000 diff --git a/docs/release-notes.md b/docs/release-notes.md index 05d6f260..fc9d1be8 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,5 +1,36 @@ # Release Notes +## Release 0.3.8 + +* [Issue #56](https://github.com/pingidentity/helm-charts/issues/56) - Improved Default Naming on Global vars - PORTs + + In release 0.3.6, global-env-vars were created for PORTS. The naming structure used was + complex and difficult, primarily because a product can have several ports open on a particular + private and public host. The format will be more consistent as defined by the following: + + `{product-short-code with type}_{public or private}_{hostname or port}{_service if port}` + + An example with PD might look like (note the service names of `https` and `data-api`): + + ```yaml + PD_ENGINE_PUBLIC_PORT_HTTPS: 443 + PD_ENGINE_PUBLIC_PORT_DATA_API: 1443 + + PD_ENGINE_PRIVATE_PORT_HTTPS: 443 + PD_ENGINE_PRIVATE_PORT_DATA_API: 8443 + ``` + +* [Issue #62](https://github.com/pingidentity/helm-charts/issues/62) - + When creating configMapRef's, take into account the proper release name to include + + ConfigMapRef names in workloads were not consistent with the ConfigMaps created by default + when taking into account the `addReleaseNameToResource` setting of prepend, append or none. + This fixes that issue ensuring that config maps are consistent. + +* Added global-env private/public host/port for PingDataConsole, which was missing. +* Changed the default pingfederate-admin `admin` service name to `https` to reduce confusion. +* Changed the default pingfederate-engine `engine` service name to `https` to reduce confusion. + ## Release 0.3.7