Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HTTP and HTTPS proxy to post-install-job #296

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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/px-central/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ keywords:
name: px-central
sources:
- https://github.com/portworx/helm/tree/master/charts/px-central
version: 2.0.1
appVersion: 2.0.1
version: 2.0.2
appVersion: 2.0.2
name: px-central
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{{- define "keykloak.proxy" -}}
{{- if .Values.proxyHTTPEndpoint -}}
{{- printf ";%s" .Values.proxyHTTPEndpoint -}}
{{- end -}}
{{- if .Values.proxyHTTPSEndpoint -}}
{{- printf ";%s" .Values.proxyHTTPSEndpoint -}}
{{- end -}}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ data:
batch
## Sets the node identifier to the node name (= pod name). Node identifiers have to be unique. They can have a
## maximum length of 23 characters. Thus, the chart's fullname template truncates its length accordingly.
{{- if or .Values.proxyHTTPEndpoint .Values.proxyHTTPSEndpoint }}
/subsystem=keycloak-server/spi=connectionsHttpClient/provider=default:write-attribute(name=properties.proxy-mappings,value=[".*{{ template "keykloak.proxy" . }}"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if both http and https proxies are defined?

{{- end }}
/subsystem=transactions:write-attribute(name=node-identifier, value=${jboss.node.name})


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ spec:
image: {{ printf "%s/%s/%s:%s" .Values.images.postInstallSetupImage.registry .Values.images.postInstallSetupImage.repo .Values.images.postInstallSetupImage.imageName .Values.images.postInstallSetupImage.tag }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
env:
{{- if .Values.proxyHTTPEndpoint }}
- name: PX_HTTP_PROXY
value: {{ .Values.proxyHTTPEndpoint }}
{{- end }}
{{- if .Values.proxyHTTPSEndpoint }}
- name: PX_HTTPS_PROXY
value: {{ .Values.proxyHTTPSEndpoint }}
{{- end }}
- name: LOG_LEVEL
value: INFO
- name: UPDATE_ADMIN_USER_PROFILE
Expand Down
3 changes: 3 additions & 0 deletions charts/px-central/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ cassandraPassword: cassandra

operatorToChartUpgrade: false

proxyHTTPEndpoint: ""
proxyHTTPSEndpoint: ""

securityContext:
runAsUser: 1000
fsGroup: 1000
Expand Down
60 changes: 41 additions & 19 deletions repo/staging/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ entries:
px-backup:
- apiVersion: v1
appVersion: 1.2.0-rc1
created: "2020-12-18T14:46:54.373428+05:30"
created: "2021-09-14T21:23:46.856328+05:30"
description: A Helm chart for installing PX-Backup with PX-Central on Kubernetes
and Openshift
digest: 4f94b405cab271965ecd893ae1409b2618583c1bb24fa56f9316de987820dbbf
Expand All @@ -21,11 +21,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-backup
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-backup-1.2.1.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-backup-1.2.1.tgz
version: 1.2.1
- apiVersion: v1
appVersion: 1.2.0
created: "2020-12-18T14:46:54.355576+05:30"
created: "2021-09-14T21:23:46.854944+05:30"
description: A Helm chart for installing PX-Backup with PX-Central on Kubernetes
and Openshift
digest: c27ecd2be0fd275057af598e78a0be89fb7b1d561df575058c9a926e4eb12274
Expand All @@ -43,11 +43,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-backup
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-backup-1.2.0.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-backup-1.2.0.tgz
version: 1.2.0
- apiVersion: v1
appVersion: 1.1.1
created: "2020-12-18T14:46:54.352872+05:30"
created: "2021-09-14T21:23:46.853653+05:30"
description: A Helm chart for installing PX-Backup with PX-Central on Kubernetes
and Openshift
digest: 73215fe714e1a3af6bdf958eb06791b90f878b363c85b3adf4c8cfe664a08202
Expand All @@ -65,12 +65,34 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-backup
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-backup-1.1.6.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-backup-1.1.6.tgz
version: 1.1.6
px-central:
- apiVersion: v1
appVersion: 2.0.2
created: "2021-09-14T21:23:46.862769+05:30"
description: A Helm chart for installing PX-Central on Kubernetes and Openshift
digest: 49f90ceb7b1647cf02592d795d86920bb711c21dd5e11e048925e39a87e461e9
home: https://portworx.com/
icon: https://raw.githubusercontent.com/portworx/helm/master/doc/media/px-logo.png
keywords:
- px-backup
- storage
- persistent disk
- pvc
- portworx
- px-central
- lighthouse
name: px-central
sources:
- https://github.com/portworx/helm/tree/master/charts/px-central
urls:
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-central-2.0.2.tgz
version: 2.0.2
px-license-server:
- apiVersion: v1
appVersion: 1.0.0
created: "2020-12-18T14:46:54.382559+05:30"
created: "2021-09-14T21:23:46.865048+05:30"
description: A Helm chart for install and configure PX-License-Server on Kubernetes
and Openshift
digest: c84c506cd8fe3794692215b888e481be16b67df7dabac6a084859ae414a89c65
Expand All @@ -83,11 +105,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-license-server
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-license-server-1.2.0.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-license-server-1.2.0.tgz
version: 1.2.0
- apiVersion: v1
appVersion: 1.0.0
created: "2020-12-18T14:46:54.381177+05:30"
created: "2021-09-14T21:23:46.863897+05:30"
description: A Helm chart for install and configure PX-License-Server on Kubernetes
and Openshift
digest: d48483e2a79be3f1cc3e8306abb118db0fd9da5bf2b28bae4b2864d50fc0b14d
Expand All @@ -100,11 +122,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-license-server
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-license-server-1.1.1.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-license-server-1.1.1.tgz
version: 1.1.1
- apiVersion: v1
appVersion: 1.0.0
created: "2020-12-18T14:46:54.375481+05:30"
created: "2021-09-14T21:23:46.863359+05:30"
description: A Helm chart for install and configure PX-License-Server on Kubernetes
and Openshift
digest: 76a226032c34459cb01ad74e66f90c863d7686c89e85828f5346b13395b7222b
Expand All @@ -117,12 +139,12 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-license-server
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-license-server-1.1.0.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-license-server-1.1.0.tgz
version: 1.1.0
px-monitor:
- apiVersion: v1
appVersion: 1.2.0
created: "2020-12-18T14:46:54.406603+05:30"
created: "2021-09-14T21:23:46.876903+05:30"
description: A Helm chart for install and configure PX-Monitor on Kubernetes and
Openshift
digest: 8b7a4ea654c15a5ca1bfe712a4003795a69f9af9cf28b348d48755c1900da58c
Expand All @@ -138,11 +160,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-monitor
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-monitor-1.2.0.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-monitor-1.2.0.tgz
version: 1.2.0
- apiVersion: v1
appVersion: 1.1.1
created: "2020-12-18T14:46:54.396979+05:30"
created: "2021-09-14T21:23:46.87276+05:30"
description: A Helm chart for install and configure PX-Monitor on Kubernetes and
Openshift
digest: f84da236c3ae70ea883d1a23e1a266b649d3eaeb39ba5850432f0baff4f12701
Expand All @@ -158,11 +180,11 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-monitor
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-monitor-1.1.2.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-monitor-1.1.2.tgz
version: 1.1.2
- apiVersion: v1
appVersion: 1.1.1
created: "2020-12-18T14:46:54.389586+05:30"
created: "2021-09-14T21:23:46.868621+05:30"
description: A Helm chart for install and configure PX-Monitor on Kubernetes and
Openshift
digest: 05f3c71e54ea1c0df623762ab86b9c2eb90853e250d33cb385f66d7fc7b433a9
Expand All @@ -178,6 +200,6 @@ entries:
sources:
- https://github.com/portworx/helm/tree/master/charts/px-monitor
urls:
- https://raw.githubusercontent.com/portworx/helm/1.2.1/repo/staging/px-monitor-1.1.1.tgz
- https://raw.githubusercontent.com/portworx/helm/PB-1873/repo/staging/px-monitor-1.1.1.tgz
version: 1.1.1
generated: "2020-12-18T14:46:54.347605+05:30"
generated: "2021-09-14T21:23:46.852205+05:30"
Binary file added repo/staging/px-central-2.0.2.tgz
Binary file not shown.