diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index c719d45d..f8f9fe02 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -32,7 +32,7 @@ jobs: version: v3.10.1 # Also update in publish.yaml - name: Set up python - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0 + uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: 3.9 diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 9460d792..450330ba 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Get token - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 + uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2 id: get_token with: app-id: ${{ vars.RENOVATE_APP_ID }} @@ -26,11 +26,11 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Self-hosted Renovate - uses: renovatebot/github-action@e084b5ac6fd201023db6dd7743aec023babb02c8 # v41.0.13 + uses: renovatebot/github-action@d385c88822a237acaead89c462fa0aef7502748f # v41.0.11 with: configurationFile: .github/configs/renovate-config.js # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate - renovate-version: 39.153.2 + renovate-version: 39.86.4 token: '${{ steps.get_token.outputs.token }}' mount-docker-socket: true env: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 29f267d3..e9a10387 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -68,6 +68,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5 with: sarif_file: results.sarif diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 5d12006a..c932235e 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v2.14.2 +appVersion: v2.13.4 kubeVersion: ">=1.25.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 7.8.3 +version: 7.7.22 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -27,4 +27,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: Bump dex version to v2.42.0 + description: Bump argo-cd to v2.13.4 diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 25760a5f..3a4a2560 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -312,7 +312,7 @@ This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr Upstream steps in the [FAQ] are not enough, since we chose a different approach. (We use a Kubernetes Job with [Chart Hooks] to create the auth secret `argocd-redis`.) -Steps to rotate the secret when using the helm chart (bold step is additional to upstream): +Steps to roteate the secret when using the helm chart (bold step is additional to upstream): * Delete `argocd-redis` secret in the namespace where Argo CD is installed. ```bash kubectl delete secret argocd-redis -n @@ -708,7 +708,7 @@ NAME: my-release | global.logging.level | string | `"info"` | Set the global logging level. One of: `debug`, `info`, `warn` or `error` | | global.networkPolicy.create | bool | `false` | Create NetworkPolicy objects for all components | | global.networkPolicy.defaultDenyIngress | bool | `false` | Default deny all ingress traffic | -| global.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Default node selector for all components | +| global.nodeSelector | object | `{}` | Default node selector for all components | | global.podAnnotations | object | `{}` | Annotations for the all deployed pods | | global.podLabels | object | `{}` | Labels for the all deployed pods | | global.priorityClassName | string | `""` | Default priority class for all components | @@ -1170,7 +1170,7 @@ NAME: my-release | dex.extraContainers | list | `[]` | Additional containers to be added to the dex pod | | dex.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Dex imagePullPolicy | | dex.image.repository | string | `"ghcr.io/dexidp/dex"` | Dex image repository | -| dex.image.tag | string | `"v2.42.0"` | Dex image tag | +| dex.image.tag | string | `"v2.41.1"` | Dex image tag | | dex.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry | | dex.initContainers | list | `[]` | Init containers to add to the dex pod | | dex.initImage.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Argo CD init image imagePullPolicy | @@ -1621,65 +1621,6 @@ If you use an External Redis (See Option 3 above), this Job is not deployed. | notifications.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the application controller | | notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent | -## Commit server (Manifest Hydrator) - -The Argo CD Commit Server provides push access to git repositories for hydrated manifests. - -To read more about this component, please read [Argo CD Manifest Hydrator] and [Manifest Hydrator]. - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| commitServer.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules | -| commitServer.automountServiceAccountToken | bool | `false` | Automount API credentials for the Service Account into the pod. | -| commitServer.containerSecurityContext | object | See [values.yaml] | commit server container-level security context | -| commitServer.deploymentAnnotations | object | `{}` | Annotations to be added to commit server Deployment | -| commitServer.deploymentStrategy | object | `{}` | Deployment strategy to be added to the commit server Deployment | -| commitServer.dnsConfig | object | `{}` | [DNS configuration] | -| commitServer.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for commit server pods | -| commitServer.enabled | bool | `false` | Enable commit server | -| commitServer.extraArgs | list | `[]` | commit server command line flags | -| commitServer.extraEnv | list | `[]` | Environment variables to pass to the commit server | -| commitServer.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the commit server | -| commitServer.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) | -| commitServer.extraVolumes | list | `[]` | List of extra volumes to add | -| commitServer.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the commit server | -| commitServer.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the commit server | -| commitServer.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the commit server | -| commitServer.livenessProbe.enabled | bool | `true` | Enable Kubernetes liveness probe for commit server | -| commitServer.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| commitServer.livenessProbe.initialDelaySeconds | int | `30` | Number of seconds after the container has started before [probe] is initiated | -| commitServer.livenessProbe.periodSeconds | int | `30` | How often (in seconds) to perform the [probe] | -| commitServer.livenessProbe.timeoutSeconds | int | `5` | Number of seconds after which the [probe] times out | -| commitServer.metrics.enabled | bool | `false` | Enables prometheus metrics server | -| commitServer.metrics.service.annotations | object | `{}` | Metrics service annotations | -| commitServer.metrics.service.clusterIP | string | `""` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) | -| commitServer.metrics.service.labels | object | `{}` | Metrics service labels | -| commitServer.metrics.service.portName | string | `"metrics"` | Metrics service port name | -| commitServer.metrics.service.servicePort | int | `8087` | Metrics service port | -| commitServer.metrics.service.type | string | `"ClusterIP"` | Metrics service type | -| commitServer.name | string | `"commit-server"` | Commit server name | -| commitServer.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] | -| commitServer.podAnnotations | object | `{}` | Annotations for the commit server pods | -| commitServer.podLabels | object | `{}` | Labels for the commit server pods | -| commitServer.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the commit server pods | -| commitServer.readinessProbe.enabled | bool | `true` | Enable Kubernetes liveness probe for commit server | -| commitServer.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| commitServer.readinessProbe.initialDelaySeconds | int | `5` | Number of seconds after the container has started before [probe] is initiated | -| commitServer.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| commitServer.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| commitServer.resources | object | `{}` | Resource limits and requests for the commit server pods. | -| commitServer.runtimeClassName | string | `""` (defaults to global.runtimeClassName) | Runtime class name for the commit server | -| commitServer.service.annotations | object | `{}` | commit server service annotations | -| commitServer.service.labels | object | `{}` | commit server service labels | -| commitServer.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| commitServer.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | -| commitServer.serviceAccount.create | bool | `true` | Create commit server service account | -| commitServer.serviceAccount.labels | object | `{}` | Labels applied to created service account | -| commitServer.serviceAccount.name | string | `"argocd-commit-server"` | commit server service account name | -| commitServer.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook | -| commitServer.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints | -| commitServer.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the commit server | - ---------------------------------------------- Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs) @@ -1712,5 +1653,3 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/ [Applications in any namespace]: https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/#applications-in-any-namespace [Argo CD Extensions]: https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice [Argo CD Extension Installer]: https://github.com/argoproj-labs/argocd-extension-installer -[Argo CD Manifest Hydrator]: https://argo-cd.readthedocs.io/en/stable/proposals/manifest-hydrator/ -[Manifest Hydrator]: https://github.com/argoproj/argo-cd/blob/master/docs/proposals/manifest-hydrator.md diff --git a/charts/argo-cd/README.md.gotmpl b/charts/argo-cd/README.md.gotmpl index d2862792..0520c40f 100644 --- a/charts/argo-cd/README.md.gotmpl +++ b/charts/argo-cd/README.md.gotmpl @@ -312,7 +312,7 @@ This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr Upstream steps in the [FAQ] are not enough, since we chose a different approach. (We use a Kubernetes Job with [Chart Hooks] to create the auth secret `argocd-redis`.) -Steps to rotate the secret when using the helm chart (bold step is additional to upstream): +Steps to roteate the secret when using the helm chart (bold step is additional to upstream): * Delete `argocd-redis` secret in the namespace where Argo CD is installed. ```bash kubectl delete secret argocd-redis -n @@ -672,7 +672,7 @@ NAME: my-release | Key | Type | Default | Description | |-----|------|---------|-------------| {{- range .Values }} - {{- if not (or (hasPrefix "global" .Key) (hasPrefix "configs" .Key) (hasPrefix "controller" .Key) (hasPrefix "repoServer" .Key) (hasPrefix "server" .Key) (hasPrefix "applicationSet" .Key) (hasPrefix "notifications" .Key) (hasPrefix "dex" .Key) (hasPrefix "redis" .Key) (hasPrefix "externalRedis" .Key) (hasPrefix "commitServer" .Key) ) }} + {{- if not (or (hasPrefix "global" .Key) (hasPrefix "configs" .Key) (hasPrefix "controller" .Key) (hasPrefix "repoServer" .Key) (hasPrefix "server" .Key) (hasPrefix "applicationSet" .Key) (hasPrefix "notifications" .Key) (hasPrefix "dex" .Key) (hasPrefix "redis" .Key) (hasPrefix "externalRedis" .Key) ) }} | {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} | {{- end }} {{- end }} @@ -813,20 +813,6 @@ If you use an External Redis (See Option 3 above), this Job is not deployed. {{- end }} {{- end }} -## Commit server (Manifest Hydrator) - -The Argo CD Commit Server provides push access to git repositories for hydrated manifests. - -To read more about this component, please read [Argo CD Manifest Hydrator] and [Manifest Hydrator]. - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -{{- range .Values }} - {{- if hasPrefix "commitServer" .Key }} -| {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} | - {{- end }} -{{- end }} - ---------------------------------------------- Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs) @@ -859,5 +845,3 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/ [Applications in any namespace]: https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/#applications-in-any-namespace [Argo CD Extensions]: https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice [Argo CD Extension Installer]: https://github.com/argoproj-labs/argocd-extension-installer -[Argo CD Manifest Hydrator]: https://argo-cd.readthedocs.io/en/stable/proposals/manifest-hydrator/ -[Manifest Hydrator]: https://github.com/argoproj/argo-cd/blob/master/docs/proposals/manifest-hydrator.md diff --git a/charts/argo-cd/ci/with-commit-server-values.yaml b/charts/argo-cd/ci/with-commit-server-values.yaml deleted file mode 100644 index b4ffedca..00000000 --- a/charts/argo-cd/ci/with-commit-server-values.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Test Argo CD with optional component "commit-server" -commitServer: - enabled: true diff --git a/charts/argo-cd/templates/_helpers.tpl b/charts/argo-cd/templates/_helpers.tpl index aeaf3df8..1ef054b1 100644 --- a/charts/argo-cd/templates/_helpers.tpl +++ b/charts/argo-cd/templates/_helpers.tpl @@ -177,24 +177,6 @@ Create the name of the notifications service account to use {{- end -}} {{- end -}} -{{/* -Create argocd commit-server name and version as used by the chart label. -*/}} -{{- define "argo-cd.commitServer.fullname" -}} -{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.commitServer.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create the name of the commit-server service account to use -*/}} -{{- define "argo-cd.commitServer.serviceAccountName" -}} -{{- if .Values.commitServer.serviceAccount.create -}} - {{ default (include "argo-cd.commitServer.fullname" .) .Values.commitServer.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.commitServer.serviceAccount.name }} -{{- end -}} -{{- end -}} - {{/* Argo Configuration Preset Values (Influenced by Values configuration) */}} diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index 0b8285b7..e61a8525 100644 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml @@ -175,12 +175,6 @@ spec: name: argocd-cmd-params-cm key: controller.self.heal.backoff.cap.seconds optional: true - - name: ARGOCD_APPLICATION_CONTROLLER_SYNC_TIMEOUT - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.sync.timeout.seconds - optional: true - name: ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER_PLAINTEXT valueFrom: configMapKeyRef: @@ -317,24 +311,6 @@ spec: name: argocd-cmd-params-cm key: controller.ignore.normalizer.jq.timeout optional: true - - name: ARGOCD_HYDRATOR_ENABLED - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: hydrator.enabled - optional: true - - name: ARGOCD_CLUSTER_CACHE_BATCH_EVENTS_PROCESSING - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.cluster.cache.batch.events.processing - optional: true - - name: ARGOCD_CLUSTER_CACHE_EVENTS_PROCESSING_INTERVAL - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.cluster.cache.events.processing.interval - optional: true {{- with .Values.controller.envFrom }} envFrom: {{- toYaml . | nindent 10 }} diff --git a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml index 733290d1..a907ac76 100644 --- a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -174,12 +174,6 @@ spec: name: argocd-cmd-params-cm key: controller.self.heal.backoff.cap.seconds optional: true - - name: ARGOCD_APPLICATION_CONTROLLER_SYNC_TIMEOUT - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.sync.timeout.seconds - optional: true - name: ARGOCD_APPLICATION_CONTROLLER_REPO_SERVER_PLAINTEXT valueFrom: configMapKeyRef: @@ -316,26 +310,6 @@ spec: name: argocd-cmd-params-cm key: controller.ignore.normalizer.jq.timeout optional: true - - name: ARGOCD_HYDRATOR_ENABLED - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: hydrator.enabled - optional: true - - name: ARGOCD_CLUSTER_CACHE_BATCH_EVENTS_PROCESSING - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.cluster.cache.batch.events.processing - optional: true - - name: ARGOCD_CLUSTER_CACHE_EVENTS_PROCESSING_INTERVAL - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: controller.cluster.cache.events.processing.interval - optional: true - - name: KUBECACHEDIR - value: /tmp/kubecache {{- with .Values.controller.envFrom }} envFrom: {{- toYaml . | nindent 10 }} @@ -370,8 +344,6 @@ spec: name: argocd-home - name: argocd-cmd-params-cm mountPath: /home/argocd/params - - name: argocd-application-controller-tmp - mountPath: /tmp {{- with .Values.controller.extraContainers }} {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} @@ -413,8 +385,6 @@ spec: {{- else }} emptyDir: {} {{- end }} - - emptyDir: {} - name: argocd-application-controller-tmp - name: argocd-repo-server-tls secret: secretName: argocd-repo-server-tls diff --git a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml index 9c085123..303106b5 100644 --- a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml @@ -151,12 +151,6 @@ spec: key: applicationsetcontroller.enable.progressive.syncs name: argocd-cmd-params-cm optional: true - - name: ARGOCD_APPLICATIONSET_CONTROLLER_TOKENREF_STRICT_MODE - valueFrom: - configMapKeyRef: - key: applicationsetcontroller.enable.tokenref.strict.mode - name: argocd-cmd-params-cm - optional: true - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_NEW_GIT_FILE_GLOBBING valueFrom: configMapKeyRef: @@ -217,12 +211,6 @@ spec: name: argocd-cmd-params-cm key: applicationsetcontroller.webhook.parallelism.limit optional: true - - name: ARGOCD_APPLICATIONSET_CONTROLLER_REQUEUE_AFTER - valueFrom: - configMapKeyRef: - key: applicationsetcontroller.requeue.after - name: argocd-cmd-params-cm - optional: true {{- with .Values.applicationSet.extraEnvFrom }} envFrom: {{- toYaml . | nindent 12 }} diff --git a/charts/argo-cd/templates/argocd-commit-server/deployment.yaml b/charts/argo-cd/templates/argocd-commit-server/deployment.yaml deleted file mode 100644 index 96cf6575..00000000 --- a/charts/argo-cd/templates/argocd-commit-server/deployment.yaml +++ /dev/null @@ -1,238 +0,0 @@ -{{- if .Values.commitServer.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - {{- with (mergeOverwrite (deepCopy .Values.global.deploymentAnnotations) .Values.commitServer.deploymentAnnotations) }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - name: {{ template "argo-cd.commitServer.fullname" . }} - namespace: {{ include "argo-cd.namespace" . }} - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.commitServer.name "name" .Values.commitServer.name) | nindent 4 }} -spec: - {{- with include "argo-cd.strategy" (mergeOverwrite (deepCopy .Values.global.deploymentStrategy) .Values.commitServer.deploymentStrategy) }} - strategy: - {{- trim . | nindent 4 }} - {{- end }} - revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }} - selector: - matchLabels: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 6 }} - template: - metadata: - annotations: - {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.commitServer.podAnnotations) }} - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.commitServer.name "name" .Values.commitServer.name) | nindent 8 }} - {{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.commitServer.podLabels) }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.commitServer.runtimeClassName | default .Values.global.runtimeClassName }} - runtimeClassName: {{ . }} - {{- end }} - {{- with .Values.commitServer.imagePullSecrets | default .Values.global.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.global.hostAliases }} - hostAliases: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.global.securityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.commitServer.priorityClassName | default .Values.global.priorityClassName }} - priorityClassName: {{ . }} - {{- end }} - {{- with .Values.commitServer.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ . }} - {{- end }} - serviceAccountName: {{ include "argo-cd.commitServer.serviceAccountName" . }} - automountServiceAccountToken: {{ .Values.commitServer.automountServiceAccountToken }} - containers: - - name: {{ .Values.commitServer.name }} - image: {{ default .Values.global.image.repository .Values.commitServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.commitServer.image.tag }} - imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.commitServer.image.imagePullPolicy }} - args: - - /usr/local/bin/argocd-commit-server - {{- with .Values.commitServer.extraArgs }} - {{- toYaml . | nindent 8 }} - {{- end }} - env: - {{- with (concat .Values.global.env .Values.commitServer.extraEnv) }} - {{- toYaml . | nindent 10 }} - {{- end }} - - name: ARGOCD_COMMIT_SERVER_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: commitserver.listen.address - optional: true - - name: ARGOCD_COMMIT_SERVER_METRICS_LISTEN_ADDRESS - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: commitserver.metrics.listen.address - optional: true - - name: ARGOCD_COMMIT_SERVER_LOGFORMAT - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: commitserver.log.format - optional: true - - name: ARGOCD_COMMIT_SERVER_LOGLEVEL - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: commitserver.log.level - optional: true - - name: ARGOCD_LOG_FORMAT_TIMESTAMP - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: log.format.timestamp - optional: true - {{- with .Values.commitServer.envFrom }} - envFrom: - {{- toYaml . | nindent 10 }} - {{- end }} - ports: - - containerPort: 8086 - name: server - protocol: TCP - - containerPort: 8087 - name: metrics - protocol: TCP - {{- if .Values.commitServer.livenessProbe.enabled }} - livenessProbe: - httpGet: - path: /healthz?full=true - port: 8087 - initialDelaySeconds: {{ .Values.commitServer.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.commitServer.livenessProbe.periodSeconds }} - failureThreshold: {{ .Values.commitServer.livenessProbe.failureThreshold }} - timeoutSeconds: {{ .Values.commitServer.livenessProbe.timeoutSeconds }} - {{- end }} - {{- if .Values.commitServer.readinessProbe.enabled }} - readinessProbe: - httpGet: - path: /healthz - port: 8087 - initialDelaySeconds: {{ .Values.commitServer.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.commitServer.readinessProbe.periodSeconds }} - failureThreshold: {{ .Values.commitServer.readinessProbe.failureThreshold }} - timeoutSeconds: {{ .Values.commitServer.readinessProbe.timeoutSeconds }} - {{- end }} - resources: - {{- toYaml .Values.commitServer.resources | nindent 10 }} - {{- with .Values.commitServer.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 10 }} - {{- end }} - {{- with .Values.commitServer.lifecycle }} - lifecycle: - {{- toYaml . | nindent 10 }} - {{- end }} - volumeMounts: - {{- with .Values.commitServer.extraVolumeMounts }} - {{- toYaml . | nindent 8 }} - {{- end }} - - name: ssh-known-hosts - mountPath: /app/config/ssh - - name: tls-certs - mountPath: /app/config/tls - - name: gpg-keys - mountPath: /app/config/gpg/source - - name: gpg-keyring - mountPath: /app/config/gpg/keys - # We need a writeable temp directory for the askpass socket file. - - name: tmp - mountPath: /tmp - initContainers: - - command: - - /bin/cp - - -n - - /usr/local/bin/argocd - - /var/run/argocd/argocd-cmp-server - image: {{ default .Values.global.image.repository .Values.commitServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.commitServer.image.tag }} - name: copyutil - resources: - {{- toYaml .Values.commitServer.resources | nindent 10 }} - {{- with .Values.commitServer.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 10 }} - {{- end }} - volumeMounts: - - mountPath: /var/run/argocd - name: var-files - volumes: - {{- with .Values.commitServer.extraVolumes }} - {{- toYaml . | nindent 8 }} - {{- end }} - - name: ssh-known-hosts - configMap: - name: argocd-ssh-known-hosts-cm - - name: tls-certs - configMap: - name: argocd-tls-certs-cm - - name: gpg-keys - configMap: - name: argocd-gpg-keys-cm - - name: gpg-keyring - emptyDir: {} - - name: tmp - emptyDir: {} - - name: argocd-commit-server-tls - secret: - secretName: argocd-commit-server-tls - optional: true - items: - - key: tls.crt - path: tls.crt - - key: tls.key - path: tls.key - - key: ca.crt - path: ca.crt - - emptyDir: {} - name: var-files - {{- with include "argo-cd.affinity" (dict "context" . "component" .Values.commitServer) }} - affinity: - {{- trim . | nindent 8 }} - {{- end }} - {{- with .Values.commitServer.nodeSelector | default .Values.global.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.commitServer.tolerations | default .Values.global.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.commitServer.topologySpreadConstraints | default .Values.global.topologySpreadConstraints }} - topologySpreadConstraints: - {{- range $constraint := . }} - - {{ toYaml $constraint | nindent 8 | trim }} - {{- if not $constraint.labelSelector }} - labelSelector: - matchLabels: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 12 }} - {{- end }} - {{- end }} - {{- end }} - {{- if .Values.commitServer.hostNetwork }} - hostNetwork: {{ .Values.commitServer.hostNetwork }} - {{- end }} - {{- with .Values.commitServer.dnsConfig }} - dnsConfig: - {{- toYaml . | nindent 8 }} - {{- end }} - dnsPolicy: {{ .Values.commitServer.dnsPolicy }} -{{- end }} diff --git a/charts/argo-cd/templates/argocd-commit-server/metrics.yaml b/charts/argo-cd/templates/argocd-commit-server/metrics.yaml deleted file mode 100644 index 7d198a70..00000000 --- a/charts/argo-cd/templates/argocd-commit-server/metrics.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if and .Values.commitServer.enabled .Values.commitServer.metrics.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "argo-cd.commitServer.fullname" . }}-metrics - namespace: {{ include "argo-cd.namespace" . }} - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.commitServer.name "name" "metrics") | nindent 4 }} - {{- with .Values.commitServer.metrics.service.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- if or .Values.commitServer.metrics.service.annotations .Values.global.addPrometheusAnnotations }} - annotations: - {{- if .Values.global.addPrometheusAnnotations }} - prometheus.io/port: {{ .Values.commitServer.metrics.service.servicePort | quote }} - prometheus.io/scrape: "true" - {{- end }} - {{- range $key, $value := .Values.commitServer.metrics.service.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} -spec: - type: {{ .Values.commitServer.metrics.service.type }} - {{- if and .Values.commitServer.metrics.service.clusterIP (eq .Values.commitServer.metrics.service.type "ClusterIP") }} - clusterIP: {{ .Values.commitServer.metrics.service.clusterIP }} - {{- end }} - {{- include "argo-cd.dualStack" . | indent 2 }} - ports: - - name: {{ .Values.commitServer.metrics.service.portName }} - protocol: TCP - port: {{ .Values.commitServer.metrics.service.servicePort }} - targetPort: 8087 - selector: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 4 }} -{{- end }} diff --git a/charts/argo-cd/templates/argocd-commit-server/networkpolicy.yaml b/charts/argo-cd/templates/argocd-commit-server/networkpolicy.yaml deleted file mode 100644 index 6ec0a6ac..00000000 --- a/charts/argo-cd/templates/argocd-commit-server/networkpolicy.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and .Values.commitServer.enabled .Values.global.networkPolicy.create }} -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: {{ template "argo-cd.commitServer.fullname" . }} - namespace: {{ include "argo-cd.namespace" . }} -spec: - podSelector: - matchLabels: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 6 }} - policyTypes: - - Ingress - ingress: - - from: - - podSelector: - matchLabels: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 14 }} - ports: - - protocol: TCP - port: 8086 - - from: - - namespaceSelector: { } - ports: - - port: 8087 -{{- end }} diff --git a/charts/argo-cd/templates/argocd-commit-server/service.yaml b/charts/argo-cd/templates/argocd-commit-server/service.yaml deleted file mode 100644 index 7b0bf878..00000000 --- a/charts/argo-cd/templates/argocd-commit-server/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if .Values.commitServer.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "argo-cd.commitServer.fullname" . }} - namespace: {{ include "argo-cd.namespace" . }} - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.commitServer.name "name" .Values.commitServer.name) | nindent 4 }} - {{- with .Values.commitServer.service.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.commitServer.service.annotations }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} -spec: - ports: - - name: server - protocol: TCP - port: 8086 - targetPort: 8086 - selector: - {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 4 }} -{{- end }} diff --git a/charts/argo-cd/templates/argocd-commit-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-commit-server/serviceaccount.yaml deleted file mode 100644 index d0cf9e73..00000000 --- a/charts/argo-cd/templates/argocd-commit-server/serviceaccount.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if and .Values.commitServer.enabled .Values.commitServer.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -automountServiceAccountToken: {{ .Values.commitServer.serviceAccount.automountServiceAccountToken }} -metadata: - name: {{ include "argo-cd.commitServer.serviceAccountName" . }} - namespace: {{ include "argo-cd.namespace" . }} - {{- with .Values.commitServer.serviceAccount.annotations }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - labels: - {{- include "argo-cd.labels" (dict "context" . "component" .Values.commitServer.name "name" .Values.commitServer.name) | nindent 4 }} - {{- with .Values.commitServer.serviceAccount.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index f12332e9..2617251d 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -239,12 +239,6 @@ spec: name: argocd-cmd-params-cm key: reposerver.plugin.tar.exclusions optional: true - - name: ARGOCD_REPO_SERVER_PLUGIN_USE_MANIFEST_GENERATE_PATHS - valueFrom: - configMapKeyRef: - key: reposerver.plugin.use.manifest.generate.paths - name: argocd-cmd-params-cm - optional: true - name: ARGOCD_REPO_SERVER_ALLOW_OUT_OF_BOUNDS_SYMLINKS valueFrom: configMapKeyRef: diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 0b75f062..cc5f7bfe 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -373,12 +373,6 @@ spec: name: argocd-cmd-params-cm key: applicationsetcontroller.enable.scm.providers optional: true - - name: ARGOCD_HYDRATOR_ENABLED - valueFrom: - configMapKeyRef: - name: argocd-cmd-params-cm - key: hydrator.enabled - optional: true {{- with .Values.server.envFrom }} envFrom: {{- toYaml . | nindent 10 }} diff --git a/charts/argo-cd/templates/crds/crd-application.yaml b/charts/argo-cd/templates/crds/crd-application.yaml index 2c69f9ba..7e3afda6 100644 --- a/charts/argo-cd/templates/crds/crd-application.yaml +++ b/charts/argo-cd/templates/crds/crd-application.yaml @@ -319,14 +319,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema validation - (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -474,10 +466,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is displayed - in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -697,14 +685,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -854,10 +834,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is displayed - in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -1190,14 +1166,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema validation - (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation step - (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -1344,10 +1312,6 @@ spec: use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is displayed - in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -1414,64 +1378,6 @@ spec: required: - repoURL type: object - sourceHydrator: - description: SourceHydrator provides a way to push hydrated manifests - back to git before syncing them to the cluster. - properties: - drySource: - description: DrySource specifies where the dry "don't repeat yourself" - manifest source lives. - properties: - path: - description: Path is a directory path within the Git repository - where the manifests are located - type: string - repoURL: - description: RepoURL is the URL to the git repository that - contains the application manifests - type: string - targetRevision: - description: TargetRevision defines the revision of the source - to hydrate - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - description: |- - HydrateTo specifies an optional "staging" location to push hydrated manifests to. An external system would then - have to move manifests to the SyncSource, e.g. by pull request. - properties: - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - targetBranch - type: object - syncSource: - description: SyncSource specifies where to sync hydrated manifests - from. - properties: - path: - description: |- - Path is a directory path within the git repository where hydrated manifests should be committed to and synced - from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced. - type: string - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: description: Sources is a reference to the location of the application's manifests or chart @@ -1617,14 +1523,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema validation - (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -1772,10 +1670,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is displayed - in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -1954,11 +1848,6 @@ spec: description: Health contains information about the application's current health status properties: - lastTransitionTime: - description: LastTransitionTime is the time the HealthStatus was - set or updated - format: date-time - type: string message: description: Message is a human-readable informational message describing the health status @@ -2156,14 +2045,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -2313,10 +2194,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is displayed - in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -2537,14 +2414,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -2696,10 +2565,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is - displayed in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -3068,14 +2933,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -3228,11 +3085,6 @@ spec: Kustomize to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and - is displayed in the UI. It is used in multi-source - Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced @@ -3468,14 +3320,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON - schema validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -3631,11 +3475,6 @@ spec: of Kustomize to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and - is displayed in the UI. It is used in multi-source - Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications @@ -3985,14 +3824,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -4144,10 +3975,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is - displayed in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -4378,14 +4205,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -4538,10 +4357,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is - displayed in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced @@ -4648,11 +4463,6 @@ spec: description: HealthStatus contains information about the currently observed health state of an application or resource properties: - lastTransitionTime: - description: LastTransitionTime is the time the HealthStatus - was set or updated - format: date-time - type: string message: description: Message is a human-readable informational message describing the health status @@ -4670,8 +4480,6 @@ spec: type: string namespace: type: string - requiresDeletionConfirmation: - type: boolean requiresPruning: type: boolean status: @@ -4685,177 +4493,6 @@ spec: type: string type: object type: array - sourceHydrator: - description: SourceHydrator stores information about the current state - of source hydration - properties: - currentOperation: - description: CurrentOperation holds the status of the hydrate - operation - properties: - drySHA: - description: DrySHA holds the resolved revision (sha) of the - dry source as of the most recent reconciliation - type: string - finishedAt: - description: FinishedAt indicates when the hydrate operation - finished - format: date-time - type: string - hydratedSHA: - description: HydratedSHA holds the resolved revision (sha) - of the hydrated source as of the most recent reconciliation - type: string - message: - description: Message contains a message describing the current - status of the hydrate operation - type: string - phase: - description: Phase indicates the status of the hydrate operation - enum: - - Hydrating - - Failed - - Hydrated - type: string - sourceHydrator: - description: SourceHydrator holds the hydrator config used - for the hydrate operation - properties: - drySource: - description: DrySource specifies where the dry "don't - repeat yourself" manifest source lives. - properties: - path: - description: Path is a directory path within the Git - repository where the manifests are located - type: string - repoURL: - description: RepoURL is the URL to the git repository - that contains the application manifests - type: string - targetRevision: - description: TargetRevision defines the revision of - the source to hydrate - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - description: |- - HydrateTo specifies an optional "staging" location to push hydrated manifests to. An external system would then - have to move manifests to the SyncSource, e.g. by pull request. - properties: - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - targetBranch - type: object - syncSource: - description: SyncSource specifies where to sync hydrated - manifests from. - properties: - path: - description: |- - Path is a directory path within the git repository where hydrated manifests should be committed to and synced - from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced. - type: string - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object - startedAt: - description: StartedAt indicates when the hydrate operation - started - format: date-time - type: string - required: - - message - - phase - type: object - lastSuccessfulOperation: - description: LastSuccessfulOperation holds info about the most - recent successful hydration - properties: - drySHA: - description: DrySHA holds the resolved revision (sha) of the - dry source as of the most recent reconciliation - type: string - hydratedSHA: - description: HydratedSHA holds the resolved revision (sha) - of the hydrated source as of the most recent reconciliation - type: string - sourceHydrator: - description: SourceHydrator holds the hydrator config used - for the hydrate operation - properties: - drySource: - description: DrySource specifies where the dry "don't - repeat yourself" manifest source lives. - properties: - path: - description: Path is a directory path within the Git - repository where the manifests are located - type: string - repoURL: - description: RepoURL is the URL to the git repository - that contains the application manifests - type: string - targetRevision: - description: TargetRevision defines the revision of - the source to hydrate - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - description: |- - HydrateTo specifies an optional "staging" location to push hydrated manifests to. An external system would then - have to move manifests to the SyncSource, e.g. by pull request. - properties: - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - targetBranch - type: object - syncSource: - description: SyncSource specifies where to sync hydrated - manifests from. - properties: - path: - description: |- - Path is a directory path within the git repository where hydrated manifests should be committed to and synced - from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced. - type: string - targetBranch: - description: TargetBranch is the branch to which hydrated - manifests should be committed - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object - type: object - type: object sourceType: description: SourceType specifies the type of this application type: string @@ -5093,14 +4730,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -5252,10 +4881,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is - displayed in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced from Git. @@ -5486,14 +5111,6 @@ spec: description: SkipCrds skips custom resource definition installation step (Helm's --skip-crds) type: boolean - skipSchemaValidation: - description: SkipSchemaValidation skips JSON schema - validation (Helm's --skip-schema-validation) - type: boolean - skipTests: - description: SkipTests skips test manifest installation - step (Helm's --skip-tests). - type: boolean valueFiles: description: ValuesFiles is a list of Helm value files to use when generating a template @@ -5646,10 +5263,6 @@ spec: to use for rendering manifests type: string type: object - name: - description: Name is used to refer to a source and is - displayed in the UI. It is used in multi-source Applications. - type: string path: description: Path is a directory path within the Git repository, and is only valid for applications sourced diff --git a/charts/argo-cd/templates/crds/crd-applicationset.yaml b/charts/argo-cd/templates/crds/crd-applicationset.yaml index eff945f8..6cf09222 100644 --- a/charts/argo-cd/templates/crds/crd-applicationset.yaml +++ b/charts/argo-cd/templates/crds/crd-applicationset.yaml @@ -242,10 +242,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -344,8 +340,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -391,42 +385,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -514,10 +472,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -616,8 +570,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -724,8 +676,6 @@ spec: type: object clusters: properties: - flatList: - type: boolean selector: properties: matchExpressions: @@ -914,10 +864,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -1016,8 +962,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -1063,42 +1007,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -1186,10 +1094,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -1288,8 +1192,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -1585,10 +1487,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -1687,8 +1585,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -1734,42 +1630,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -1857,10 +1717,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -1959,8 +1815,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -2236,10 +2090,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -2338,8 +2188,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -2385,42 +2233,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -2508,10 +2320,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -2610,8 +2418,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -2912,10 +2718,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -3014,8 +2816,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -3061,42 +2861,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -3184,10 +2948,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -3286,8 +3046,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -3394,8 +3152,6 @@ spec: type: object clusters: properties: - flatList: - type: boolean selector: properties: matchExpressions: @@ -3584,10 +3340,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -3686,8 +3438,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -3733,42 +3483,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -3856,10 +3570,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -3958,8 +3668,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -4255,10 +3963,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -4357,8 +4061,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -4404,42 +4106,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -4527,10 +4193,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -4629,8 +4291,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -4906,10 +4566,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -5008,8 +4664,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -5055,42 +4709,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -5178,10 +4796,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -5280,8 +4894,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -5565,10 +5177,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -5667,8 +5275,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -5714,42 +5320,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -5837,10 +5407,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -5939,8 +5505,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -6443,10 +6007,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -6545,8 +6105,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -6592,42 +6150,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -6715,10 +6237,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -6817,8 +6335,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -7316,10 +6832,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -7418,8 +6930,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -7465,42 +6975,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -7588,10 +7062,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -7690,8 +7160,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -7984,10 +7452,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -8086,8 +7550,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -8133,42 +7595,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -8256,10 +7682,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -8358,8 +7780,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -8662,10 +8082,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -8764,8 +8180,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -8811,42 +8225,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -8934,10 +8312,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -9036,8 +8410,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -9144,8 +8516,6 @@ spec: type: object clusters: properties: - flatList: - type: boolean selector: properties: matchExpressions: @@ -9334,10 +8704,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -9436,8 +8802,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -9483,42 +8847,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -9606,10 +8934,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -9708,8 +9032,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -10005,10 +9327,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -10107,8 +9425,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -10154,42 +9470,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -10277,10 +9557,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -10379,8 +9655,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -10656,10 +9930,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -10758,8 +10028,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -10805,42 +10073,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -10928,10 +10160,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -11030,8 +10258,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -11315,10 +10541,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -11417,8 +10639,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -11464,42 +10684,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -11587,10 +10771,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -11689,8 +10869,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -12193,10 +11371,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -12295,8 +11469,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -12342,42 +11514,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -12465,10 +11601,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -12567,8 +11699,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -13066,10 +12196,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -13168,8 +12294,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -13215,42 +12339,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -13338,10 +12426,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -13440,8 +12524,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -13738,10 +12820,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -13840,8 +12918,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -13887,42 +12963,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -14010,10 +13050,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -14112,8 +13148,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -14396,10 +13430,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -14498,8 +13528,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -14545,42 +13573,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -14668,10 +13660,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -14770,8 +13758,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -15274,10 +14260,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -15376,8 +14358,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -15423,42 +14403,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -15546,10 +14490,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -15648,8 +14588,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -16147,10 +15085,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -16249,8 +15183,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -16296,42 +15228,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -16419,10 +15315,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -16521,8 +15413,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -16890,10 +15780,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -16992,8 +15878,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -17039,42 +15923,6 @@ spec: required: - repoURL type: object - sourceHydrator: - properties: - drySource: - properties: - path: - type: string - repoURL: - type: string - targetRevision: - type: string - required: - - path - - repoURL - - targetRevision - type: object - hydrateTo: - properties: - targetBranch: - type: string - required: - - targetBranch - type: object - syncSource: - properties: - path: - type: string - targetBranch: - type: string - required: - - path - - targetBranch - type: object - required: - - drySource - - syncSource - type: object sources: items: properties: @@ -17162,10 +16010,6 @@ spec: type: string skipCrds: type: boolean - skipSchemaValidation: - type: boolean - skipTests: - type: boolean valueFiles: items: type: string @@ -17264,8 +16108,6 @@ spec: version: type: string type: object - name: - type: string path: type: string plugin: @@ -17425,9 +16267,6 @@ spec: type: string health: properties: - lastTransitionTime: - format: date-time - type: string message: type: string status: @@ -17441,8 +16280,6 @@ spec: type: string namespace: type: string - requiresDeletionConfirmation: - type: boolean requiresPruning: type: boolean status: diff --git a/charts/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo-cd/templates/dex/servicemonitor.yaml index 2564cfa1..93c9fa32 100644 --- a/charts/argo-cd/templates/dex/servicemonitor.yaml +++ b/charts/argo-cd/templates/dex/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.dex.enabled .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index f1213daf..4c069086 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -119,8 +119,7 @@ global: priorityClassName: "" # -- Default node selector for all components - nodeSelector: - kubernetes.io/os: linux + nodeSelector: {} # -- Default tolerations for all components tolerations: [] @@ -1025,7 +1024,7 @@ dex: # -- Dex image repository repository: ghcr.io/dexidp/dex # -- Dex image tag - tag: v2.42.0 + tag: v2.41.1 # -- Dex imagePullPolicy # @default -- `""` (defaults to global.image.imagePullPolicy) imagePullPolicy: "" @@ -3750,183 +3749,3 @@ notifications: # For more information: https://argo-cd.readthedocs.io/en/stable/operator-manual/notifications/triggers/#default-triggers # defaultTriggers: | # - on-sync-status-unknown - -commitServer: - # -- Enable commit server - enabled: false - - # -- Commit server name - name: commit-server - - # -- Runtime class name for the commit server - # @default -- `""` (defaults to global.runtimeClassName) - runtimeClassName: "" - - ## commit server controller image - image: - # -- Repository to use for the commit server - # @default -- `""` (defaults to global.image.repository) - repository: "" - # -- Tag to use for the commit server - # @default -- `""` (defaults to global.image.tag) - tag: "" - # -- Image pull policy for the commit server - # @default -- `""` (defaults to global.image.imagePullPolicy) - imagePullPolicy: "" - - # -- commit server command line flags - extraArgs: [] - - # -- Environment variables to pass to the commit server - extraEnv: [] - # - name: "MY_VAR" - # value: "value" - - # -- envFrom to pass to the commit server - # @default -- `[]` (See [values.yaml]) - extraEnvFrom: [] - # - configMapRef: - # name: config-map-name - # - secretRef: - # name: secret-name - - # -- List of extra mounts to add (normally used with extraVolumes) - extraVolumeMounts: [] - - # -- List of extra volumes to add - extraVolumes: [] - - metrics: - # -- Enables prometheus metrics server - enabled: false - service: - # -- Metrics service type - type: ClusterIP - # -- Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) - clusterIP: "" - # -- Metrics service annotations - annotations: {} - # -- Metrics service labels - labels: {} - # -- Metrics service port - servicePort: 8087 - # -- Metrics service port name - portName: metrics - - ## commit server service configuration - service: - # -- commit server service annotations - annotations: {} - # -- commit server service labels - labels: {} - - # -- Automount API credentials for the Service Account into the pod. - automountServiceAccountToken: false - - serviceAccount: - # -- Create commit server service account - create: true - # -- commit server service account name - name: argocd-commit-server - # -- Annotations applied to created service account - annotations: {} - # -- Labels applied to created service account - labels: {} - # -- Automount API credentials for the Service Account - automountServiceAccountToken: true - - # -- Annotations to be added to commit server Deployment - deploymentAnnotations: {} - - # -- Annotations for the commit server pods - podAnnotations: {} - - # -- Labels for the commit server pods - podLabels: {} - - # -- Resource limits and requests for the commit server pods. - resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - # -- [DNS configuration] - dnsConfig: {} - # -- Alternative DNS policy for commit server pods - dnsPolicy: "ClusterFirst" - - # -- commit server container-level security context - # @default -- See [values.yaml] - containerSecurityContext: - runAsNonRoot: true - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - seccompProfile: - type: RuntimeDefault - - ## Probes for commit server (optional) - ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ - readinessProbe: - # -- Enable Kubernetes liveness probe for commit server - enabled: true - # -- Number of seconds after the container has started before [probe] is initiated - initialDelaySeconds: 5 - # -- How often (in seconds) to perform the [probe] - periodSeconds: 10 - # -- Number of seconds after which the [probe] times out - timeoutSeconds: 1 - # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded - failureThreshold: 3 - - livenessProbe: - # -- Enable Kubernetes liveness probe for commit server - enabled: true - # -- Number of seconds after the container has started before [probe] is initiated - initialDelaySeconds: 30 - # -- How often (in seconds) to perform the [probe] - periodSeconds: 30 - # -- Number of seconds after which the [probe] times out - timeoutSeconds: 5 - # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded - failureThreshold: 3 - - # -- terminationGracePeriodSeconds for container lifecycle hook - terminationGracePeriodSeconds: 30 - - # -- [Node selector] - # @default -- `{}` (defaults to global.nodeSelector) - nodeSelector: {} - - # -- [Tolerations] for use with node taints - # @default -- `[]` (defaults to global.tolerations) - tolerations: [] - - # -- Assign custom [affinity] rules - # @default -- `{}` (defaults to global.affinity preset) - affinity: {} - - # -- Assign custom [TopologySpreadConstraints] rules to the commit server - # @default -- `[]` (defaults to global.topologySpreadConstraints) - ## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ - ## If labelSelector is left out, it will default to the labelSelector configuration of the deployment - topologySpreadConstraints: [] - # - maxSkew: 1 - # topologyKey: topology.kubernetes.io/zone - # whenUnsatisfiable: DoNotSchedule - - # -- Deployment strategy to be added to the commit server Deployment - deploymentStrategy: {} - # type: RollingUpdate - # rollingUpdate: - # maxSurge: 25% - # maxUnavailable: 25% - - # -- Priority class for the commit server pods - # @default -- `""` (defaults to global.priorityClassName) - priorityClassName: "" diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index c1f8df1a..be8df0c6 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v3.6.4 +appVersion: v3.6.2 name: argo-workflows description: A Helm chart for Argo Workflows type: application -version: 0.45.7 +version: 0.45.4 icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png home: https://github.com/argoproj/argo-helm sources: @@ -16,5 +16,5 @@ annotations: fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - - kind: fixed - description: Update the SSO configuration instructions to reflect the correct field name + - kind: added + description: Support configuring workflow events in the controller diff --git a/charts/argo-workflows/README.md b/charts/argo-workflows/README.md index 6e400596..323524c2 100644 --- a/charts/argo-workflows/README.md +++ b/charts/argo-workflows/README.md @@ -344,7 +344,7 @@ Fields to note: | server.sso.clientSecret.key | string | `"client-secret"` | Key of a secret to retrieve the app OIDC client secret | | server.sso.clientSecret.name | string | `"argo-server-sso"` | Name of a secret to retrieve the app OIDC client secret | | server.sso.customGroupClaimName | string | `""` | Override claim name for OIDC groups | -| server.sso.enabled | bool | `false` | Create SSO configuration. If you set `true` , please also set `.Values.server.authModes` as `sso`. | +| server.sso.enabled | bool | `false` | Create SSO configuration. If you set `true` , please also set `.Values.server.authMode` as `sso`. | | server.sso.filterGroupsRegex | list | `[]` | Filter the groups returned by the OIDC provider | | server.sso.insecureSkipVerify | bool | `false` | Skip TLS verification for the HTTP client | | server.sso.issuer | string | `"https://accounts.google.com"` | The root URL of the OIDC identity provider | diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml index 0c044454..cf9b08d8 100644 --- a/charts/argo-workflows/values.yaml +++ b/charts/argo-workflows/values.yaml @@ -717,7 +717,7 @@ server: # SSO configuration when SSO is specified as a server auth mode. sso: - # -- Create SSO configuration. If you set `true` , please also set `.Values.server.authModes` as `sso`. + # -- Create SSO configuration. If you set `true` , please also set `.Values.server.authMode` as `sso`. enabled: false # -- The root URL of the OIDC identity provider issuer: https://accounts.google.com