Merge branch 'rancher:main-source' into migration-flex-automated

README.md

@@ -97,6 +97,25 @@ bin/partner-charts-ci auto
 ```bash
 bin/partner-charts-ci validate
 ```
+#### Testing new chart on Rancher Apps UI
+1. If you haven't done so yet, pull down your new chart files into your local `partner-charts` repository:
+```bash
+a) Get scripts: scripts/pull-ci-scripts
+b) List and find your company name/chart: bin/partner-charts-ci list | grep <company>
+c) set PACKAGE variable to your company/chart: export PACKAGE=<company>/<chart-name> or export PACKAGE=<company>
+d) Run bin/partner-charts-ci stage or auto # the new charts should be downloaded
+```
+2.  In your local `partner-charts` directory start a python3 http server:
+```bash
+#python3 -m http.server 8000
+```
+3. From a second terminal expose your local http server via ngrok ( https://ngrok.com/download )
+```bash
+#./ngrok http 8000
+```
+4. In Rancher UI create a test repository that points to your local `partner-charts` repo by selecting an appropriate cluster and going to Apps > Repositories and clicking "Create".  Enter a Name, copy ngrok forwarding url and paste it into Target http(s) "Index URL" and click "Create" again.
+
+5. Once the new repository is "Active" go to Apps > Charts , find your new chart, review Readme is correct, etc. and install it. It should be successfully deployed.
 
 ## Overlay
 

charts/aquarist-labs/s3gw/Chart.yaml

@@ -26,4 +26,4 @@ sources:
 - https://github.com/aquarist-labs/s3gw
 - https://github.com/aquarist-labs/ceph
 type: application
-version: 0.10.0
+version: 0.11.0

charts/aquarist-labs/s3gw/README.md

@@ -1,45 +1,61 @@
-# Quickstart
+# [s3gw][s3gw-url]
 
-To install s3gw using Helm add the chart to your Helm repos and then run `helm
-install`:
+s3gw is an S3-compatible service focused on deployments in a Kubernetes
+environment backed by any PVC, including Longhorn. Since its inception, the
+primary focus has been on cloud native deployments. However, the s3gw can be
+deployed in a myriad of scenarios, provided some form of storage is attached.
+
+s3gw is based on Ceph’s RADOSGW (RGW) but runs as a stand–alone service without
+the RADOS cluster and relies on a storage backend still under heavy development
+by the storage team at SUSE. A web-based UI for management and an object
+explorer are also part of s3gw.
+
+## Quickstart
+
+To install s3gw using Helm add the chart to your Helm repository and then run
+`helm install`:
 
 ```bash
 helm add repo s3gw https://aquarist-labs.github.io/s3gw-charts/
-helm --namespace s3gw-system install s3gw s3gw/s3gw --create-namespace
-```
-
-In order to install s3gw using Helm, from this repository directly, first you
-must clone the repo:
-
-```bash
-git clone https://github.com/aquarist-labs/s3gw-charts.git
-```
-
-Before installing, familiarize yourself with the options, if necessary provide
-your own `values.yaml` file.
-Then change into the repository and install using Helm:
-
-```bash
-cd s3gw-charts
-helm install $RELEASE_NAME charts/s3gw \
-  --namespace $S3GW_NAMESPACE \
+helm \
+  --namespace s3gw-system \
+  install s3gw \
+  s3gw/s3gw \
   --create-namespace \
   -f /path/to/your/custom/values.yaml
 ```
 
 ## Rancher
 
-Installing s3gw via the Rancher App Catalog is made easy, the steps are as follows:
+Installing s3gw via the Rancher App Catalog is made easy, the steps are as
+follows:
 
 - Cluster -> Projects/Namespaces - create the `s3gw` namespace.
 - Apps -> Repositories -> Create `s3gw` using the s3gw-charts Git URL
   <https://aquarist-labs.github.io/s3gw-charts/> and the `main` branch.
 - Apps -> Charts -> Install `Traefik`.
-- Apps -> Charts -> Install `s3gw`. Select the `s3gw` namespace previously created.
-  A `pvc` for `s3gw` will be created automatically during installation.
+- Apps -> Charts -> Install `s3gw`. Select the `s3gw` namespace previously
+  created. A `pvc` for `s3gw` will be created automatically during installation.
 
 ## Documentation
 
-You can access our documentation [here][1].
+You can access our documentation [here][docs-url].
 
-[1]: https://s3gw-docs.readthedocs.io/en/latest/helm-charts/
+## License
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use licensed files except in compliance with the License.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+or the LICENSE file in this repository.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+[s3gw-url]: https://s3gw.io
+[docs-url]: https://s3gw-docs.readthedocs.io/en/latest/helm-charts/

charts/aquarist-labs/s3gw/questions.yaml

@@ -101,19 +101,39 @@ questions:
     type: string
     group: "General"
 
+  - variable: defaultUserCredentialsSecret
+    default: s3gw-creds
+    description: |
+      "The name of the secret containing the
+      S3 credentials for the default user"
+    type: string
+    group: "General"
+
+  - variable: useExistingSecret
+    default: false
+    description: |
+      "Check this to use a preexisting secret
+      containing the S3 credentials for the default user"
+    type: boolean
+    group: "General"
+
   - variable: accessKey
+    show_if: "useExistingSecret=false"
     default: test
-    description: "S3 Access Key"
+    description: |
+      "Set this as the empty string to make the Chart
+      to compute a random alphanumeric value"
     label: "S3 Access Key"
-    required: true
     type: string
     group: "General"
 
   - variable: secretKey
+    show_if: "useExistingSecret=false"
     default: test
-    description: "S3 Secret Key"
+    description: |
+      "Set this as the empty string to make the Chart
+      to compute a random alphanumeric value"
     label: "S3 Secret Key"
-    required: true
     type: string
     group: "General"
 

charts/aquarist-labs/s3gw/templates/NOTES.txt

@@ -0,0 +1,16 @@
+Thank you for installing {{ .Chart.Name }} {{ printf "v%s" .Chart.Version }}
+
+The S3 endpoint is available at:
+
+{{ printf "%s.%s" .Values.serviceName .Values.publicDomain | indent 4 }}
+{{ if .Values.ui.enabled}}
+and the web interface is available at:
+
+{{ printf "%s.%s" .Values.ui.serviceName .Values.ui.publicDomain | indent 4 }}
+{{- end }}
+{{ if and (not .Values.useExistingSecret) (empty .Values.accessKey) }}
+An access key has been generated: {{ include "s3gw.defaultAccessKey" . | quote }}
+{{- end }}
+{{- if and (not .Values.useExistingSecret) (empty .Values.secretKey) }}
+A secret key has been generated: {{ include "s3gw.defaultSecretKey" . | quote }}
+{{ end }}

charts/aquarist-labs/s3gw/templates/_helpers.tpl

@@ -97,3 +97,16 @@ Image Pull Secret
 {{- $au := (printf "%s:%s" $un $pw | b64enc) }}
 {{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" $rg $un $pw $em $au | b64enc}}
 {{- end }}
+
+
+{{/*
+Default Access Credentials
+*/}}
+{{- define "s3gw.defaultAccessKey" -}}
+{{- $key := default (randAlphaNum 32) .Values.accessKey }}
+{{- printf "%s" $key }}
+{{- end }}
+{{- define "s3gw.defaultSecretKey" -}}
+{{- $key := default (randAlphaNum 32) .Values.secretKey }}
+{{- printf "%s" $key }}
+{{- end }}

charts/aquarist-labs/s3gw/templates/deployment.yaml

@@ -48,7 +48,7 @@ spec:
               name: s3-tls
           envFrom:
             - secretRef:
-                name: s3gw-secret
+                name: {{ .Values.defaultUserCredentialsSecret }}
           volumeMounts:
             - name: s3gw-lh-store
               mountPath: /data
@@ -96,5 +96,5 @@ spec:
             - configMapRef:
                 name: s3gw-config
             - secretRef:
-                name: s3gw-secret
+                name: {{ .Values.defaultUserCredentialsSecret }}
 {{- end }}

charts/aquarist-labs/s3gw/templates/secret.yaml

@@ -1,15 +1,17 @@
+{{- if not .Values.useExistingSecret }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: '{{ .Chart.Name }}-secret'
+  name: '{{ .Values.defaultUserCredentialsSecret }}'
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "s3gw.labels" . | indent 4 }}
 type: Opaque
 stringData:
-  RGW_DEFAULT_USER_ACCESS_KEY: {{ .Values.accessKey | quote }}
-  RGW_DEFAULT_USER_SECRET_KEY: {{ .Values.secretKey | quote }}
+  RGW_DEFAULT_USER_ACCESS_KEY: {{ include "s3gw.defaultAccessKey" . | quote }}
+  RGW_DEFAULT_USER_SECRET_KEY: {{ include "s3gw.defaultSecretKey" . | quote }}
+{{- end }}
 {{- if .Values.imageCredentials }}
 ---
 apiVersion: v1

charts/aquarist-labs/s3gw/values.yaml

@@ -55,9 +55,17 @@ ui:
 #
 # 'serviceName' is the service name of S3GW.
 serviceName: "s3gw"
-# 'accessKey' is the S3 Access Key
+# 'useExistingSecret' use an existing secret containing the S3 credentials
+# for the default user
+useExistingSecret: false
+# 'defaultUserCredentialsSecret' the name of the secret containing
+# the S3 Access Key and the S3 Secret Key for the default user.
+defaultUserCredentialsSecret: "s3gw-creds"
+# 'accessKey' is the S3 Access Key; the value is used when useExistingSecret: false.
+# Set this as the empty string to make the Chart to compute a random alphanumeric value.
 accessKey: "test"
-# 'secretKey' is the S3 Secret Key
+# 'secretKey' is the S3 Secret Key; the value is used when useExistingSecret: false
+# Set this as the empty string to make the Chart to compute a random alphanumeric value.
 secretKey: "test"
 # 'publicDomain' is the public domain of S3GW used by the Ingress
 publicDomain: "be.127.0.0.1.omg.howdoi.website"

charts/argo/argo-cd/Chart.yaml

@@ -1,12 +1,15 @@
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Added logFormat, logLevel and extraArgs to Slack bot"
+    - kind: changed
+      description: Upgrade Argo CD to 2.6.0
+    - kind: deprecated
+      description: ApplicationSet args, logFormat and logLevel superseded by configs.params
   catalog.cattle.io/certified: partner
   catalog.cattle.io/display-name: Argo CD
   catalog.cattle.io/kube-version: '>=1.22.0-0'
   catalog.cattle.io/release-name: argo-cd
 apiVersion: v2
-appVersion: v2.5.8
+appVersion: v2.6.0
 dependencies:
 - condition: redis-ha.enabled
   name: redis-ha
@@ -28,4 +31,4 @@ name: argo-cd
 sources:
 - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
 - https://github.com/argoproj/argo-cd
-version: 5.19.9
+version: 5.20.0

charts/argo/argo-cd/README.md

@@ -415,6 +415,8 @@ NAME: my-release
 | configs.credentialTemplatesAnnotations | object | `{}` | Annotations to be added to `configs.credentialTemplates` Secret |
 | configs.gpg.annotations | object | `{}` | Annotations to be added to argocd-gpg-keys-cm configmap |
 | configs.gpg.keys | object | `{}` (See [values.yaml]) | [GnuPG] public keys to add to the keyring |
+| configs.params."applicationsetcontroller.enable.progressive.syncs" | bool | `false` | Enables use of the Progressive Syncs capability |
+| configs.params."applicationsetcontroller.policy" | string | `"sync"` | Modify how application is synced between the generator and the cluster. One of: `sync`, `create-only`, `create-update`, `create-delete` |
 | configs.params."controller.operation.processors" | int | `10` | Number of application operation processors |
 | configs.params."controller.repo.server.timeout.seconds" | int | `60` | Repo server RPC call timeout seconds. |
 | configs.params."controller.self.heal.timeout.seconds" | int | `5` | Specifies timeout between application self heal attempts |
@@ -464,10 +466,12 @@ NAME: my-release
 | controller.clusterRoleRules.rules | list | `[]` | List of custom rules for the application controller's ClusterRole resource |
 | controller.containerPorts.metrics | int | `8082` | Metrics container port |
 | controller.containerSecurityContext | object | See [values.yaml] | Application controller container-level security context |
+| controller.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for application controller pods |
 | controller.env | list | `[]` | Environment variables to pass to application controller |
 | controller.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to application controller |
 | controller.extraArgs | list | `[]` | Additional command line arguments to pass to application controller |
 | controller.extraContainers | list | `[]` | Additional containers to be added to the application controller pod |
+| controller.hostNetwork | bool | `false` | Host Network for application controller pods |
 | controller.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application controller |
 | controller.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application controller |
 | controller.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application controller |
@@ -543,10 +547,12 @@ NAME: my-release
 | repoServer.containerPorts.server | int | `8081` | Repo server container port |
 | repoServer.containerSecurityContext | object | See [values.yaml] | Repo server container-level security context |
 | repoServer.deploymentAnnotations | object | `{}` | Annotations to be added to repo server Deployment |
+| repoServer.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for Repo server pods |
 | repoServer.env | list | `[]` | Environment variables to pass to repo server |
 | repoServer.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to repo server |
 | repoServer.extraArgs | list | `[]` | Additional command line arguments to pass to repo server |
 | repoServer.extraContainers | list | `[]` | Additional containers to be added to the repo server pod |
+| repoServer.hostNetwork | bool | `false` | Host Network for Repo server pods |
 | repoServer.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the repo server |
 | repoServer.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the repo server |
 | repoServer.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the repo server |
@@ -643,6 +649,7 @@ NAME: my-release
 | server.containerPorts.server | int | `8080` | Server container port |
 | server.containerSecurityContext | object | See [values.yaml] | Server container-level security context |
 | server.deploymentAnnotations | object | `{}` | Annotations to be added to server Deployment |
+| server.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for Server pods |
 | server.env | list | `[]` | Environment variables to pass to Argo CD server |
 | server.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to Argo CD server |
 | server.extensions.containerSecurityContext | object | See [values.yaml] | Server UI extensions container-level security context |
@@ -653,6 +660,7 @@ NAME: my-release
 | server.extensions.resources | object | `{}` | Resource limits and requests for the argocd-extensions container |
 | server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server |
 | server.extraContainers | list | `[]` | Additional containers to be added to the server pod |
+| server.hostNetwork | bool | `false` | Host Network for Server pods |
 | server.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Argo CD server |
 | server.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Argo CD server |
 | server.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Argo CD server |
@@ -874,7 +882,7 @@ server:
 | redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
 | redis.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Redis image pull policy |
 | redis.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository |
-| redis.image.tag | string | `"7.0.5-alpine"` | Redis tag |
+| redis.image.tag | string | `"7.0.7-alpine"` | Redis tag |
 | redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
 | redis.initContainers | list | `[]` | Init containers to add to the redis pod |
 | redis.metrics.enabled | bool | `false` | Deploy metrics service |
@@ -932,7 +940,7 @@ The main options are listed here:
 | redis-ha.exporter.tag | string | `"1.45.0"` | Tag to use for the redis-exporter |
 | redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy |
 | redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping |
-| redis-ha.image.tag | string | `"7.0.5-alpine"` | Redis tag |
+| redis-ha.image.tag | string | `"7.0.7-alpine"` | Redis tag |
 | redis-ha.persistentVolume.enabled | bool | `false` | Configures persistency on Redis nodes |
 | redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) |
 | redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""`  is disabled |
@@ -965,8 +973,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | applicationSet.affinity | object | `{}` | Assign custom [affinity] rules |
-| applicationSet.args.dryRun | bool | `false` | Enable dry run mode |
-| applicationSet.args.policy | string | `"sync"` | How application is synced between the generator and the cluster |
+| applicationSet.args | object | `{}` | DEPRECATED - ApplicationSet controller command line flags |
 | applicationSet.containerPorts.metrics | int | `8080` | Metrics container port |
 | applicationSet.containerPorts.probe | int | `8081` | Probe container port |
 | applicationSet.containerPorts.webhook | int | `7000` | Webhook container port |
@@ -990,8 +997,6 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | applicationSet.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
 | applicationSet.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
 | applicationSet.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
-| applicationSet.logFormat | string | `""` (defaults to global.logging.format) | ApplicationSet controller log format. Either `text` or `json` |
-| applicationSet.logLevel | string | `""` (defaults to global.logging.level) | ApplicationSet controller log level. One of: `debug`, `info`, `warn`, `error` |
 | applicationSet.metrics.enabled | bool | `false` | Deploy metrics service |
 | applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations |
 | applicationSet.metrics.service.labels | object | `{}` | Metrics service labels |

charts/argo/argo-cd/templates/NOTES.txt

@@ -76,6 +76,18 @@ DEPRECATED option configs.tlsCertsAnnotations - Use configs.tls.annotations
 {{- if hasKey .Values.configs "tlsCerts" }}
 DEPRECATED option configs.tlsCerts.data - Use configs.tls.certificates
 {{- end }}
+{{- if .Values.applicationSet.logFormat }}
+DEPRECATED option applicationSet.logFormat - Use configs.params.applicationsetcontroller.log.format
+{{- end }}
+{{- if .Values.applicationSet.logLevel }}
+DEPRECATED option applicationSet.logLevel - Use configs.params.applicationsetcontroller.log.level
+{{- end }}
+{{- if .Values.applicationSet.args.policy }}
+DEPRECATED option applicationSet.args.policy - Use configs.params.applicationsetcontroller.policy
+{{- end }}
+{{- if .Values.applicationSet.args.dryRun }}
+DEPRECATED option applicationSet.args.dryRun - Use configs.params.applicationsetcontroller.dryRun
+{{- end }}
 {{- if .Values.controller.service }}
 REMOVED option controller.service - Use controller.metrics
 {{- end }}

charts/argo/argo-cd/templates/_helpers.tpl

@@ -202,10 +202,13 @@ redis.server: {{ . | quote }}
 server.dex.server: {{ include "argo-cd.dex.server" . | quote }}
 server.dex.server.strict.tls: {{ .Values.dex.certificateSecret.enabled | toString }}
 {{- end }}
-{{- range $component := tuple "controller" "server" "reposerver" }}
+{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" }}
 {{ $component }}.log.format: {{ $.Values.global.logging.format | quote }}
 {{ $component }}.log.level: {{ $.Values.global.logging.level | quote }}
 {{- end }}
+{{- if .Values.applicationSet.enabled }}
+applicationsetcontroller.enable.leader.election: {{ gt (.Values.applicationSet.replicaCount | int64) 1 }}
+{{- end }}
 {{- end -}}
 
 {{/*

charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml

@@ -312,3 +312,5 @@ spec:
       {{- with .Values.controller.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
+      hostNetwork: {{ .Values.controller.hostNetwork }}
+      dnsPolicy: {{ .Values.controller.dnsPolicy }}

charts/argo/argo-cd/templates/argocd-applicationset/deployment.yaml

@@ -54,14 +54,20 @@ spec:
             - --metrics-addr=:{{ .Values.applicationSet.containerPorts.metrics }}
             - --probe-addr=:{{ .Values.applicationSet.containerPorts.probe }}
             - --webhook-addr=:{{ .Values.applicationSet.containerPorts.webhook }}
-            - --argocd-repo-server={{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
-            - --enable-leader-election={{ gt ( .Values.applicationSet.replicaCount | int64) 1 }}
-            - --policy={{ .Values.applicationSet.args.policy }}
-            - --dry-run={{ .Values.applicationSet.args.dryRun }}
+            {{- with .Values.applicationSet.args.policy }}
+            - --policy={{ . }}
+            {{- end }}
+            {{- with .Values.applicationSet.args.dryRun }}
+            - --dry-run={{ . }}
+            {{- end }}
+            {{- with .Values.applicationSet.logFormat }}
             - --logformat
-            - {{ default .Values.global.logging.format .Values.applicationSet.logFormat }}
+            - {{ . }}
+            {{- end }}
+            {{- with .Values.applicationSet.logLevel }}
             - --loglevel
-            - {{ default .Values.global.logging.level .Values.applicationSet.logLevel }}
+            - {{ . }}
+            {{- end }}
             {{- with .Values.applicationSet.extraArgs }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -73,6 +79,66 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_LEADER_ELECTION
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.enable.leader.election
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_NAMESPACE
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.namespace
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_REPO_SERVER
+              valueFrom:
+                configMapKeyRef:
+                  key: repo.server
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_POLICY
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.policy
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_DEBUG
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.debug
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_LOGFORMAT
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.log.format
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_LOGLEVEL
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.log.level
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_DRY_RUN
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.dryrun
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_GIT_MODULES_ENABLED
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.enable.git.submodule
+                  name: argocd-cmd-params-cm
+                  optional: true
+            - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_PROGRESSIVE_SYNCS
+              valueFrom:
+                configMapKeyRef:
+                  key: applicationsetcontroller.enable.progressive.rollouts
+                  name: argocd-cmd-params-cm
+                  optional: true
           {{- with .Values.applicationSet.extraEnvFrom }}
           envFrom:
             {{- toYaml . | nindent 12 }}

charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -356,3 +356,5 @@ spec:
       {{- with .Values.repoServer.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
+      hostNetwork: {{ .Values.repoServer.hostNetwork }}
+      dnsPolicy: {{ .Values.repoServer.dnsPolicy }}

charts/argo/argo-cd/templates/argocd-server/deployment.yaml

@@ -262,6 +262,12 @@ spec:
                 name: argocd-cmd-params-cm
                 key: application.namespaces
                 optional: true
+          - name: ARGOCD_SERVER_ENABLE_PROXY_EXTENSION
+            valueFrom:
+              configMapKeyRef:
+                name: argocd-cmd-params-cm
+                key: server.enable.proxy.extension
+                optional: true
         {{- with .Values.server.envFrom }}
         envFrom:
           {{- toYaml . | nindent 10 }}
@@ -415,3 +421,5 @@ spec:
       {{- with .Values.server.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
+      hostNetwork: {{ .Values.server.hostNetwork }}
+      dnsPolicy: {{ .Values.server.dnsPolicy }}