diff --git a/stable/guacamole-client/4.0.26/CHANGELOG.md b/stable/guacamole-client/4.0.27/CHANGELOG.md similarity index 91% rename from stable/guacamole-client/4.0.26/CHANGELOG.md rename to stable/guacamole-client/4.0.27/CHANGELOG.md index 304e442fe9b..c18a1292ae3 100644 --- a/stable/guacamole-client/4.0.26/CHANGELOG.md +++ b/stable/guacamole-client/4.0.27/CHANGELOG.md @@ -2,6 +2,15 @@ +## [guacamole-client-4.0.27](https://github.com/truecharts/apps/compare/guacamole-client-4.0.26...guacamole-client-4.0.27) (2022-07-28) + +### Chore + +- prepare env's for next update and add proxy options ([#3329](https://github.com/truecharts/apps/issues/3329)) + + + + ## [guacamole-client-4.0.26](https://github.com/truecharts/apps/compare/guacamole-client-4.0.25...guacamole-client-4.0.26) (2022-07-26) ### Chore @@ -88,12 +97,3 @@ ## [guacamole-client-4.0.19](https://github.com/truecharts/apps/compare/guacamole-client-4.0.18...guacamole-client-4.0.19) (2022-07-19) - -### Chore - -- Update Readme and Description on SCALE - - - -## [guacamole-client-4.0.18](https://github.com/truecharts/apps/compare/guacamole-client-4.0.17...guacamole-client-4.0.18) (2022-07-14) - diff --git a/stable/guacamole-client/4.0.26/Chart.lock b/stable/guacamole-client/4.0.27/Chart.lock similarity index 85% rename from stable/guacamole-client/4.0.26/Chart.lock rename to stable/guacamole-client/4.0.27/Chart.lock index 367a4dd17ac..70da4ae6db4 100644 --- a/stable/guacamole-client/4.0.26/Chart.lock +++ b/stable/guacamole-client/4.0.27/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.truecharts.org/ version: 8.0.48 digest: sha256:06eed2d910d06ee059a0eed8277d806937d457340e3f510c63a55c1b8e5ce14f -generated: "2022-07-26T10:56:38.21996196Z" +generated: "2022-07-28T13:07:34.163319219Z" diff --git a/stable/guacamole-client/4.0.26/Chart.yaml b/stable/guacamole-client/4.0.27/Chart.yaml similarity index 98% rename from stable/guacamole-client/4.0.26/Chart.yaml rename to stable/guacamole-client/4.0.27/Chart.yaml index a89f449029f..768ee58a356 100644 --- a/stable/guacamole-client/4.0.26/Chart.yaml +++ b/stable/guacamole-client/4.0.27/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://hub.docker.com/r/guacamole/guacamole - http://guacamole.incubator.apache.org/doc/gug/introduction.html type: application -version: 4.0.26 +version: 4.0.27 annotations: truecharts.org/catagories: | - utilities diff --git a/stable/guacamole-client/4.0.26/README.md b/stable/guacamole-client/4.0.27/README.md similarity index 98% rename from stable/guacamole-client/4.0.26/README.md rename to stable/guacamole-client/4.0.27/README.md index 172cccafaf6..8dff94ccf9a 100644 --- a/stable/guacamole-client/4.0.26/README.md +++ b/stable/guacamole-client/4.0.27/README.md @@ -1,6 +1,6 @@ # guacamole-client -![Version: 4.0.26](https://img.shields.io/badge/Version-4.0.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) +![Version: 4.0.27](https://img.shields.io/badge/Version-4.0.27-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square) Apache Guacamole is a clientless remote desktop gateway. diff --git a/stable/guacamole-client/4.0.26/app-readme.md b/stable/guacamole-client/4.0.27/app-readme.md similarity index 100% rename from stable/guacamole-client/4.0.26/app-readme.md rename to stable/guacamole-client/4.0.27/app-readme.md diff --git a/stable/guacamole-client/4.0.26/charts/common-10.4.8.tgz b/stable/guacamole-client/4.0.27/charts/common-10.4.8.tgz similarity index 100% rename from stable/guacamole-client/4.0.26/charts/common-10.4.8.tgz rename to stable/guacamole-client/4.0.27/charts/common-10.4.8.tgz diff --git a/stable/guacamole-client/4.0.26/charts/postgresql-8.0.48.tgz b/stable/guacamole-client/4.0.27/charts/postgresql-8.0.48.tgz similarity index 100% rename from stable/guacamole-client/4.0.26/charts/postgresql-8.0.48.tgz rename to stable/guacamole-client/4.0.27/charts/postgresql-8.0.48.tgz diff --git a/stable/guacamole-client/4.0.26/ix_values.yaml b/stable/guacamole-client/4.0.27/ix_values.yaml similarity index 88% rename from stable/guacamole-client/4.0.26/ix_values.yaml rename to stable/guacamole-client/4.0.27/ix_values.yaml index 20aeddeb116..a33f1ae315f 100644 --- a/stable/guacamole-client/4.0.26/ix_values.yaml +++ b/stable/guacamole-client/4.0.27/ix_values.yaml @@ -18,11 +18,10 @@ service: targetPort: 8080 env: + # Will probably be removed on 1.5.0 (https://github.com/apache/guacamole-client/pull/717) POSTGRES_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" POSTGRES_PORT: 5432 - GUACD_HOSTNAME: "localhost" - GUACD_PORT: 4822 POSTGRES_HOSTNAME: secretKeyRef: name: dbcreds @@ -31,6 +30,20 @@ env: secretKeyRef: name: dbcreds key: postgresql-password + # New format + POSTGRESQL_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password + POSTGRESQL_HOSTNAME: + secretKeyRef: + name: dbcreds + key: plainhost + POSTGRESQL_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" + POSTGRESQL_USER: "{{ .Values.postgresql.postgresqlUsername }}" + POSTGRESQL_PORT: 5432 + GUACD_HOSTNAME: "localhost" + GUACD_PORT: 4822 envFrom: - configMapRef: @@ -140,6 +153,14 @@ saml: # SAML_COMPRESS_RESPONSE: # SAML_GROUP_ATTRIBUTE: +proxy: + {} + # REMOTE_IP_VALVE_ENABLED: false + # PROXY_BY_HEADER: "" + # PROXY_PROTOCOL_HEADER: "" + # PROXY_IP_HEADER: "" + # PROXY_ALLOWED_IPS_REGEX: "" + postgresql: enabled: true existingSecret: "dbcreds" @@ -188,13 +209,13 @@ initContainers: 2-initdb: image: "{{ .Values.multiinitImage.repository }}:{{ .Values.multiinitImage.tag }}" env: - - name: POSTGRES_DATABASE + - name: POSTGRESQL_DATABASE value: "{{ .Values.postgresql.postgresqlDatabase }}" - - name: POSTGRES_USER + - name: POSTGRESQL_USER value: "{{ .Values.postgresql.postgresqlUsername }}" - - name: POSTGRES_PORT + - name: POSTGRESQL_PORT value: "5432" - - name: POSTGRES_HOSTNAME + - name: POSTGRESQL_HOSTNAME valueFrom: secretKeyRef: name: dbcreds @@ -210,12 +231,12 @@ initContainers: command: ["/bin/sh", "-c"] args: - |- - psql -h "$POSTGRES_HOSTNAME" -d "$POSTGRES_DATABASE" -U "$POSTGRES_USER" -p "$POSTGRES_PORT" -o '/dev/null' -c 'SELECT * FROM public.guacamole_user' + psql -h "$POSTGRESQL_HOSTNAME" -d "$POSTGRESQL_DATABASE" -U "$POSTGRESQL_USER" -p "$POSTGRESQL_PORT" -o '/dev/null' -c 'SELECT * FROM public.guacamole_user' if [ $? -eq 0 ]; then echo "DB already initialized. Skipping..." else echo "Initializing DB's schema..." - psql -h "$POSTGRES_HOSTNAME" -d "$POSTGRES_DATABASE" -U "$POSTGRES_USER" -p "$POSTGRES_PORT" -a -w -f /initdbdata/initdb.sql + psql -h "$POSTGRESQL_HOSTNAME" -d "$POSTGRESQL_DATABASE" -U "$POSTGRESQL_USER" -p "$POSTGRESQL_PORT" -a -w -f /initdbdata/initdb.sql if [ $? -eq 0 ]; then echo "DB's schema initialized successfully!" exit 0 diff --git a/stable/guacamole-client/4.0.26/questions.yaml b/stable/guacamole-client/4.0.27/questions.yaml similarity index 99% rename from stable/guacamole-client/4.0.26/questions.yaml rename to stable/guacamole-client/4.0.27/questions.yaml index 9284bcbcb22..7163e8a200e 100644 --- a/stable/guacamole-client/4.0.26/questions.yaml +++ b/stable/guacamole-client/4.0.27/questions.yaml @@ -192,114 +192,6 @@ questions: required: true default: 4822 - - variable: TZ - label: "Timezone" - group: "Container Configuration" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" - - - variable: envList - label: "Image environment" - group: "Container Configuration" - schema: - type: list - default: [] - items: - - variable: envItem - label: "Environment Variable" - schema: - additional_attrs: true - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - - variable: expertpodconf - group: "Container Configuration" - label: "Show Expert Config" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: tty - label: "Enable TTY" - description: "Determines whether containers in a pod runs with TTY enabled. By default pod has it disabled." - group: "Workload Details" - schema: - type: boolean - default: false - - variable: stdin - label: "Enable STDIN" - description: "Determines whether containers in a pod runs with stdin enabled. By default pod has it disabled." - group: "Workload Details" - schema: - type: boolean - default: false - - variable: termination - group: "Container Configuration" - label: "Termination settings" - schema: - additional_attrs: true - type: dict - attrs: - - variable: gracePeriodSeconds - label: "Grace Period Seconds" - schema: - type: int - default: 10 - - variable: podLabelsList - group: "Container Configuration" - label: "Pod Labels" - schema: - type: list - default: [] - items: - - variable: podLabelItem - label: "Label" - schema: - additional_attrs: true - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - - variable: podAnnotationsList - group: "Container Configuration" - label: "Pod Annotations" - schema: - type: list - default: [] - items: - - variable: podAnnotationItem - label: "Label" - schema: - additional_attrs: true - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - variable: general group: "App Configuration" label: "General Configuration" @@ -921,7 +813,148 @@ questions: schema: type: string default: "" + - variable: proxy + group: "App Configuration" + label: "Proxy Configuration" + schema: + additional_attrs: true + type: dict + attrs: + - variable: REMOTE_IP_VALVE_ENABLED + label: "Enable Proxy" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: PROXY_BY_HEADER + label: "Proxy by Header (Leave empty for default)" + schema: + type: string + default: "" + - variable: PROXY_PROTOCOL_HEADER + label: "Proxy Protocol Header (Leave empty for default)" + schema: + type: string + default: "" + - variable: PROXY_IP_HEADER + label: "Proxy IP Header (Leave empty for default)" + schema: + type: string + default: "" + - variable: PROXY_ALLOWED_IPS_REGEX + label: "Proxy Allowed IP Regex (Leave empty for default)" + schema: + type: string + default: "" + - variable: TZ + label: "Timezone" + group: "Container Configuration" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" + - variable: envList + label: "Image environment" + group: "Container Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string + + - variable: expertpodconf + group: "Container Configuration" + label: "Show Expert Config" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: tty + label: "Enable TTY" + description: "Determines whether containers in a pod runs with TTY enabled. By default pod has it disabled." + group: "Workload Details" + schema: + type: boolean + default: false + - variable: stdin + label: "Enable STDIN" + description: "Determines whether containers in a pod runs with stdin enabled. By default pod has it disabled." + group: "Workload Details" + schema: + type: boolean + default: false + - variable: termination + group: "Container Configuration" + label: "Termination settings" + schema: + additional_attrs: true + type: dict + attrs: + - variable: gracePeriodSeconds + label: "Grace Period Seconds" + schema: + type: int + default: 10 + - variable: podLabelsList + group: "Container Configuration" + label: "Pod Labels" + schema: + type: list + default: [] + items: + - variable: podLabelItem + label: "Label" + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string + + - variable: podAnnotationsList + group: "Container Configuration" + label: "Pod Annotations" + schema: + type: list + default: [] + items: + - variable: podAnnotationItem + label: "Label" + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string - variable: service group: "Networking and Services" label: "Configure Service(s)" diff --git a/stable/guacamole-client/4.0.26/templates/_configmap.tpl b/stable/guacamole-client/4.0.27/templates/_configmap.tpl similarity index 92% rename from stable/guacamole-client/4.0.26/templates/_configmap.tpl rename to stable/guacamole-client/4.0.27/templates/_configmap.tpl index 6806fcc90ad..e877c003822 100644 --- a/stable/guacamole-client/4.0.26/templates/_configmap.tpl +++ b/stable/guacamole-client/4.0.27/templates/_configmap.tpl @@ -220,4 +220,23 @@ data: SAML_GROUP_ATTRIBUTE: {{ .Values.saml.SAML_GROUP_ATTRIBUTE | quote }} {{- end }} {{- end }} + {{/* PROXY */}} + {{- if .Values.proxy.REMOTE_IP_VALVE_ENABLED }} + REMOTE_IP_VALVE_ENABLED: {{ .Values.proxy.REMOTE_IP_VALVE_ENABLED | quote }} + {{- if .Values.proxy.PROXY_BY_HEADER }} + PROXY_BY_HEADER: {{ .Values.proxy.PROXY_BY_HEADER | quote }} + {{- end }} + {{- if .Values.proxy.PROXY_PROTOCOL_HEADER }} + PROXY_PROTOCOL_HEADER: {{ .Values.proxy.PROXY_PROTOCOL_HEADER | quote }} + {{- end }} + {{- if .Values.proxy.PROXY_PROTOCOL_HEADER }} + PROXY_PROTOCOL_HEADER: {{ .Values.proxy.PROXY_PROTOCOL_HEADER | quote }} + {{- end }} + {{- if .Values.proxy.PROXY_IP_HEADER }} + PROXY_IP_HEADER: {{ .Values.proxy.PROXY_IP_HEADER | quote }} + {{- end }} + {{- if .Values.proxy.PROXY_ALLOWED_IPS_REGEX }} + PROXY_ALLOWED_IPS_REGEX: {{ .Values.proxy.PROXY_ALLOWED_IPS_REGEX | quote }} + {{- end }} + {{- end }} {{- end -}} diff --git a/stable/guacamole-client/4.0.26/templates/common.yaml b/stable/guacamole-client/4.0.27/templates/common.yaml similarity index 100% rename from stable/guacamole-client/4.0.26/templates/common.yaml rename to stable/guacamole-client/4.0.27/templates/common.yaml diff --git a/stable/guacamole-client/4.0.26/values.yaml b/stable/guacamole-client/4.0.27/values.yaml similarity index 100% rename from stable/guacamole-client/4.0.26/values.yaml rename to stable/guacamole-client/4.0.27/values.yaml