From 02ae101dbea42299c7bd2bfdfc83b98d0e7e6cb2 Mon Sep 17 00:00:00 2001 From: Naseem Date: Mon, 13 May 2019 16:16:44 -0400 Subject: [PATCH 01/19] [argo] Create aggregate roles as pre-install hook (#69) --- charts/argo/Chart.yaml | 2 +- .../templates/workflow-aggregate-roles.yaml | 74 +++++++++++++++++++ charts/argo/values.yaml | 2 + 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 charts/argo/templates/workflow-aggregate-roles.yaml diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 3f4428ef..0b51be4a 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "v2.2.1" description: A Helm chart for Kubernetes name: argo -version: 0.3.2 +version: 0.4.0 diff --git a/charts/argo/templates/workflow-aggregate-roles.yaml b/charts/argo/templates/workflow-aggregate-roles.yaml new file mode 100644 index 00000000..3898f3c7 --- /dev/null +++ b/charts/argo/templates/workflow-aggregate-roles.yaml @@ -0,0 +1,74 @@ +{{- if .Values.createAggregateRoles }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-delete-policy: before-hook-creation + name: argo-aggregate-to-view + labels: + rbac.authorization.k8s.io/aggregate-to-view: "true" +rules: +- apiGroups: + - argoproj.io + resources: + - workflows + - workflows/finalizers + verbs: + - get + - list + - watch + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-delete-policy: before-hook-creation + name: argo-aggregate-to-edit + labels: + rbac.authorization.k8s.io/aggregate-to-edit: "true" +rules: +- apiGroups: + - argoproj.io + resources: + - workflows + - workflows/finalizers + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: +metadata: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-delete-policy: before-hook-creation + name: argo-aggregate-to-admin + labels: + rbac.authorization.k8s.io/aggregate-to-admin: "true" +rules: +- apiGroups: + - argoproj.io + resources: + - workflows + - workflows/finalizers + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch +{{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index e9d1c7e9..c1097ade 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -12,6 +12,8 @@ init: # being deployed to. In RBAC clusters, that will almost certainly fail. See the NOTES: section of the readme for more info. serviceAccount: "" +createAggregateRoles: true + controller: # podAnnotations is an optional map of annotations to be applied to the controller Pods podAnnotations: {} From 2bcf073bfbb924ed01c2bc7636fe6cae83caaabc Mon Sep 17 00:00:00 2001 From: Paulo Miguel Almeida Date: Thu, 16 May 2019 03:29:56 +1200 Subject: [PATCH 02/19] Key 'metadata' is duplicated (#71) --- charts/argo/templates/workflow-aggregate-roles.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/argo/templates/workflow-aggregate-roles.yaml b/charts/argo/templates/workflow-aggregate-roles.yaml index 3898f3c7..5164ade0 100644 --- a/charts/argo/templates/workflow-aggregate-roles.yaml +++ b/charts/argo/templates/workflow-aggregate-roles.yaml @@ -48,7 +48,6 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: metadata: annotations: helm.sh/hook: pre-install From 0e05194822b5de1150da12d1f12cd252cbdc3a43 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Wed, 15 May 2019 13:27:40 -0500 Subject: [PATCH 03/19] update image versions (#72) --- charts/argo-events/Chart.yaml | 4 ++-- charts/argo-events/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 4b9eac9f..a68d9d65 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 0.4.1 +version: 0.4.2 keywords: - argo-events - sensor-controller @@ -11,4 +11,4 @@ sources: maintainers: - name: Vaibhav Page - name: Matt Magaldi -appVersion: 0.8.1 +appVersion: 0.9.2 diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index d187f0c7..53f1c470 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -23,11 +23,11 @@ singleNamespace: true sensorController: name: sensor-controller image: sensor-controller - tag: v0.8.1 + tag: v0.9.2 replicaCount: 1 gatewayController: name: gateway-controller image: gateway-controller - tag: v0.8.1 + tag: v0.9.2 replicaCount: 1 From fc5d0d2ff07dcc0fb1e40968168989be6508b1a5 Mon Sep 17 00:00:00 2001 From: Penn Date: Thu, 23 May 2019 16:32:28 -0700 Subject: [PATCH 04/19] Update argo and argo-ci helm charts to enable (#74) --- charts/argo-ci/templates/ci-deployment.yaml | 1 + charts/argo-ci/values.yaml | 1 + charts/argo/templates/ui-deployment.yaml | 1 + charts/argo/templates/workflow-controller-deployment.yaml | 1 + charts/argo/values.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/charts/argo-ci/templates/ci-deployment.yaml b/charts/argo-ci/templates/ci-deployment.yaml index c5577cab..8495176b 100644 --- a/charts/argo-ci/templates/ci-deployment.yaml +++ b/charts/argo-ci/templates/ci-deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: ci image: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}" + imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: IN_CLUSTER value: "true" diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml index 59e4daec..092b182e 100644 --- a/charts/argo-ci/values.yaml +++ b/charts/argo-ci/values.yaml @@ -1,6 +1,7 @@ imageNamespace: argoproj ciImage: argoci imageTag: v1.0.0-alpha2 +imagePullPolicy: Always workflowNamespace: default argo: diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml index 8df55b7f..c81d09ea 100644 --- a/charts/argo/templates/ui-deployment.yaml +++ b/charts/argo/templates/ui-deployment.yaml @@ -21,6 +21,7 @@ spec: containers: - name: ui image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ .Values.images.tag }}" + imagePullPolicy: {{ .Values.images.pullPolicy }} env: {{- if .Values.ui.forceNamespaceIsolation }} - name: FORCE_NAMESPACE_ISOLATION diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index 2f35f983..bb489ba6 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -21,6 +21,7 @@ spec: containers: - name: controller image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ .Values.images.tag }}" + imagePullPolicy: {{ .Values.images.pullPolicy }} command: [ "workflow-controller" ] args: - "--configmap" diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index c1097ade..dcfa4fb8 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -3,6 +3,7 @@ images: controller: workflow-controller ui: argoui executor: argoexec + pullPolicy: Always tag: v2.2.1 crdVersion: v1alpha1 From b45b779c2e4eb0fb8737e802558286656ed7ce31 Mon Sep 17 00:00:00 2001 From: Daisuke Taniwaki Date: Tue, 18 Jun 2019 01:33:17 +0900 Subject: [PATCH 05/19] Make containerRuntimeExecutor configurable (#36) --- charts/argo/templates/workflow-controller-config-map.yaml | 1 + charts/argo/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 6d456905..00acc301 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -15,6 +15,7 @@ data: instanceID: {{ .Values.controller.instanceID.explicitID }} {{- end }} {{- end }} + containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }} artifactRepository: {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }} {{- if .Values.artifactRepository.archiveLogs }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index dcfa4fb8..e24130f3 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -26,6 +26,7 @@ controller: name: workflow-controller workflowNamespaces: - default + containerRuntimeExecutor: docker instanceID: # `instanceID.enabled` configures the controller to filter workflow submissions # to only those which have a matching instanceID attribute. From ff190bdc0a3972285f64b5a10e5204f35c2903b2 Mon Sep 17 00:00:00 2001 From: Donald Rauscher Date: Mon, 17 Jun 2019 12:04:39 -0500 Subject: [PATCH 06/19] Add support for S3 artifact keyPrefix (#78) --- charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 00acc301..639f7737 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -33,6 +33,9 @@ data: bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minio.defaultBucket.name }} endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }} insecure: {{ .Values.artifactRepository.s3.insecure }} + {{- if .Values.artifactRepository.s3.keyPrefix }} + keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }} + {{- end }} {{- end}} {{- if .Values.controller.metricsConfig.enabled }} metricsConfig: From 62319a934fbc750830b5f9d592065e218c21f961 Mon Sep 17 00:00:00 2001 From: Jakub Liska Date: Tue, 25 Jun 2019 17:57:20 +0200 Subject: [PATCH 07/19] loadBalancerIP support in argo-ui (#80) --- charts/argo/templates/ui-service.yaml | 3 +++ charts/argo/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/charts/argo/templates/ui-service.yaml b/charts/argo/templates/ui-service.yaml index 3a63613d..5cd848cc 100644 --- a/charts/argo/templates/ui-service.yaml +++ b/charts/argo/templates/ui-service.yaml @@ -19,6 +19,9 @@ spec: app: {{ .Release.Name }}-{{ .Values.ui.name }} sessionAffinity: None type: {{ .Values.ui.serviceType }} + {{- if and (eq .Values.ui.serviceType "LoadBalancer") .Values.ui.loadBalancerIP }} + loadBalancerIP: {{ .Values.ui.loadBalancerIP | quote }} + {{- end }} {{- if and (eq .Values.ui.serviceType "LoadBalancer") .Values.ui.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{ toYaml .Values.ui.loadBalancerSourceRanges | indent 4 }}{{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index e24130f3..45976b09 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -51,6 +51,9 @@ ui: serviceAccount: argo-ui # Annotations to be applied to the UI Service serviceAnnotations: {} + # Static IP address to assign to loadBalancer + # service type `LoadBalancer` + loadBalancerIP: "" # Source ranges to allow access to service from. Only applies to # service type `LoadBalancer` loadBalancerSourceRanges: [] From 9f882e9190d1ce0a31bd793fc4ef635188b70b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?= Date: Tue, 2 Jul 2019 22:41:28 +0200 Subject: [PATCH 08/19] Update Argo to v2.3.0 and add support for Prometheus operator (#73) --- charts/argo/Chart.yaml | 2 +- .../workflow-controller-config-map.yaml | 3 ++ .../workflow-controller-service.yaml | 35 +++++++++++++++++++ .../workflow-controller-servicemonitor.yaml | 33 +++++++++++++++++ charts/argo/values.yaml | 17 ++++++++- 5 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 charts/argo/templates/workflow-controller-service.yaml create mode 100644 charts/argo/templates/workflow-controller-servicemonitor.yaml diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 0b51be4a..9a98250c 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "v2.2.1" description: A Helm chart for Kubernetes name: argo -version: 0.4.0 +version: 0.5.0 diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 639f7737..b635ec81 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -40,3 +40,6 @@ data: {{- if .Values.controller.metricsConfig.enabled }} metricsConfig: {{ toYaml .Values.controller.metricsConfig | indent 6}}{{- end }} + {{- if .Values.controller.telemetryConfig.enabled }} + telemetryConfig: +{{ toYaml .Values.controller.telemetryConfig | indent 6}}{{- end }} diff --git a/charts/argo/templates/workflow-controller-service.yaml b/charts/argo/templates/workflow-controller-service.yaml new file mode 100644 index 00000000..5d4391de --- /dev/null +++ b/charts/argo/templates/workflow-controller-service.yaml @@ -0,0 +1,35 @@ +{{- if or .Values.controller.metricsConfig.enabled .Values.controller.telemetryConfig.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-{{ .Values.controller.name }} + labels: + app: {{ .Release.Name }}-{{ .Values.controller.name}} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + {{- if .Values.controller.serviceAnnotations }} + annotations: +{{ toYaml .Values.controller.serviceAnnotations | indent 4}}{{- end }} +spec: + ports: + {{- if .Values.controller.metricsConfig.enabled }} + - name: metrics + port: {{ .Values.controller.metricsServicePort }} + protocol: TCP + targetPort: {{ .Values.controller.metricsConfig.port }} + {{- end }} + {{- if .Values.controller.telemetryConfig.enabled }} + - name: telemetry + port: {{ .Values.controller.telemetryServicePort }} + protocol: TCP + targetPort: {{ .Values.controller.telemetryConfig.port }} + {{- end }} + selector: + app: {{ .Release.Name }}-{{ .Values.controller.name }} + sessionAffinity: None + type: {{ .Values.controller.serviceType }} + {{- if and (eq .Values.controller.serviceType "LoadBalancer") .Values.controller.loadBalancerSourceRanges }} + loadBalancerSourceRanges: +{{ toYaml .Values.controller.loadBalancerSourceRanges | indent 4 }}{{- end }} +{{- end -}} diff --git a/charts/argo/templates/workflow-controller-servicemonitor.yaml b/charts/argo/templates/workflow-controller-servicemonitor.yaml new file mode 100644 index 00000000..425fedac --- /dev/null +++ b/charts/argo/templates/workflow-controller-servicemonitor.yaml @@ -0,0 +1,33 @@ +{{- if and (or .Values.controller.metricsConfig.enabled .Values.controller.telemetryConfig.enabled) .Values.controller.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ .Release.Name }}-{{ .Values.controller.name }} + labels: + app: {{ .Release.Name }}-{{ .Values.controller.name}} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + {{- if .Values.controller.serviceMonitor.additionalLabels }} +{{ toYaml .Values.controller.serviceMonitor.additionalLabels | indent 4 }} + {{- end }} +spec: + endpoints: + {{- if .Values.controller.metricsConfig.enabled }} + - port: metrics + path: {{ .Values.controller.metricsConfig.path }} + interval: 30s + {{- end }} + {{- if .Values.controller.telemetryConfig.enabled }} + - port: telemetry + path: {{ .Values.controller.telemetryConfig.path }} + interval: 30s + {{- end }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + app: {{ .Release.Name }}-{{ .Values.controller.name}} + release: {{ .Release.Name }} +{{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 45976b09..0db0db25 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -4,7 +4,7 @@ images: ui: argoui executor: argoexec pullPolicy: Always - tag: v2.2.1 + tag: v2.3.0 crdVersion: v1alpha1 @@ -22,6 +22,13 @@ controller: enabled: false path: /metrics port: 8080 + telemetryConfig: + enabled: false + path: /telemetry + port: 8081 + serviceMonitor: + enabled: false + additionalLabels: {} serviceAccount: argo name: workflow-controller workflowNamespaces: @@ -38,6 +45,14 @@ controller: logging: level: info globallevel: "0" + serviceType: ClusterIP + metricsServicePort: 8080 + telemetryServicePort: 8081 + # Annotations to be applied to the controller Service + serviceAnnotations: {} + # Source ranges to allow access to service from. Only applies to + # service type `LoadBalancer` + loadBalancerSourceRanges: [] ui: enabled: true From 6cfac41a4b327a01788fa474a1fe259e69c61b5c Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Mon, 8 Jul 2019 19:31:18 +0200 Subject: [PATCH 09/19] [Argo] Fix appVersion in argo chart (#83) --- charts/argo/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 9a98250c..d7c5ee0e 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "v2.2.1" +appVersion: "v2.3.0" description: A Helm chart for Kubernetes name: argo version: 0.5.0 From 6e108f3aae4d5fa5788640f8bd8b3407e1425c13 Mon Sep 17 00:00:00 2001 From: Mike Hume Date: Mon, 8 Jul 2019 14:06:48 -0700 Subject: [PATCH 10/19] Small url fixes (#82) --- charts/argo-cd/templates/NOTES.txt | 2 +- charts/argo-cd/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/templates/NOTES.txt b/charts/argo-cd/templates/NOTES.txt index ecd1f64b..36ade656 100644 --- a/charts/argo-cd/templates/NOTES.txt +++ b/charts/argo-cd/templates/NOTES.txt @@ -5,7 +5,7 @@ In order to access the server UI you have the following options: and then open the browser on http://localhost:8080 and accept the certificate 2. enable ingress and check the first option ssl passthrough: - https://github.com/argoproj/argo-cd/blob/master/docs/ingress.md#option-1-ssl-passthrough + https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-1-ssl-passthrough After reaching the UI the first time you can login with username: admin and the password will be the name of the server pod. You can get the pod name by running: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 71f5c1a7..15d909dd 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -96,7 +96,7 @@ config: # # url: https://argo-cd-demo.argoproj.io # # # A dex connector configuration. See documentation on how to configure SSO: - # # https://github.com/argoproj/argo-cd/blob/master/docs/sso.md#2-configure-argocd-for-sso + # # https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/sso.md#2-configure-argo-cd-for-sso # connectors: # # GitHub example # - type: github @@ -141,7 +141,7 @@ config: rbac: # # An RBAC policy .csv file containing additional policy and role definitions. -# # See https://github.com/argoproj/argo-cd/blob/master/docs/rbac.md on how to write RBAC policies. +# # See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md on how to write RBAC policies. # policy.csv: | # # Give all members of "my-org:team-alpha" the ability to sync apps in "my-project" # p, my-org:team-alpha, applications, sync, my-project/*, allow From c7b415b6341b9db6c57e3d378e2d98ec493bfbe5 Mon Sep 17 00:00:00 2001 From: Minh Monmen Date: Tue, 23 Jul 2019 01:11:28 +0700 Subject: [PATCH 11/19] add rbac scopes support (#85) --- charts/argo-cd/templates/argocd-rbac-cm.yaml | 3 +++ charts/argo-cd/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/charts/argo-cd/templates/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-rbac-cm.yaml index fb688d03..7d3aa6ea 100755 --- a/charts/argo-cd/templates/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-rbac-cm.yaml @@ -16,3 +16,6 @@ data: policy.csv: {{- toYaml .Values.rbac.policyCsv | indent 4 }} {{- end }} +{{- if .Values.rbac.scopes }} + scopes: {{ .Values.rbac.scopes }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 15d909dd..c4d7c677 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -157,6 +157,8 @@ rbac: # g, your-github-org:your-team, role:org-admin # The default role Argo CD will fall back to, when authorizing API requests policyDefault: #role:readonly + # Scopes controls which OIDC scopes to examine during rbac enforcement (in addition to `sub` scope). + scopes: #[groups] redis: image: From c9a426068e2af901412e4827e2ea47d9d1f6c81a Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Wed, 24 Jul 2019 16:13:27 -0400 Subject: [PATCH 12/19] argo: add support for individual image tags. (#81) --- charts/argo/templates/ui-deployment.yaml | 2 +- .../templates/workflow-controller-deployment.yaml | 4 ++-- charts/argo/values.yaml | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml index c81d09ea..fda2a0d9 100644 --- a/charts/argo/templates/ui-deployment.yaml +++ b/charts/argo/templates/ui-deployment.yaml @@ -20,7 +20,7 @@ spec: serviceAccountName: {{ .Values.ui.serviceAccount | quote }} containers: - name: ui - image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ .Values.images.tag }}" + image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ default .Values.images.tag .Values.ui.image.tag }}" imagePullPolicy: {{ .Values.images.pullPolicy }} env: {{- if .Values.ui.forceNamespaceIsolation }} diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index bb489ba6..586d4132 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -20,14 +20,14 @@ spec: serviceAccountName: {{ .Values.controller.serviceAccount | quote }} containers: - name: controller - image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ .Values.images.tag }}" + image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}" imagePullPolicy: {{ .Values.images.pullPolicy }} command: [ "workflow-controller" ] args: - "--configmap" - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap" - "--executor-image" - - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ .Values.images.tag }}" + - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}" - "--loglevel" - "{{ .Values.controller.logging.level }}" - "--gloglevel" diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 0db0db25..f4a60c10 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -16,6 +16,9 @@ init: createAggregateRoles: true controller: + image: + # Overrides .images.tag if defined. + tag: "" # podAnnotations is an optional map of annotations to be applied to the controller Pods podAnnotations: {} metricsConfig: @@ -54,10 +57,18 @@ controller: # service type `LoadBalancer` loadBalancerSourceRanges: [] +executor: + image: + # Overrides .images.tag if defined. + tag: "" + ui: enabled: true # only show workflows where UI installed forceNamespaceIsolation: false + image: + # Overrides .images.tag if defined. + tag: "" # optional map of annotations to be applied to the ui Pods podAnnotations: {} name: ui From f9863c5b6c2853f7b28994862d5a0ca11e315503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20J=C3=A4ger?= Date: Thu, 25 Jul 2019 18:22:51 +0200 Subject: [PATCH 13/19] Improve chart description (#89) --- charts/argo-ci/Chart.yaml | 2 +- charts/argo/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml index 1ae37023..bdbd58e5 100644 --- a/charts/argo-ci/Chart.yaml +++ b/charts/argo-ci/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v1 -description: A Helm chart for Kubernetes +description: A Helm chart for Argo-CI name: argo-ci version: 0.1.2 diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index d7c5ee0e..58745eb6 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "v2.3.0" -description: A Helm chart for Kubernetes +description: A Helm chart for Argo Workflows name: argo version: 0.5.0 From e41f156cbe1c3ac67faef821acaa9b990d770f8f Mon Sep 17 00:00:00 2001 From: razvan-wework <45373007+razvan-wework@users.noreply.github.com> Date: Tue, 30 Jul 2019 13:44:56 -0700 Subject: [PATCH 14/19] Adds annotations to argocd server (#90) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server-deployment.yaml | 4 ++++ charts/argo-cd/values.yaml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 0de073cc..0a889553 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "0.12.3" description: A Helm chart for Argo-CD name: argo-cd -version: 0.2.2 +version: 0.2.3 diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml index 73d21b2d..01231ae3 100755 --- a/charts/argo-cd/templates/argocd-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-server-deployment.yaml @@ -22,6 +22,10 @@ spec: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/component: server + annotations: + {{- range $key, $value := .Values.server.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} spec: serviceAccountName: argocd-server initContainers: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index c4d7c677..49202837 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -24,6 +24,7 @@ server: extraArgs: [] volumeMounts: [] volumes: [] + annotations: {} repoServer: containerPort: 8081 From 07b173f9672ce176218843a7c8c2a7dc8e439b43 Mon Sep 17 00:00:00 2001 From: wxncjonorri <51964376+wxncjonorri@users.noreply.github.com> Date: Tue, 13 Aug 2019 16:50:13 +0000 Subject: [PATCH 15/19] Updating the version of argo-cd (#91) --- charts/argo-cd/Chart.yaml | 4 +- .../argocd-repo-server-deployment.yaml | 5 + .../templates/argocd-server-deployment.yaml | 6 + .../templates/crds/application-crd.yaml | 1416 ++++++++++++++++- .../templates/crds/appproject-crd.yaml | 107 +- charts/argo-cd/values.yaml | 10 +- 6 files changed, 1531 insertions(+), 17 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 0a889553..9922f5ef 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.12.3" +appVersion: "1.1.2" description: A Helm chart for Argo-CD name: argo-cd -version: 0.2.3 +version: 0.3.0 \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml index 5522dd73..2cbe1e38 100755 --- a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml @@ -31,6 +31,11 @@ spec: command: [argocd-repo-server] ports: - containerPort: {{ .Values.repoServer.containerPort }} + livenessProbe: + initialDelaySeconds: 5 + periodSeconds: 10 + tcpSocket: + port: {{ .Values.repoServer.containerPort }} readinessProbe: tcpSocket: port: {{ .Values.repoServer.containerPort }} diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml index 01231ae3..0c4cb317 100755 --- a/charts/argo-cd/templates/argocd-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-server-deployment.yaml @@ -55,6 +55,12 @@ spec: {{- end }} ports: - containerPort: {{ .Values.server.containerPort }} + livenessProbe: + httpGet: + path: /healthz + port: {{ .Values.server.containerPort }} + initialDelaySeconds: 3 + periodSeconds: 30 readinessProbe: httpGet: path: /healthz diff --git a/charts/argo-cd/templates/crds/application-crd.yaml b/charts/argo-cd/templates/crds/application-crd.yaml index 5c2b8b60..82283283 100644 --- a/charts/argo-cd/templates/crds/application-crd.yaml +++ b/charts/argo-cd/templates/crds/application-crd.yaml @@ -4,9 +4,6 @@ metadata: labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }} helm.sh/chart: {{ include "argo-cd.chart" . }} -# Don't apply label due to https://github.com/argoproj/argo-cd/issues/1425 -# app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} name: applications.argoproj.io annotations: @@ -17,7 +14,1416 @@ spec: kind: Application plural: applications shortNames: - - app - - apps + - app + - apps scope: Namespaced + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: {} + operation: + description: Operation contains requested operation parameters. + properties: + sync: + description: SyncOperation contains sync operation details. + properties: + dryRun: + description: DryRun will perform a `kubectl apply --dry-run` without + actually performing the sync + type: boolean + manifests: + description: Manifests is an optional field that overrides sync + source with a local directory for development + items: + type: string + type: array + prune: + description: Prune deletes resources that are no longer tracked + in git + type: boolean + resources: + description: Resources describes which resources to sync + items: + description: SyncOperationResource contains resources to sync. + properties: + group: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + type: array + revision: + description: Revision is the git revision in which to sync the application + to. If omitted, will use the revision specified in app spec. + type: string + source: + description: ApplicationSource contains information about github + repository, path within repository and target application environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet specific + options + properties: + extVars: + description: ExtVars is a list of Jsonnet External Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific options + properties: + parameters: + description: Parameters are parameters to the helm template + items: + description: HelmParameter is a parameter to a helm template + properties: + name: + description: Name is the name of the helm parameter + type: string + value: + description: Value is the value for the helm parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it will use + the application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value files to + use when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet specific + options + properties: + environment: + description: Environment is a ksonnet application environment + name + type: string + parameters: + description: Parameters are a list of ksonnet component + parameter override values + items: + description: KsonnetParameter is a ksonnet component parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize specific + options + properties: + commonLabels: + description: CommonLabels adds additional kustomize commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag overrides + items: + description: KustomizeImageTag is a kustomize image tag + properties: + name: + description: Name is the name of the image (e.g. nginx) + type: string + value: + description: Value is the value for the new tag (e.g. + 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to resources + for kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository + containing a + type: string + plugin: + description: ApplicationSourcePlugin holds config management + plugin specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the application + manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment + name TargetRevision defines the commit, tag, or branch in + which to sync the application to. If omitted, will sync to + HEAD + type: string + required: + - repoURL + - path + type: object + syncStrategy: + description: SyncStrategy controls the manner in which a sync is + performed + properties: + apply: + description: SyncStrategyApply uses `kubectl apply` to perform + the apply + properties: + force: + description: Force indicates whether or not to supply the + --force flag to `kubectl apply`. The --force flag deletes + and re-create the resource, when PATCH encounters conflict + and has retried for 5 times. + type: boolean + type: object + hook: + description: SyncStrategyHook will perform a sync using hooks + annotations. If no hook annotation is specified falls back + to `kubectl apply`. + properties: + SyncStrategyApply: + description: SyncStrategyApply uses `kubectl apply` to perform + the apply + properties: + force: + description: Force indicates whether or not to supply + the --force flag to `kubectl apply`. The --force flag + deletes and re-create the resource, when PATCH encounters + conflict and has retried for 5 times. + type: boolean + type: object + type: object + type: object + type: object + type: object + spec: + description: ApplicationSpec represents desired application state. Contains + link to repository with application definition and additional parameters + link definition revision. + properties: + destination: + description: ApplicationDestination contains deployment destination + information + properties: + namespace: + description: Namespace overrides the environment namespace value + in the ksonnet app.yaml + type: string + server: + description: Server overrides the environment server value in the + ksonnet app.yaml + type: string + type: object + ignoreDifferences: + description: IgnoreDifferences controls resources fields which should + be ignored during comparison + items: + description: ResourceIgnoreDifferences contains resource filter and + list of json paths which should be ignored during comparison with + live state. + properties: + group: + type: string + jsonPointers: + items: + type: string + type: array + kind: + type: string + name: + type: string + namespace: + type: string + required: + - group + - kind + - jsonPointers + type: object + type: array + info: + description: Infos contains a list of useful information (URLs, email + addresses, and plain text) that relates to the application + items: + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + project: + description: Project is a application project name. Empty name means + that application belongs to 'default' project. + type: string + source: + description: ApplicationSource contains information about github repository, + path within repository and target application environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet specific + options + properties: + extVars: + description: ExtVars is a list of Jsonnet External Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific options + properties: + parameters: + description: Parameters are parameters to the helm template + items: + description: HelmParameter is a parameter to a helm template + properties: + name: + description: Name is the name of the helm parameter + type: string + value: + description: Value is the value for the helm parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it will use the + application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value files to use + when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet specific options + properties: + environment: + description: Environment is a ksonnet application environment + name + type: string + parameters: + description: Parameters are a list of ksonnet component parameter + override values + items: + description: KsonnetParameter is a ksonnet component parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize specific + options + properties: + commonLabels: + description: CommonLabels adds additional kustomize commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag overrides + items: + description: KustomizeImageTag is a kustomize image tag + properties: + name: + description: Name is the name of the image (e.g. nginx) + type: string + value: + description: Value is the value for the new tag (e.g. + 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to resources for + kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository containing + a + type: string + plugin: + description: ApplicationSourcePlugin holds config management plugin + specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the application + manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment name + TargetRevision defines the commit, tag, or branch in which to + sync the application to. If omitted, will sync to HEAD + type: string + required: + - repoURL + - path + type: object + syncPolicy: + description: SyncPolicy controls when a sync will be performed in response + to updates in git + properties: + automated: + description: SyncPolicyAutomated controls the behavior of an automated + sync + properties: + prune: + description: 'Prune will prune resources automatically as part + of automated sync (default: false)' + type: boolean + type: object + type: object + required: + - source + - destination + - project + type: object + status: + description: ApplicationStatus contains information about application sync, + health status + properties: + conditions: + items: + description: ApplicationCondition contains details about current application + condition + properties: + message: + description: Message contains human-readable message indicating + details about condition + type: string + type: + description: Type is an application condition type + type: string + required: + - type + - message + type: object + type: array + health: + properties: + message: + type: string + status: + type: string + type: object + history: + items: + description: RevisionHistory contains information relevant to an application + deployment + properties: + deployedAt: {} + id: + format: int64 + type: integer + revision: + type: string + source: + description: ApplicationSource contains information about github + repository, path within repository and target application environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet specific + options + properties: + extVars: + description: ExtVars is a list of Jsonnet External + Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific options + properties: + parameters: + description: Parameters are parameters to the helm template + items: + description: HelmParameter is a parameter to a helm + template + properties: + name: + description: Name is the name of the helm parameter + type: string + value: + description: Value is the value for the helm parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it will + use the application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value files + to use when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet specific + options + properties: + environment: + description: Environment is a ksonnet application environment + name + type: string + parameters: + description: Parameters are a list of ksonnet component + parameter override values + items: + description: KsonnetParameter is a ksonnet component + parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize specific + options + properties: + commonLabels: + description: CommonLabels adds additional kustomize commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag overrides + items: + description: KustomizeImageTag is a kustomize image + tag + properties: + name: + description: Name is the name of the image (e.g. + nginx) + type: string + value: + description: Value is the value for the new tag + (e.g. 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to resources + for kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository + containing a + type: string + plugin: + description: ApplicationSourcePlugin holds config management + plugin specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the application + manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment + name TargetRevision defines the commit, tag, or branch in + which to sync the application to. If omitted, will sync + to HEAD + type: string + required: + - repoURL + - path + type: object + required: + - revision + - deployedAt + - id + type: object + type: array + observedAt: {} + operationState: + description: OperationState contains information about state of currently + performing operation on application. + properties: + finishedAt: {} + message: + description: Message hold any pertinent messages when attempting + to perform operation (typically errors). + type: string + operation: + description: Operation contains requested operation parameters. + properties: + sync: + description: SyncOperation contains sync operation details. + properties: + dryRun: + description: DryRun will perform a `kubectl apply --dry-run` + without actually performing the sync + type: boolean + manifests: + description: Manifests is an optional field that overrides + sync source with a local directory for development + items: + type: string + type: array + prune: + description: Prune deletes resources that are no longer + tracked in git + type: boolean + resources: + description: Resources describes which resources to sync + items: + description: SyncOperationResource contains resources + to sync. + properties: + group: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + type: array + revision: + description: Revision is the git revision in which to sync + the application to. If omitted, will use the revision + specified in app spec. + type: string + source: + description: ApplicationSource contains information about + github repository, path within repository and target application + environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet + specific options + properties: + extVars: + description: ExtVars is a list of Jsonnet External + Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level + Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific + options + properties: + parameters: + description: Parameters are parameters to the helm + template + items: + description: HelmParameter is a parameter to a + helm template + properties: + name: + description: Name is the name of the helm + parameter + type: string + value: + description: Value is the value for the helm + parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it + will use the application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value + files to use when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet + specific options + properties: + environment: + description: Environment is a ksonnet application + environment name + type: string + parameters: + description: Parameters are a list of ksonnet component + parameter override values + items: + description: KsonnetParameter is a ksonnet component + parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize + specific options + properties: + commonLabels: + description: CommonLabels adds additional kustomize + commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag + overrides + items: + description: KustomizeImageTag is a kustomize + image tag + properties: + name: + description: Name is the name of the image + (e.g. nginx) + type: string + value: + description: Value is the value for the new + tag (e.g. 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to + resources for kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository + containing a + type: string + plugin: + description: ApplicationSourcePlugin holds config management + plugin specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the + application manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment + name TargetRevision defines the commit, tag, or branch + in which to sync the application to. If omitted, will + sync to HEAD + type: string + required: + - repoURL + - path + type: object + syncStrategy: + description: SyncStrategy controls the manner in which a + sync is performed + properties: + apply: + description: SyncStrategyApply uses `kubectl apply` + to perform the apply + properties: + force: + description: Force indicates whether or not to supply + the --force flag to `kubectl apply`. The --force + flag deletes and re-create the resource, when + PATCH encounters conflict and has retried for + 5 times. + type: boolean + type: object + hook: + description: SyncStrategyHook will perform a sync using + hooks annotations. If no hook annotation is specified + falls back to `kubectl apply`. + properties: + SyncStrategyApply: + description: SyncStrategyApply uses `kubectl apply` + to perform the apply + properties: + force: + description: Force indicates whether or not + to supply the --force flag to `kubectl apply`. + The --force flag deletes and re-create the + resource, when PATCH encounters conflict and + has retried for 5 times. + type: boolean + type: object + type: object + type: object + type: object + type: object + phase: + description: Phase is the current phase of the operation + type: string + startedAt: {} + syncResult: + description: SyncOperationResult represent result of sync operation + properties: + resources: + description: Resources holds the sync result of each individual + resource + items: + description: ResourceResult holds the operation result details + of a specific resource + properties: + group: + type: string + hookPhase: + description: 'the state of any operation associated with + this resource OR hook note: can contain values for non-hook + resources' + type: string + hookType: + description: the type of the hook, empty for non-hook + resources + type: string + kind: + type: string + message: + description: message for the last sync OR operation + type: string + name: + type: string + namespace: + type: string + status: + description: the final result of the sync, this is be + empty if the resources is yet to be applied/pruned and + is always zero-value for hooks + type: string + syncPhase: + description: indicates the particular phase of the sync + that this is for + type: string + version: + type: string + required: + - group + - version + - kind + - namespace + - name + type: object + type: array + revision: + description: Revision holds the git commit SHA of the sync + type: string + source: + description: ApplicationSource contains information about github + repository, path within repository and target application + environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet + specific options + properties: + extVars: + description: ExtVars is a list of Jsonnet External + Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level + Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific options + properties: + parameters: + description: Parameters are parameters to the helm template + items: + description: HelmParameter is a parameter to a helm + template + properties: + name: + description: Name is the name of the helm parameter + type: string + value: + description: Value is the value for the helm parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it will + use the application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value files + to use when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet specific + options + properties: + environment: + description: Environment is a ksonnet application environment + name + type: string + parameters: + description: Parameters are a list of ksonnet component + parameter override values + items: + description: KsonnetParameter is a ksonnet component + parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize + specific options + properties: + commonLabels: + description: CommonLabels adds additional kustomize + commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag overrides + items: + description: KustomizeImageTag is a kustomize image + tag + properties: + name: + description: Name is the name of the image (e.g. + nginx) + type: string + value: + description: Value is the value for the new tag + (e.g. 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to resources + for kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository + containing a + type: string + plugin: + description: ApplicationSourcePlugin holds config management + plugin specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the application + manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment + name TargetRevision defines the commit, tag, or branch + in which to sync the application to. If omitted, will + sync to HEAD + type: string + required: + - repoURL + - path + type: object + required: + - revision + type: object + required: + - operation + - phase + - startedAt + type: object + reconciledAt: {} + resources: + items: + description: ResourceStatus holds the current sync and health status + of a resource + properties: + group: + type: string + health: + properties: + message: + type: string + status: + type: string + type: object + hook: + type: boolean + kind: + type: string + name: + type: string + namespace: + type: string + status: + type: string + version: + type: string + type: object + type: array + sourceType: + type: string + summary: + properties: + externalURLs: + description: ExternalURLs holds all external URLs of application + child resources. + items: + type: string + type: array + images: + description: Images holds all images of application child resources. + items: + type: string + type: array + type: object + sync: + description: SyncStatus is a comparison result of application spec and + deployed application. + properties: + comparedTo: + description: ComparedTo contains application source and target which + was used for resources comparison + properties: + destination: + description: ApplicationDestination contains deployment destination + information + properties: + namespace: + description: Namespace overrides the environment namespace + value in the ksonnet app.yaml + type: string + server: + description: Server overrides the environment server value + in the ksonnet app.yaml + type: string + type: object + source: + description: ApplicationSource contains information about github + repository, path within repository and target application + environment. + properties: + directory: + properties: + jsonnet: + description: ApplicationSourceJsonnet holds jsonnet + specific options + properties: + extVars: + description: ExtVars is a list of Jsonnet External + Variables + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + tlas: + description: TLAS is a list of Jsonnet Top-level + Arguments + items: + description: JsonnetVar is a jsonnet variable + properties: + code: + type: boolean + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + recurse: + type: boolean + type: object + helm: + description: ApplicationSourceHelm holds helm specific options + properties: + parameters: + description: Parameters are parameters to the helm template + items: + description: HelmParameter is a parameter to a helm + template + properties: + name: + description: Name is the name of the helm parameter + type: string + value: + description: Value is the value for the helm parameter + type: string + type: object + type: array + releaseName: + description: The Helm release name. If omitted it will + use the application name + type: string + valueFiles: + description: ValuesFiles is a list of Helm value files + to use when generating a template + items: + type: string + type: array + type: object + ksonnet: + description: ApplicationSourceKsonnet holds ksonnet specific + options + properties: + environment: + description: Environment is a ksonnet application environment + name + type: string + parameters: + description: Parameters are a list of ksonnet component + parameter override values + items: + description: KsonnetParameter is a ksonnet component + parameter + properties: + component: + type: string + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array + type: object + kustomize: + description: ApplicationSourceKustomize holds kustomize + specific options + properties: + commonLabels: + description: CommonLabels adds additional kustomize + commonLabels + type: object + imageTags: + description: ImageTags are kustomize 1.0 image tag overrides + items: + description: KustomizeImageTag is a kustomize image + tag + properties: + name: + description: Name is the name of the image (e.g. + nginx) + type: string + value: + description: Value is the value for the new tag + (e.g. 1.8.0) + type: string + type: object + type: array + images: + description: Images are kustomize 2.0 image overrides + items: + type: string + type: array + namePrefix: + description: NamePrefix is a prefix appended to resources + for kustomize apps + type: string + type: object + path: + description: Path is a directory path within the repository + containing a + type: string + plugin: + description: ApplicationSourcePlugin holds config management + plugin specific options + properties: + name: + type: string + type: object + repoURL: + description: RepoURL is the git repository URL of the application + manifests + type: string + targetRevision: + description: Environment is a ksonnet application environment + name TargetRevision defines the commit, tag, or branch + in which to sync the application to. If omitted, will + sync to HEAD + type: string + required: + - repoURL + - path + type: object + required: + - source + - destination + type: object + revision: + type: string + status: + type: string + required: + - status + type: object + type: object + type: object version: v1alpha1 diff --git a/charts/argo-cd/templates/crds/appproject-crd.yaml b/charts/argo-cd/templates/crds/appproject-crd.yaml index afd1a38e..ebe038b6 100644 --- a/charts/argo-cd/templates/crds/appproject-crd.yaml +++ b/charts/argo-cd/templates/crds/appproject-crd.yaml @@ -4,9 +4,6 @@ metadata: labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }} helm.sh/chart: {{ include "argo-cd.chart" . }} -# Don't apply label due to https://github.com/argoproj/argo-cd/issues/1425 -# app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} name: appprojects.argoproj.io annotations: @@ -17,7 +14,107 @@ spec: kind: AppProject plural: appprojects shortNames: - - appproj - - appprojs + - appproj + - appprojs scope: Namespaced + validation: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + metadata: {} + spec: + description: AppProjectSpec is the specification of an AppProject + properties: + clusterResourceWhitelist: + description: ClusterResourceWhitelist contains list of whitelisted cluster + level resources + items: {} + type: array + description: + description: Description contains optional project description + type: string + destinations: + description: Destinations contains list of destinations available for + deployment + items: + description: ApplicationDestination contains deployment destination + information + properties: + namespace: + description: Namespace overrides the environment namespace value + in the ksonnet app.yaml + type: string + server: + description: Server overrides the environment server value in + the ksonnet app.yaml + type: string + type: object + type: array + namespaceResourceBlacklist: + description: NamespaceResourceBlacklist contains list of blacklisted + namespace level resources + items: {} + type: array + roles: + description: Roles are user defined RBAC roles associated with this + project + items: + description: ProjectRole represents a role that has access to a project + properties: + description: + description: Description is a description of the role + type: string + groups: + description: Groups are a list of OIDC group claims bound to this + role + items: + type: string + type: array + jwtTokens: + description: JWTTokens are a list of generated JWT tokens bound + to this role + items: + description: JWTToken holds the issuedAt and expiresAt values + of a token + properties: + exp: + format: int64 + type: integer + iat: + format: int64 + type: integer + required: + - iat + type: object + type: array + name: + description: Name is a name for this role + type: string + policies: + description: Policies Stores a list of casbin formated strings + that define access policies for the role in the project + items: + type: string + type: array + required: + - name + type: object + type: array + sourceRepos: + description: SourceRepos contains list of git repository URLs which + can be used for deployment + items: + type: string + type: array + type: object + type: object version: v1alpha1 diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 49202837..af7e0a8b 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3,7 +3,7 @@ applicationController: servicePort: 8082 image: repository: argoproj/argocd - tag: v0.12.3 + tag: v1.1.2 pullPolicy: Always volumeMounts: [] volumes: [] @@ -15,11 +15,11 @@ server: serviceAnnotations: {} image: repository: argoproj/argocd - tag: v0.12.3 + tag: v1.1.2 pullPolicy: Always uiInitImage: repository: argoproj/argocd-ui - tag: v0.12.3 + tag: v.1.1.2 pullPolicy: Always extraArgs: [] volumeMounts: [] @@ -31,7 +31,7 @@ repoServer: servicePort: 8081 image: repository: argoproj/argocd - tag: v0.12.3 + tag: v1.1.2 pullPolicy: Always volumeMounts: [] volumes: [] @@ -47,7 +47,7 @@ dexServer: pullPolicy: Always initImage: repository: argoproj/argocd - tag: v0.12.3 + tag: v1.1.2 pullPolicy: Always volumeMounts: [] volumes: [] From 8d281b387eec74eea288587e1465e802a3b0f8a8 Mon Sep 17 00:00:00 2001 From: thorker <46462404+thorker@users.noreply.github.com> Date: Wed, 14 Aug 2019 21:51:42 +0200 Subject: [PATCH 16/19] Fixed typo at argocd-ui (#94) --- charts/argo-cd/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index af7e0a8b..6055ac86 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -19,7 +19,7 @@ server: pullPolicy: Always uiInitImage: repository: argoproj/argocd-ui - tag: v.1.1.2 + tag: v1.1.2 pullPolicy: Always extraArgs: [] volumeMounts: [] From 77e638f55df69450b887087e5103bcae90db6fee Mon Sep 17 00:00:00 2001 From: Naseem Date: Fri, 16 Aug 2019 12:36:37 -0400 Subject: [PATCH 17/19] Add resources values to ui and controller (#95) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/ui-deployment.yaml | 2 ++ charts/argo/templates/workflow-controller-deployment.yaml | 2 ++ charts/argo/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 58745eb6..294b83f4 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "v2.3.0" description: A Helm chart for Argo Workflows name: argo -version: 0.5.0 +version: 0.5.1 diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml index fda2a0d9..31d998cd 100644 --- a/charts/argo/templates/ui-deployment.yaml +++ b/charts/argo/templates/ui-deployment.yaml @@ -36,4 +36,6 @@ spec: fieldPath: metadata.namespace - name: BASE_HREF value: / + resources: + {{- toYaml .Values.ui.resources | nindent 12 }} {{- end -}} diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index 586d4132..69b5f8bc 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -38,3 +38,5 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + resources: + {{- toYaml .Values.controller.resources | nindent 12 }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index f4a60c10..06ae465a 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -56,6 +56,7 @@ controller: # Source ranges to allow access to service from. Only applies to # service type `LoadBalancer` loadBalancerSourceRanges: [] + resources: {} executor: image: @@ -83,6 +84,7 @@ ui: # Source ranges to allow access to service from. Only applies to # service type `LoadBalancer` loadBalancerSourceRanges: [] + resources: {} ## Ingress configuration. ## ref: https://kubernetes.io/docs/user-guide/ingress/ From 108fb73d2c450c4869054cbb1f529eed9461213f Mon Sep 17 00:00:00 2001 From: Sean Johnson Date: Sat, 7 Sep 2019 02:42:52 +1000 Subject: [PATCH 18/19] Update argo-cd to reflect new 1.2.0 deployment (#101) (#102) --- charts/argo-cd/Chart.yaml | 4 +- charts/argo-cd/README.md | 87 ++ ...plication-controller-metrics-service.yaml} | 0 charts/argo-cd/templates/argocd-cm.yaml | 2 +- charts/argo-cd/templates/argocd-rbac-cm.yaml | 2 +- charts/argo-cd/templates/argocd-secret.yaml | 11 +- .../templates/argocd-server-deployment.yaml | 11 +- .../templates/argocd-server-metrics.yaml | 19 + .../templates/crds/application-crd.yaml | 1052 +++++++++++------ .../templates/crds/appproject-crd.yaml | 400 ++++++- charts/argo-cd/values.yaml | 47 +- 11 files changed, 1200 insertions(+), 435 deletions(-) create mode 100644 charts/argo-cd/README.md rename charts/argo-cd/templates/{argocd-metrics-service.yaml => argocd-application-controller-metrics-service.yaml} (100%) create mode 100755 charts/argo-cd/templates/argocd-server-metrics.yaml diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 9922f5ef..86bd0b34 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "1.1.2" +appVersion: "1.2.0" description: A Helm chart for Argo-CD name: argo-cd -version: 0.3.0 \ No newline at end of file +version: 0.4.0 diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md new file mode 100644 index 00000000..28f08c73 --- /dev/null +++ b/charts/argo-cd/README.md @@ -0,0 +1,87 @@ +# argo-cd + +This chart installs [argo-cd](https://argoproj.github.io/argo-cd/), a declarative, GitOps continuous delivery tool for Kubernetes. + +The default installation is intended to be similar to the provided ArgoCD [releases](https://github.com/argoproj/argo-cd/releases). + +This chart currently installs the non-HA version of ArgoCD. + +## Prerequisites + +- Kubernetes 1.7+ + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm repo add argo https://argoproj.github.io/argo-helm +$ helm install --name my-release argo/argo-cd +``` + +## Chart Values + +| Key | Type | Default | Description | +| -------------------------------------- | ------ | ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| applicationController.containerPort | int | `8082` | Container port for application controller server and metrics | +| applicationController.image.pullPolicy | string | `"Always"` | Docker image pull policy | +| applicationController.image.repository | string | `"argoproj/argocd"` | Docker image repo | +| applicationController.image.tag | string | `"v1.2.0"` | Docker image tag | +| applicationController.servicePort | int | `8082` | Service port for applicaiton controller server | +| applicationController.volumeMounts | list | `[]` | Additional volume mounts | +| applicationController.volumes | list | `[]` | Additional volumes | +| clusterAdminAccess.enabled | bool | `true` | Standard Argo CD installation with cluster-admin access. Set this true if you plan to use Argo CD to deploy applications in the same cluster that Argo CD runs in (i.e. kubernetes.svc.default). Will still be able to deploy to external clusters with inputted credentials. | +| config.configManagementPlugins | string | `nil` | List of custom config management plugins, see [values.yaml](./values.yaml) for format | +| config.createSecret | bool | `true` | Creates the argocd-secret secret, set to false to manage externally | +| config.dexConfig | string | `nil` | Configuration for external auth and URL, see [values.yaml](./values.yaml) for format | +| config.helmRepositories | string | `nil` | Configuration for external Helm charts, see [values.yaml](./values.yaml) for format | +| config.oidcConfig | string | `nil` | Configuration for OpenID connect, see [values.yaml](./values.yaml) for format | +| config.repositories | string | `nil` | Configuration for remote Git repositories for Applications, see [values.yaml](./values.yaml) for format | +| config.resourceCustomizations | string | `nil` | resourceCustomizations can be used to create custom health checks for resources [https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/health.md#way-1-define-a-custom-health-check-in-argocd-cm-configmap] | +| config.url | string | `nil` | External URL for ArgoCD | +| config.webhook.bitbucketSecret | string | `nil` | BitBucket incoming webhook secret | +| config.webhook.githubSecret | string | `nil` | GitHub incoming webhook secret | +| config.webhook.gitlabSecret | string | `nil` | GitLab incoming webhook secret | +| dexServer.containerPortGrpc | int | `5557` | Container port for Dex Server GRPC | +| dexServer.containerPortHttp | int | `5556` | Container port for Dex Server HTTP | +| dexServer.image.pullPolicy | string | `"Always"` | Docker image pull policy | +| dexServer.image.repository | string | `"quay.io/dexidp/dex"` | Docker image repo | +| dexServer.image.tag | string | `"v2.12.0"` | Docker image tag | +| dexServer.initImage.pullPolicy | string | `"Always"` | Docker image pull policy | +| dexServer.initImage.repository | string | `"argoproj/argocd"` | Docker image repo | +| dexServer.initImage.tag | string | `"v1.2.0"` | Docker image tag | +| dexServer.servicePortGrpc | int | `5557` | Service port for Dex Server GRPC | +| dexServer.servicePortHttp | int | `5556` | Service port for Dex Server GRPC | +| dexServer.volumeMounts | list | `[]` | Additional volume mounts | +| dexServer.volumes | list | `[]` | Additional volumes | +| ingress.annotations | object | `{}` | Annotations for ingress object, set `nginx.ingress.kubernetes.io/force-ssl-redirect: "true"` and `nginx.ingress.kubernetes.io/ssl-passthrough: "true"` if serving GRPC and HTTPS on the same ingress | +| ingress.enabled | bool | `false` | Enable ingress | +| ingress.hosts[0] | string | `"argocd.example.com"` | Ingress host | +| ingress.path | string | `"/"` | Ingress path | +| rbac.policyCsv | string | `nil` | RBAC policy in CSV, see [values.yaml](./values.yaml) for format | +| rbac.policyDefault | string | `nil` | The default role Argo CD will fall back to, when authorizing API requests, ie: `role:readonly` | +| rbac.scopes | string | `nil` | Scopes controls which OIDC scopes to examine during rbac enforcement (in addition to `sub` scope). ie: `[groups]` | +| redis.containerPort | int | `6379` | Container port for Redis | +| redis.image.pullPolicy | string | `"Always"` | Docker image pull policy | +| redis.image.repository | string | `"redis"` | Docker image repo | +| redis.image.tag | string | `"5.0.3"` | Docker image tag | +| redis.servicePort | int | `6379` | Service port for Redis | +| repoServer.containerPort | int | `8081` | Container port for repo server | +| repoServer.image.pullPolicy | string | `"Always"` | Docker image pull policy | +| repoServer.image.repository | string | `"argoproj/argocd"` | Docker image repo | +| repoServer.image.tag | string | `"v1.2.0"` | Docker image tag | +| repoServer.servicePort | int | `8081` | Service port for repo server | +| repoServer.volumeMounts | list | `[]` | Additional volume mounts | +| repoServer.volumes | list | `[]` | Additional volumes | +| server.annotations | object | `{}` | Annotations for the server deployment | +| server.containerPort | int | `8080` | Container port for server | +| server.extraArgs | list | `[]` | Add additional arguments | +| server.image.pullPolicy | string | `"Always"` | Docker image pull policy | +| server.image.repository | string | `"argoproj/argocd"` | Docker image repo | +| server.image.tag | string | `"v1.2.0"` | Docker image tag | +| server.metricsPort | int | `8083` | Container port for server metrics | +| server.serviceAnnotations | object | `{}` | Annotations for server service | +| server.servicePortHttp | int | `80` | HTTP Container port for server | +| server.servicePortHttps | int | `443` | HTTPS Container port for server | +| server.volumeMounts | list | `[]` | Additional volume mounts, see [values.yaml](./values.yaml) for syntax for SSH known hosts | +| server.volumes | list | `[]` | Additional volumes, see [values.yaml](./values.yaml) for syntax for SSH known hosts | diff --git a/charts/argo-cd/templates/argocd-metrics-service.yaml b/charts/argo-cd/templates/argocd-application-controller-metrics-service.yaml similarity index 100% rename from charts/argo-cd/templates/argocd-metrics-service.yaml rename to charts/argo-cd/templates/argocd-application-controller-metrics-service.yaml diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml index 2c8f2f36..98467bb8 100755 --- a/charts/argo-cd/templates/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-cm.yaml @@ -7,7 +7,7 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd data: {{- if .Values.config.helmRepositories }} helm.repositories: | diff --git a/charts/argo-cd/templates/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-rbac-cm.yaml index 7d3aa6ea..84e791da 100755 --- a/charts/argo-cd/templates/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-rbac-cm.yaml @@ -7,7 +7,7 @@ metadata: helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/part-of: argocd data: {{- if .Values.rbac.policyDefault }} policy.default: {{ .Values.rbac.policyDefault }} diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml index c693d079..c29fa53d 100755 --- a/charts/argo-cd/templates/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-secret.yaml @@ -1,15 +1,18 @@ +{{- if .Values.config.createSecret }} apiVersion: v1 kind: Secret metadata: name: argocd-secret - labels: + labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} type: Opaque -data: +{{- if or .Values.config.webhook.githubSecret (or .Values.config.webhook.gitlabSecret .Values.config.webhook.bitbucketSecret) }} +Setting a blank data again will wipe admin password/key/cert +data: {{- if .Values.config.webhook.githubSecret }} github.webhook.secret: {{ .Values.config.webhook.githubSecret }} {{- end }} @@ -18,4 +21,6 @@ data: {{- end }} {{- if .Values.config.webhook.bitbucketSecret }} bitbucket.webhook.uuid: {{ .Values.config.webhook.bitbucketSecret }} -{{- end }} \ No newline at end of file +{{- end }} +{{- end }} +{{- end }} diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml index 0c4cb317..7613b0b3 100755 --- a/charts/argo-cd/templates/argocd-server-deployment.yaml +++ b/charts/argo-cd/templates/argocd-server-deployment.yaml @@ -28,14 +28,6 @@ spec: {{- end }} spec: serviceAccountName: argocd-server - initContainers: - - name: ui - image: {{ .Values.server.uiInitImage.repository }}:{{ .Values.server.uiInitImage.tag }} - imagePullPolicy: {{ .Values.server.uiInitImage.pullPolicy }} - command: [cp, -r, /app, /shared] - volumeMounts: - - mountPath: /shared - name: static-files containers: - name: argocd-server image: {{ .Values.server.image.repository }}:{{ .Values.server.image.tag }} @@ -48,13 +40,12 @@ spec: - {{. | quote }} {{- end }} volumeMounts: - - mountPath: /shared - name: static-files {{- if .Values.server.volumeMounts }} {{ toYaml .Values.server.volumeMounts | nindent 8 | trim }} {{- end }} ports: - containerPort: {{ .Values.server.containerPort }} + - containerPort: {{ .Values.server.metricsPort }} livenessProbe: httpGet: path: /healthz diff --git a/charts/argo-cd/templates/argocd-server-metrics.yaml b/charts/argo-cd/templates/argocd-server-metrics.yaml new file mode 100755 index 00000000..c1956906 --- /dev/null +++ b/charts/argo-cd/templates/argocd-server-metrics.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server + helm.sh/chart: {{ include "argo-cd.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} + app.kubernetes.io/component: server + name: argocd-server-metrics +spec: + ports: + - name: metrics + protocol: TCP + port: {{ .Values.server.servicePortHttp }} + targetPort: {{ .Values.server.metricsPort }} + selector: + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server diff --git a/charts/argo-cd/templates/crds/application-crd.yaml b/charts/argo-cd/templates/crds/application-crd.yaml index 82283283..71864891 100644 --- a/charts/argo-cd/templates/crds/application-crd.yaml +++ b/charts/argo-cd/templates/crds/application-crd.yaml @@ -14,11 +14,12 @@ spec: kind: Application plural: applications shortNames: - - app - - apps + - app + - apps scope: Namespaced validation: openAPIV3Schema: + description: Application is a definition of Application resource. properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -30,12 +31,359 @@ spec: object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' type: string - metadata: {} + metadata: + properties: + annotations: + additionalProperties: + type: string + description: 'Annotations is an unstructured key value map stored with + a resource that may be set by external tools to store and retrieve + arbitrary metadata. They are not queryable and should be preserved + when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + clusterName: + description: The name of the cluster which the object belongs to. This + is used to distinguish resources with same name and namespace in different + clusters. This field is not set anywhere right now and apiserver is + going to ignore it if set in create or update request. + type: string + deletionGracePeriodSeconds: + description: Number of seconds allowed for this object to gracefully + terminate before it will be removed from the system. Only set when + deletionTimestamp is also set. May only be shortened. Read-only. + format: int64 + type: integer + deletionTimestamp: + description: "DeletionTimestamp is RFC 3339 date and time at which this + resource will be deleted. This field is set by the server when a graceful + deletion is requested by the user, and is not directly settable by + a client. The resource is expected to be deleted (no longer visible + from resource lists, and not reachable by name) after the time in + this field, once the finalizers list is empty. As long as the finalizers + list contains items, deletion is blocked. Once the deletionTimestamp + is set, this value may not be unset or be set further into the future, + although it may be shortened or the resource may be deleted prior + to this time. For example, a user may request that a pod is deleted + in 30 seconds. The Kubelet will react by sending a graceful termination + signal to the containers in the pod. After that 30 seconds, the Kubelet + will send a hard termination signal (SIGKILL) to the container and + after cleanup, remove the pod from the API. In the presence of network + partitions, this object may still exist after this timestamp, until + an administrator or automated process can determine the resource is + fully terminated. If not set, graceful deletion of the object has + not been requested. \n Populated by the system when a graceful deletion + is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata" + format: date-time + type: string + finalizers: + description: Must be empty before the object is deleted from the registry. + Each entry is an identifier for the responsible component that will + remove the entry from the list. If the deletionTimestamp of the object + is non-nil, entries in this list can only be removed. + items: + type: string + type: array + generateName: + description: "GenerateName is an optional prefix, used by the server, + to generate a unique name ONLY IF the Name field has not been provided. + If this field is used, the name returned to the client will be different + than the name passed. This value will also be combined with a unique + suffix. The provided value has the same validation rules as the Name + field, and may be truncated by the length of the suffix required to + make the value unique on the server. \n If this field is specified + and the generated name exists, the server will NOT return a 409 - + instead, it will either return 201 Created or 500 with Reason ServerTimeout + indicating a unique name could not be found in the time allotted, + and the client should retry (optionally after the time indicated in + the Retry-After header). \n Applied only if Name is not specified. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency" + type: string + generation: + description: A sequence number representing a specific generation of + the desired state. Populated by the system. Read-only. + format: int64 + type: integer + initializers: + description: "An initializer is a controller which enforces some system + invariant at object creation time. This field is a list of initializers + that have not yet acted on this object. If nil or empty, this object + has been completely initialized. Otherwise, the object is considered + uninitialized and is hidden (in list/watch and get calls) from clients + that haven't explicitly asked to observe uninitialized objects. \n + When an object is created, the system will populate this list with + the current set of initializers. Only privileged users may set or + modify this list. Once it is empty, it may not be modified further + by any user. \n DEPRECATED - initializers are an alpha field and will + be removed in v1.15." + properties: + pending: + description: Pending is a list of initializers that must execute + in order before this object is visible. When the last pending + initializer is removed, and no failing result is set, the initializers + struct will be set to nil and the object is considered as initialized + and visible to all clients. + items: + properties: + name: + description: name of the process that is responsible for initializing + this object. + type: string + required: + - name + type: object + type: array + result: + description: If result is set with the Failure field, the object + will be persisted to storage and then deleted, ensuring that other + clients can observe the deletion. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this + representation of an object. Servers should convert recognized + schemas to the latest internal value, and may reject unrecognized + values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + code: + description: Suggested HTTP return code for this status, 0 if + not set. + format: int32 + type: integer + details: + description: Extended data associated with the reason. Each + reason may define its own extended details. This field is + optional and the data returned is not guaranteed to conform + to any schema except that defined by the reason type. + properties: + causes: + description: The Causes array includes more details associated + with the StatusReason failure. Not all StatusReasons may + provide detailed causes. + items: + properties: + field: + description: "The field of the resource that has caused + this error, as named by its JSON serialization. + May include dot and postfix notation for nested + attributes. Arrays are zero-indexed. Fields may + appear more than once in an array of causes due + to fields having multiple errors. Optional. \n Examples: + \ \"name\" - the field \"name\" on the current + resource \"items[0].name\" - the field \"name\" + on the first array entry in \"items\"" + type: string + message: + description: A human-readable description of the cause + of the error. This field may be presented as-is + to a reader. + type: string + reason: + description: A machine-readable description of the + cause of the error. If this value is empty there + is no information available. + type: string + type: object + type: array + group: + description: The group attribute of the resource associated + with the status StatusReason. + type: string + kind: + description: 'The kind attribute of the resource associated + with the status StatusReason. On some operations may differ + from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: The name attribute of the resource associated + with the status StatusReason (when there is a single name + which can be described). + type: string + retryAfterSeconds: + description: If specified, the time in seconds before the + operation should be retried. Some errors may indicate + the client must take an alternate action - for those errors + this field may indicate how long to wait before taking + the alternate action. + format: int32 + type: integer + uid: + description: 'UID of the resource. (when there is a single + resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + type: object + kind: + description: 'Kind is a string value representing the REST resource + this object represents. Servers may infer this from the endpoint + the client submits requests to. Cannot be updated. In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + message: + description: A human-readable description of the status of this + operation. + type: string + metadata: + description: 'Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + properties: + continue: + description: continue may be set if the user set a limit + on the number of items returned, and indicates that the + server has more data available. The value is opaque and + may be used to issue another request to the endpoint that + served this list to retrieve the next set of available + objects. Continuing a consistent list may not be possible + if the server configuration has changed or more than a + few minutes have passed. The resourceVersion field returned + when using this continue value will be identical to the + value in the first response, unless you have received + this token from an error message. + type: string + resourceVersion: + description: 'String that identifies the server''s internal + version of this object that can be used by clients to + determine when objects have changed. Value must be treated + as opaque by clients and passed unmodified back to the + server. Populated by the system. Read-only. More info: + https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency' + type: string + selfLink: + description: selfLink is a URL representing this object. + Populated by the system. Read-only. + type: string + type: object + reason: + description: A machine-readable description of why this operation + is in the "Failure" status. If this value is empty there is + no information available. A Reason clarifies an HTTP status + code but does not override it. + type: string + status: + description: 'Status of the operation. One of: "Success" or + "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + type: string + type: object + required: + - pending + type: object + labels: + additionalProperties: + type: string + description: 'Map of string keys and values that can be used to organize + and categorize (scope and select) objects. May match selectors of + replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' + type: object + managedFields: + description: "ManagedFields maps workflow-id and version to the set + of fields that are managed by that workflow. This is mostly for internal + housekeeping, and users typically shouldn't need to set or understand + this field. A workflow can be the user's name, a controller's name, + or the name of a specific apply path like \"ci-cd\". The set of fields + is always in the version that the workflow used when modifying the + object. \n This field is alpha and can be changed or removed without + notice." + items: + properties: + apiVersion: + description: APIVersion defines the version of this resource that + this field set applies to. The format is "group/version" just + like the top-level APIVersion field. It is necessary to track + the version of a field set because it cannot be automatically + converted. + type: string + fields: + additionalProperties: true + description: Fields identifies a set of fields. + type: object + manager: + description: Manager is an identifier of the workflow managing + these fields. + type: string + operation: + description: Operation is the type of operation which lead to + this ManagedFieldsEntry being created. The only valid values + for this field are 'Apply' and 'Update'. + type: string + time: + description: Time is timestamp of when these fields were set. + It should always be empty if Operation is 'Apply' + format: date-time + type: string + type: object + type: array + name: + description: 'Name must be unique within a namespace. Is required when + creating resources, although some resources may allow a client to + request the generation of an appropriate name automatically. Name + is primarily intended for creation idempotence and configuration definition. + Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + namespace: + description: "Namespace defines the space within each name must be unique. + An empty namespace is equivalent to the \"default\" namespace, but + \"default\" is the canonical representation. Not all objects are required + to be scoped to a namespace - the value of this field for those objects + will be empty. \n Must be a DNS_LABEL. Cannot be updated. More info: + http://kubernetes.io/docs/user-guide/namespaces" + type: string + ownerReferences: + description: List of objects depended by this object. If ALL objects + in the list have been deleted, this object will be garbage collected. + If this object is managed by a controller, then an entry in this list + will point to this controller, with the controller field set to true. + There cannot be more than one managing controller. + items: + properties: + apiVersion: + description: API version of the referent. + type: string + blockOwnerDeletion: + description: If true, AND if the owner has the "foregroundDeletion" + finalizer, then the owner cannot be deleted from the key-value + store until this reference is removed. Defaults to false. To + set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. + type: boolean + controller: + description: If true, this reference points to the managing controller. + type: boolean + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + uid: + description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + required: + - apiVersion + - kind + - name + - uid + type: object + type: array + resourceVersion: + description: "An opaque value that represents the internal version of + this object that can be used by clients to determine when objects + have changed. May be used for optimistic concurrency, change detection, + and the watch operation on a resource or set of resources. Clients + must treat these values as opaque and passed unmodified back to the + server. They may only be valid for a particular resource or set of + resources. \n Populated by the system. Read-only. Value must be treated + as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency" + type: string + selfLink: + description: SelfLink is a URL representing this object. Populated by + the system. Read-only. + type: string + uid: + description: "UID is the unique in time and space value for this object. + It is typically generated by the server on successful creation of + a resource and is not allowed to change on PUT operations. \n Populated + by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids" + type: string + type: object operation: - description: Operation contains requested operation parameters. properties: sync: - description: SyncOperation contains sync operation details. properties: dryRun: description: DryRun will perform a `kubectl apply --dry-run` without @@ -54,7 +402,6 @@ spec: resources: description: Resources describes which resources to sync items: - description: SyncOperationResource contains resources to sync. properties: group: type: string @@ -63,8 +410,8 @@ spec: name: type: string required: - - kind - - name + - kind + - name type: object type: array revision: @@ -72,19 +419,18 @@ spec: to. If omitted, will use the revision specified in app spec. type: string source: - description: ApplicationSource contains information about github - repository, path within repository and target application environment. + description: Source overrides the source definition set in the application. + This is typically set in a Rollback operation and nil during a + Sync operation properties: directory: + description: Directory holds path/directory specific options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -93,14 +439,13 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -109,8 +454,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -118,13 +463,16 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm template properties: + forceString: + description: ForceString determines whether to tell + Helm to interpret booleans and numbers as strings + type: boolean name: description: Name is the name of the helm parameter type: string @@ -145,8 +493,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet specific - options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application environment @@ -156,7 +503,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -165,34 +511,21 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize specific - options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag overrides - items: - description: KustomizeImageTag is a kustomize image tag - properties: - name: - description: Name is the name of the image (e.g. nginx) - type: string - value: - description: Value is the value for the new tag (e.g. - 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -206,9 +539,23 @@ spec: containing a type: string plugin: - description: ApplicationSourcePlugin holds config management + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -217,22 +564,20 @@ spec: manifests type: string targetRevision: - description: Environment is a ksonnet application environment - name TargetRevision defines the commit, tag, or branch in - which to sync the application to. If omitted, will sync to - HEAD + description: TargetRevision defines the commit, tag, or branch + in which to sync the application to. If omitted, will sync + to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object syncStrategy: - description: SyncStrategy controls the manner in which a sync is - performed + description: SyncStrategy describes how to perform the sync properties: apply: - description: SyncStrategyApply uses `kubectl apply` to perform - the apply + description: Apply wil perform a `kubectl apply` to perform + the sync. properties: force: description: Force indicates whether or not to supply the @@ -242,33 +587,24 @@ spec: type: boolean type: object hook: - description: SyncStrategyHook will perform a sync using hooks - annotations. If no hook annotation is specified falls back - to `kubectl apply`. + description: Hook will submit any referenced resources to perform + the sync. This is the default strategy properties: - SyncStrategyApply: - description: SyncStrategyApply uses `kubectl apply` to perform - the apply - properties: - force: - description: Force indicates whether or not to supply - the --force flag to `kubectl apply`. The --force flag - deletes and re-create the resource, when PATCH encounters - conflict and has retried for 5 times. - type: boolean - type: object + force: + description: Force indicates whether or not to supply the + --force flag to `kubectl apply`. The --force flag deletes + and re-create the resource, when PATCH encounters conflict + and has retried for 5 times. + type: boolean type: object type: object type: object type: object spec: - description: ApplicationSpec represents desired application state. Contains - link to repository with application definition and additional parameters - link definition revision. properties: destination: - description: ApplicationDestination contains deployment destination - information + description: Destination overrides the kubernetes server and namespace + defined in the environment ksonnet app.yaml properties: namespace: description: Namespace overrides the environment namespace value @@ -283,9 +619,6 @@ spec: description: IgnoreDifferences controls resources fields which should be ignored during comparison items: - description: ResourceIgnoreDifferences contains resource filter and - list of json paths which should be ignored during comparison with - live state. properties: group: type: string @@ -300,9 +633,9 @@ spec: namespace: type: string required: - - group - - kind - - jsonPointers + - group + - kind + - jsonPointers type: object type: array info: @@ -315,8 +648,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array project: @@ -324,19 +657,17 @@ spec: that application belongs to 'default' project. type: string source: - description: ApplicationSource contains information about github repository, - path within repository and target application environment. + description: Source is a reference to the location ksonnet application + definition properties: directory: + description: Directory holds path/directory specific options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -345,14 +676,13 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -361,8 +691,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -370,13 +700,16 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm template properties: + forceString: + description: ForceString determines whether to tell Helm + to interpret booleans and numbers as strings + type: boolean name: description: Name is the name of the helm parameter type: string @@ -397,7 +730,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet specific options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application environment @@ -407,7 +740,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component parameter properties: component: type: string @@ -416,34 +748,21 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize specific - options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag overrides - items: - description: KustomizeImageTag is a kustomize image tag - properties: - name: - description: Name is the name of the image (e.g. nginx) - type: string - value: - description: Value is the value for the new tag (e.g. - 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -457,9 +776,23 @@ spec: a type: string plugin: - description: ApplicationSourcePlugin holds config management plugin + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -468,41 +801,38 @@ spec: manifests type: string targetRevision: - description: Environment is a ksonnet application environment name - TargetRevision defines the commit, tag, or branch in which to - sync the application to. If omitted, will sync to HEAD + description: TargetRevision defines the commit, tag, or branch in + which to sync the application to. If omitted, will sync to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object syncPolicy: - description: SyncPolicy controls when a sync will be performed in response - to updates in git + description: SyncPolicy controls when a sync will be performed properties: automated: - description: SyncPolicyAutomated controls the behavior of an automated - sync + description: Automated will keep an application synced to the target + revision properties: prune: description: 'Prune will prune resources automatically as part of automated sync (default: false)' type: boolean + selfHeal: + description: 'SelfHeal enables auto-syncing if (default: false)' + type: boolean type: object type: object required: - - source - - destination - - project + - source + - destination + - project type: object status: - description: ApplicationStatus contains information about application sync, - health status properties: conditions: items: - description: ApplicationCondition contains details about current application - condition properties: message: description: Message contains human-readable message indicating @@ -512,8 +842,8 @@ spec: description: Type is an application condition type type: string required: - - type - - message + - type + - message type: object type: array health: @@ -525,30 +855,26 @@ spec: type: object history: items: - description: RevisionHistory contains information relevant to an application - deployment properties: - deployedAt: {} + deployedAt: + format: date-time + type: string id: format: int64 type: integer revision: type: string source: - description: ApplicationSource contains information about github - repository, path within repository and target application environment. properties: directory: + description: Directory holds path/directory specific options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet specific - options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -557,14 +883,13 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -573,8 +898,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -582,14 +907,16 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template properties: + forceString: + description: ForceString determines whether to tell + Helm to interpret booleans and numbers as strings + type: boolean name: description: Name is the name of the helm parameter type: string @@ -610,8 +937,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet specific - options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application environment @@ -621,8 +947,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter properties: component: type: string @@ -631,36 +955,21 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize specific - options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag overrides - items: - description: KustomizeImageTag is a kustomize image - tag - properties: - name: - description: Name is the name of the image (e.g. - nginx) - type: string - value: - description: Value is the value for the new tag - (e.g. 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -674,9 +983,23 @@ spec: containing a type: string plugin: - description: ApplicationSourcePlugin holds config management + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -685,36 +1008,37 @@ spec: manifests type: string targetRevision: - description: Environment is a ksonnet application environment - name TargetRevision defines the commit, tag, or branch in - which to sync the application to. If omitted, will sync + description: TargetRevision defines the commit, tag, or branch + in which to sync the application to. If omitted, will sync to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object required: - - revision - - deployedAt - - id + - revision + - deployedAt + - id type: object type: array - observedAt: {} + observedAt: + format: date-time + type: string operationState: - description: OperationState contains information about state of currently - performing operation on application. properties: - finishedAt: {} + finishedAt: + description: FinishedAt contains time of operation completion + format: date-time + type: string message: description: Message hold any pertinent messages when attempting to perform operation (typically errors). type: string operation: - description: Operation contains requested operation parameters. + description: Operation is the original requested operation properties: sync: - description: SyncOperation contains sync operation details. properties: dryRun: description: DryRun will perform a `kubectl apply --dry-run` @@ -733,8 +1057,6 @@ spec: resources: description: Resources describes which resources to sync items: - description: SyncOperationResource contains resources - to sync. properties: group: type: string @@ -743,8 +1065,8 @@ spec: name: type: string required: - - kind - - name + - kind + - name type: object type: array revision: @@ -753,21 +1075,20 @@ spec: specified in app spec. type: string source: - description: ApplicationSource contains information about - github repository, path within repository and target application - environment. + description: Source overrides the source definition set + in the application. This is typically set in a Rollback + operation and nil during a Sync operation properties: directory: + description: Directory holds path/directory specific + options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -776,15 +1097,14 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -793,8 +1113,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -802,16 +1122,18 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific - options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a - helm template properties: + forceString: + description: ForceString determines whether + to tell Helm to interpret booleans and numbers + as strings + type: boolean name: description: Name is the name of the helm parameter @@ -834,8 +1156,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet - specific options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application @@ -845,8 +1166,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter properties: component: type: string @@ -855,38 +1174,22 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize - specific options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag - overrides - items: - description: KustomizeImageTag is a kustomize - image tag - properties: - name: - description: Name is the name of the image - (e.g. nginx) - type: string - value: - description: Value is the value for the new - tag (e.g. 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -900,9 +1203,23 @@ spec: containing a type: string plugin: - description: ApplicationSourcePlugin holds config management + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -911,22 +1228,20 @@ spec: application manifests type: string targetRevision: - description: Environment is a ksonnet application environment - name TargetRevision defines the commit, tag, or branch - in which to sync the application to. If omitted, will - sync to HEAD + description: TargetRevision defines the commit, tag, + or branch in which to sync the application to. If + omitted, will sync to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object syncStrategy: - description: SyncStrategy controls the manner in which a - sync is performed + description: SyncStrategy describes how to perform the sync properties: apply: - description: SyncStrategyApply uses `kubectl apply` - to perform the apply + description: Apply wil perform a `kubectl apply` to + perform the sync. properties: force: description: Force indicates whether or not to supply @@ -937,22 +1252,16 @@ spec: type: boolean type: object hook: - description: SyncStrategyHook will perform a sync using - hooks annotations. If no hook annotation is specified - falls back to `kubectl apply`. + description: Hook will submit any referenced resources + to perform the sync. This is the default strategy properties: - SyncStrategyApply: - description: SyncStrategyApply uses `kubectl apply` - to perform the apply - properties: - force: - description: Force indicates whether or not - to supply the --force flag to `kubectl apply`. - The --force flag deletes and re-create the - resource, when PATCH encounters conflict and - has retried for 5 times. - type: boolean - type: object + force: + description: Force indicates whether or not to supply + the --force flag to `kubectl apply`. The --force + flag deletes and re-create the resource, when + PATCH encounters conflict and has retried for + 5 times. + type: boolean type: object type: object type: object @@ -960,16 +1269,17 @@ spec: phase: description: Phase is the current phase of the operation type: string - startedAt: {} + startedAt: + description: StartedAt contains time of operation start + format: date-time + type: string syncResult: - description: SyncOperationResult represent result of sync operation + description: SyncResult is the result of a Sync operation properties: resources: description: Resources holds the sync result of each individual resource items: - description: ResourceResult holds the operation result details - of a specific resource properties: group: type: string @@ -1003,32 +1313,29 @@ spec: version: type: string required: - - group - - version - - kind - - namespace - - name + - group + - version + - kind + - namespace + - name type: object type: array revision: description: Revision holds the git commit SHA of the sync type: string source: - description: ApplicationSource contains information about github - repository, path within repository and target application - environment. + description: Source records the application source information + of the sync, used for comparing auto-sync properties: directory: + description: Directory holds path/directory specific options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -1037,15 +1344,14 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -1054,8 +1360,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -1063,14 +1369,17 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template properties: + forceString: + description: ForceString determines whether to + tell Helm to interpret booleans and numbers + as strings + type: boolean name: description: Name is the name of the helm parameter type: string @@ -1091,8 +1400,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet specific - options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application environment @@ -1102,8 +1410,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter properties: component: type: string @@ -1112,37 +1418,22 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize - specific options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag overrides - items: - description: KustomizeImageTag is a kustomize image - tag - properties: - name: - description: Name is the name of the image (e.g. - nginx) - type: string - value: - description: Value is the value for the new tag - (e.g. 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -1156,9 +1447,23 @@ spec: containing a type: string plugin: - description: ApplicationSourcePlugin holds config management + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -1167,28 +1472,27 @@ spec: manifests type: string targetRevision: - description: Environment is a ksonnet application environment - name TargetRevision defines the commit, tag, or branch - in which to sync the application to. If omitted, will - sync to HEAD + description: TargetRevision defines the commit, tag, or + branch in which to sync the application to. If omitted, + will sync to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object required: - - revision + - revision type: object required: - - operation - - phase - - startedAt + - operation + - phase + - startedAt type: object - reconciledAt: {} + reconciledAt: + format: date-time + type: string resources: items: - description: ResourceStatus holds the current sync and health status - of a resource properties: group: type: string @@ -1207,6 +1511,8 @@ spec: type: string namespace: type: string + requiresPruning: + type: boolean status: type: string version: @@ -1230,16 +1536,10 @@ spec: type: array type: object sync: - description: SyncStatus is a comparison result of application spec and - deployed application. properties: comparedTo: - description: ComparedTo contains application source and target which - was used for resources comparison properties: destination: - description: ApplicationDestination contains deployment destination - information properties: namespace: description: Namespace overrides the environment namespace @@ -1251,21 +1551,16 @@ spec: type: string type: object source: - description: ApplicationSource contains information about github - repository, path within repository and target application - environment. properties: directory: + description: Directory holds path/directory specific options properties: jsonnet: - description: ApplicationSourceJsonnet holds jsonnet - specific options properties: extVars: description: ExtVars is a list of Jsonnet External Variables items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -1274,15 +1569,14 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array tlas: description: TLAS is a list of Jsonnet Top-level Arguments items: - description: JsonnetVar is a jsonnet variable properties: code: type: boolean @@ -1291,8 +1585,8 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object @@ -1300,14 +1594,17 @@ spec: type: boolean type: object helm: - description: ApplicationSourceHelm holds helm specific options + description: Helm holds helm specific options properties: parameters: description: Parameters are parameters to the helm template items: - description: HelmParameter is a parameter to a helm - template properties: + forceString: + description: ForceString determines whether to + tell Helm to interpret booleans and numbers + as strings + type: boolean name: description: Name is the name of the helm parameter type: string @@ -1328,8 +1625,7 @@ spec: type: array type: object ksonnet: - description: ApplicationSourceKsonnet holds ksonnet specific - options + description: Ksonnet holds ksonnet specific options properties: environment: description: Environment is a ksonnet application environment @@ -1339,8 +1635,6 @@ spec: description: Parameters are a list of ksonnet component parameter override values items: - description: KsonnetParameter is a ksonnet component - parameter properties: component: type: string @@ -1349,37 +1643,22 @@ spec: value: type: string required: - - name - - value + - name + - value type: object type: array type: object kustomize: - description: ApplicationSourceKustomize holds kustomize - specific options + description: Kustomize holds kustomize specific options properties: commonLabels: + additionalProperties: + type: string description: CommonLabels adds additional kustomize commonLabels type: object - imageTags: - description: ImageTags are kustomize 1.0 image tag overrides - items: - description: KustomizeImageTag is a kustomize image - tag - properties: - name: - description: Name is the name of the image (e.g. - nginx) - type: string - value: - description: Value is the value for the new tag - (e.g. 1.8.0) - type: string - type: object - type: array images: - description: Images are kustomize 2.0 image overrides + description: Images are kustomize image overrides items: type: string type: array @@ -1393,9 +1672,23 @@ spec: containing a type: string plugin: - description: ApplicationSourcePlugin holds config management + description: ConfigManagementPlugin holds config management plugin specific options properties: + env: + items: + properties: + name: + description: the name, usually uppercase + type: string + value: + description: the value + type: string + required: + - name + - value + type: object + type: array name: type: string type: object @@ -1404,26 +1697,31 @@ spec: manifests type: string targetRevision: - description: Environment is a ksonnet application environment - name TargetRevision defines the commit, tag, or branch - in which to sync the application to. If omitted, will - sync to HEAD + description: TargetRevision defines the commit, tag, or + branch in which to sync the application to. If omitted, + will sync to HEAD type: string required: - - repoURL - - path + - repoURL + - path type: object required: - - source - - destination + - source + - destination type: object revision: type: string status: type: string required: - - status + - status type: object type: object + required: + - metadata + - spec type: object - version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true \ No newline at end of file diff --git a/charts/argo-cd/templates/crds/appproject-crd.yaml b/charts/argo-cd/templates/crds/appproject-crd.yaml index ebe038b6..4048d2be 100644 --- a/charts/argo-cd/templates/crds/appproject-crd.yaml +++ b/charts/argo-cd/templates/crds/appproject-crd.yaml @@ -14,11 +14,16 @@ spec: kind: AppProject plural: appprojects shortNames: - - appproj - - appprojs + - appproj + - appprojs scope: Namespaced validation: openAPIV3Schema: + description: 'AppProject provides a logical grouping of applications, providing + controls for: * where the apps may deploy to (cluster whitelist) * what may + be deployed (repository whitelist, resource whitelist/blacklist) * who can + access these applications (roles, OIDC group claims bindings) * and what they + can do (RBAC policies) * automation access to these roles (JWT tokens)' properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -30,14 +35,371 @@ spec: object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' type: string - metadata: {} + metadata: + properties: + annotations: + additionalProperties: + type: string + description: 'Annotations is an unstructured key value map stored with + a resource that may be set by external tools to store and retrieve + arbitrary metadata. They are not queryable and should be preserved + when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations' + type: object + clusterName: + description: The name of the cluster which the object belongs to. This + is used to distinguish resources with same name and namespace in different + clusters. This field is not set anywhere right now and apiserver is + going to ignore it if set in create or update request. + type: string + deletionGracePeriodSeconds: + description: Number of seconds allowed for this object to gracefully + terminate before it will be removed from the system. Only set when + deletionTimestamp is also set. May only be shortened. Read-only. + format: int64 + type: integer + deletionTimestamp: + description: "DeletionTimestamp is RFC 3339 date and time at which this + resource will be deleted. This field is set by the server when a graceful + deletion is requested by the user, and is not directly settable by + a client. The resource is expected to be deleted (no longer visible + from resource lists, and not reachable by name) after the time in + this field, once the finalizers list is empty. As long as the finalizers + list contains items, deletion is blocked. Once the deletionTimestamp + is set, this value may not be unset or be set further into the future, + although it may be shortened or the resource may be deleted prior + to this time. For example, a user may request that a pod is deleted + in 30 seconds. The Kubelet will react by sending a graceful termination + signal to the containers in the pod. After that 30 seconds, the Kubelet + will send a hard termination signal (SIGKILL) to the container and + after cleanup, remove the pod from the API. In the presence of network + partitions, this object may still exist after this timestamp, until + an administrator or automated process can determine the resource is + fully terminated. If not set, graceful deletion of the object has + not been requested. \n Populated by the system when a graceful deletion + is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata" + format: date-time + type: string + finalizers: + description: Must be empty before the object is deleted from the registry. + Each entry is an identifier for the responsible component that will + remove the entry from the list. If the deletionTimestamp of the object + is non-nil, entries in this list can only be removed. + items: + type: string + type: array + generateName: + description: "GenerateName is an optional prefix, used by the server, + to generate a unique name ONLY IF the Name field has not been provided. + If this field is used, the name returned to the client will be different + than the name passed. This value will also be combined with a unique + suffix. The provided value has the same validation rules as the Name + field, and may be truncated by the length of the suffix required to + make the value unique on the server. \n If this field is specified + and the generated name exists, the server will NOT return a 409 - + instead, it will either return 201 Created or 500 with Reason ServerTimeout + indicating a unique name could not be found in the time allotted, + and the client should retry (optionally after the time indicated in + the Retry-After header). \n Applied only if Name is not specified. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency" + type: string + generation: + description: A sequence number representing a specific generation of + the desired state. Populated by the system. Read-only. + format: int64 + type: integer + initializers: + description: "An initializer is a controller which enforces some system + invariant at object creation time. This field is a list of initializers + that have not yet acted on this object. If nil or empty, this object + has been completely initialized. Otherwise, the object is considered + uninitialized and is hidden (in list/watch and get calls) from clients + that haven't explicitly asked to observe uninitialized objects. \n + When an object is created, the system will populate this list with + the current set of initializers. Only privileged users may set or + modify this list. Once it is empty, it may not be modified further + by any user. \n DEPRECATED - initializers are an alpha field and will + be removed in v1.15." + properties: + pending: + description: Pending is a list of initializers that must execute + in order before this object is visible. When the last pending + initializer is removed, and no failing result is set, the initializers + struct will be set to nil and the object is considered as initialized + and visible to all clients. + items: + properties: + name: + description: name of the process that is responsible for initializing + this object. + type: string + required: + - name + type: object + type: array + result: + description: If result is set with the Failure field, the object + will be persisted to storage and then deleted, ensuring that other + clients can observe the deletion. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this + representation of an object. Servers should convert recognized + schemas to the latest internal value, and may reject unrecognized + values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' + type: string + code: + description: Suggested HTTP return code for this status, 0 if + not set. + format: int32 + type: integer + details: + description: Extended data associated with the reason. Each + reason may define its own extended details. This field is + optional and the data returned is not guaranteed to conform + to any schema except that defined by the reason type. + properties: + causes: + description: The Causes array includes more details associated + with the StatusReason failure. Not all StatusReasons may + provide detailed causes. + items: + properties: + field: + description: "The field of the resource that has caused + this error, as named by its JSON serialization. + May include dot and postfix notation for nested + attributes. Arrays are zero-indexed. Fields may + appear more than once in an array of causes due + to fields having multiple errors. Optional. \n Examples: + \ \"name\" - the field \"name\" on the current + resource \"items[0].name\" - the field \"name\" + on the first array entry in \"items\"" + type: string + message: + description: A human-readable description of the cause + of the error. This field may be presented as-is + to a reader. + type: string + reason: + description: A machine-readable description of the + cause of the error. If this value is empty there + is no information available. + type: string + type: object + type: array + group: + description: The group attribute of the resource associated + with the status StatusReason. + type: string + kind: + description: 'The kind attribute of the resource associated + with the status StatusReason. On some operations may differ + from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: The name attribute of the resource associated + with the status StatusReason (when there is a single name + which can be described). + type: string + retryAfterSeconds: + description: If specified, the time in seconds before the + operation should be retried. Some errors may indicate + the client must take an alternate action - for those errors + this field may indicate how long to wait before taking + the alternate action. + format: int32 + type: integer + uid: + description: 'UID of the resource. (when there is a single + resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + type: object + kind: + description: 'Kind is a string value representing the REST resource + this object represents. Servers may infer this from the endpoint + the client submits requests to. Cannot be updated. In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + message: + description: A human-readable description of the status of this + operation. + type: string + metadata: + description: 'Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + properties: + continue: + description: continue may be set if the user set a limit + on the number of items returned, and indicates that the + server has more data available. The value is opaque and + may be used to issue another request to the endpoint that + served this list to retrieve the next set of available + objects. Continuing a consistent list may not be possible + if the server configuration has changed or more than a + few minutes have passed. The resourceVersion field returned + when using this continue value will be identical to the + value in the first response, unless you have received + this token from an error message. + type: string + resourceVersion: + description: 'String that identifies the server''s internal + version of this object that can be used by clients to + determine when objects have changed. Value must be treated + as opaque by clients and passed unmodified back to the + server. Populated by the system. Read-only. More info: + https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency' + type: string + selfLink: + description: selfLink is a URL representing this object. + Populated by the system. Read-only. + type: string + type: object + reason: + description: A machine-readable description of why this operation + is in the "Failure" status. If this value is empty there is + no information available. A Reason clarifies an HTTP status + code but does not override it. + type: string + status: + description: 'Status of the operation. One of: "Success" or + "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status' + type: string + type: object + required: + - pending + type: object + labels: + additionalProperties: + type: string + description: 'Map of string keys and values that can be used to organize + and categorize (scope and select) objects. May match selectors of + replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels' + type: object + managedFields: + description: "ManagedFields maps workflow-id and version to the set + of fields that are managed by that workflow. This is mostly for internal + housekeeping, and users typically shouldn't need to set or understand + this field. A workflow can be the user's name, a controller's name, + or the name of a specific apply path like \"ci-cd\". The set of fields + is always in the version that the workflow used when modifying the + object. \n This field is alpha and can be changed or removed without + notice." + items: + properties: + apiVersion: + description: APIVersion defines the version of this resource that + this field set applies to. The format is "group/version" just + like the top-level APIVersion field. It is necessary to track + the version of a field set because it cannot be automatically + converted. + type: string + fields: + additionalProperties: true + description: Fields identifies a set of fields. + type: object + manager: + description: Manager is an identifier of the workflow managing + these fields. + type: string + operation: + description: Operation is the type of operation which lead to + this ManagedFieldsEntry being created. The only valid values + for this field are 'Apply' and 'Update'. + type: string + time: + description: Time is timestamp of when these fields were set. + It should always be empty if Operation is 'Apply' + format: date-time + type: string + type: object + type: array + name: + description: 'Name must be unique within a namespace. Is required when + creating resources, although some resources may allow a client to + request the generation of an appropriate name automatically. Name + is primarily intended for creation idempotence and configuration definition. + Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + namespace: + description: "Namespace defines the space within each name must be unique. + An empty namespace is equivalent to the \"default\" namespace, but + \"default\" is the canonical representation. Not all objects are required + to be scoped to a namespace - the value of this field for those objects + will be empty. \n Must be a DNS_LABEL. Cannot be updated. More info: + http://kubernetes.io/docs/user-guide/namespaces" + type: string + ownerReferences: + description: List of objects depended by this object. If ALL objects + in the list have been deleted, this object will be garbage collected. + If this object is managed by a controller, then an entry in this list + will point to this controller, with the controller field set to true. + There cannot be more than one managing controller. + items: + properties: + apiVersion: + description: API version of the referent. + type: string + blockOwnerDeletion: + description: If true, AND if the owner has the "foregroundDeletion" + finalizer, then the owner cannot be deleted from the key-value + store until this reference is removed. Defaults to false. To + set this field, a user needs "delete" permission of the owner, + otherwise 422 (Unprocessable Entity) will be returned. + type: boolean + controller: + description: If true, this reference points to the managing controller. + type: boolean + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names' + type: string + uid: + description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids' + type: string + required: + - apiVersion + - kind + - name + - uid + type: object + type: array + resourceVersion: + description: "An opaque value that represents the internal version of + this object that can be used by clients to determine when objects + have changed. May be used for optimistic concurrency, change detection, + and the watch operation on a resource or set of resources. Clients + must treat these values as opaque and passed unmodified back to the + server. They may only be valid for a particular resource or set of + resources. \n Populated by the system. Read-only. Value must be treated + as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency" + type: string + selfLink: + description: SelfLink is a URL representing this object. Populated by + the system. Read-only. + type: string + uid: + description: "UID is the unique in time and space value for this object. + It is typically generated by the server on successful creation of + a resource and is not allowed to change on PUT operations. \n Populated + by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids" + type: string + type: object spec: - description: AppProjectSpec is the specification of an AppProject properties: clusterResourceWhitelist: description: ClusterResourceWhitelist contains list of whitelisted cluster level resources - items: {} + items: + properties: + group: + type: string + kind: + type: string + required: + - group + - kind + type: object type: array description: description: Description contains optional project description @@ -46,8 +408,6 @@ spec: description: Destinations contains list of destinations available for deployment items: - description: ApplicationDestination contains deployment destination - information properties: namespace: description: Namespace overrides the environment namespace value @@ -62,13 +422,21 @@ spec: namespaceResourceBlacklist: description: NamespaceResourceBlacklist contains list of blacklisted namespace level resources - items: {} + items: + properties: + group: + type: string + kind: + type: string + required: + - group + - kind + type: object type: array roles: description: Roles are user defined RBAC roles associated with this project items: - description: ProjectRole represents a role that has access to a project properties: description: description: Description is a description of the role @@ -83,8 +451,6 @@ spec: description: JWTTokens are a list of generated JWT tokens bound to this role items: - description: JWTToken holds the issuedAt and expiresAt values - of a token properties: exp: format: int64 @@ -93,7 +459,7 @@ spec: format: int64 type: integer required: - - iat + - iat type: object type: array name: @@ -106,7 +472,7 @@ spec: type: string type: array required: - - name + - name type: object type: array sourceRepos: @@ -116,5 +482,11 @@ spec: type: string type: array type: object + required: + - metadata + - spec type: object - version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 6055ac86..5861e87c 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3,27 +3,29 @@ applicationController: servicePort: 8082 image: repository: argoproj/argocd - tag: v1.1.2 + tag: v1.2.0 pullPolicy: Always volumeMounts: [] volumes: [] server: containerPort: 8080 + metricsPort: 8083 servicePortHttp: 80 servicePortHttps: 443 serviceAnnotations: {} image: repository: argoproj/argocd - tag: v1.1.2 - pullPolicy: Always - uiInitImage: - repository: argoproj/argocd-ui - tag: v1.1.2 + tag: v1.2.0 pullPolicy: Always extraArgs: [] volumeMounts: [] + # - name: ssh-known-hosts + # mountPath: /app/config/ssh volumes: [] + # - name: ssh-known-hosts + # configMap: + # name: argocd-ssh-known-hosts-cm annotations: {} repoServer: @@ -31,7 +33,7 @@ repoServer: servicePort: 8081 image: repository: argoproj/argocd - tag: v1.1.2 + tag: v1.2.0 pullPolicy: Always volumeMounts: [] volumes: [] @@ -47,7 +49,7 @@ dexServer: pullPolicy: Always initImage: repository: argoproj/argocd - tag: v1.1.2 + tag: v1.2.0 pullPolicy: Always volumeMounts: [] volumes: [] @@ -55,23 +57,18 @@ dexServer: # terminate tls at ArgoCD level ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # nginx.ingress.kubernetes.io/force-ssl-redirect: "true" # nginx.ingress.kubernetes.io/ssl-passthrough: "true" path: / hosts: - argocd.example.com - -# Standard Argo CD installation with cluster-admin access. -# Set this true if you plan to use Argo CD to deploy applications in the same cluster that -# Argo CD runs in (i.e. kubernetes.svc.default). -# Will still be able to deploy to external clusters with inputted credentials. - clusterAdminAccess: enabled: true - config: + createSecret: true helmRepositories: # - name: privateRepo # url: http://chartmuseum.privatecloud.com @@ -123,8 +120,6 @@ config: githubSecret: gitlabSecret: bitbucketSecret: - # resourceCustomizations can be used to create custom health checks for resources - # https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/health.md#way-1-define-a-custom-health-check-in-argocd-cm-configmap resourceCustomizations: # certmanager.k8s.io/Certificate: # health.lua: | @@ -141,13 +136,13 @@ config: # args: ["sample args"] rbac: -# # An RBAC policy .csv file containing additional policy and role definitions. -# # See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md on how to write RBAC policies. -# policy.csv: | -# # Give all members of "my-org:team-alpha" the ability to sync apps in "my-project" -# p, my-org:team-alpha, applications, sync, my-project/*, allow -# # Make all members of "my-org:team-beta" admins -# g, my-org:team-beta, role:admin + # # An RBAC policy .csv file containing additional policy and role definitions. + # # See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md on how to write RBAC policies. + # policy.csv: | + # # Give all members of "my-org:team-alpha" the ability to sync apps in "my-project" + # p, my-org:team-alpha, applications, sync, my-project/*, allow + # # Make all members of "my-org:team-beta" admins + # g, my-org:team-beta, role:admin policyCsv: #| # p, role:org-admin, applications, *, */*, allow # p, role:org-admin, clusters, get, *, allow @@ -156,9 +151,7 @@ rbac: # p, role:org-admin, repositories, update, *, allow # p, role:org-admin, repositories, delete, *, allow # g, your-github-org:your-team, role:org-admin - # The default role Argo CD will fall back to, when authorizing API requests policyDefault: #role:readonly - # Scopes controls which OIDC scopes to examine during rbac enforcement (in addition to `sub` scope). scopes: #[groups] redis: From 779844684b92db812d57526aa87b243238128d44 Mon Sep 17 00:00:00 2001 From: Minh Monmen Date: Tue, 10 Sep 2019 21:16:10 +0700 Subject: [PATCH 19/19] Fix syntax in argocd-secret template (#105) --- charts/argo-cd/templates/argocd-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml index c29fa53d..19ad78de 100755 --- a/charts/argo-cd/templates/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-secret.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} type: Opaque {{- if or .Values.config.webhook.githubSecret (or .Values.config.webhook.gitlabSecret .Values.config.webhook.bitbucketSecret) }} -Setting a blank data again will wipe admin password/key/cert +# Setting a blank data again will wipe admin password/key/cert data: {{- if .Values.config.webhook.githubSecret }} github.webhook.secret: {{ .Values.config.webhook.githubSecret }}