diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 24464bc2..54b95a9f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.4.0" +appVersion: "1.4.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.6.4 +version: 1.7.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 861ba878..5e87de3e 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -36,11 +36,13 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.0"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.4.1"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |  | nameOverride | Provide a name in place of `argocd` | `"argocd"` | | installCRDs | bool | `true` | Install CRDs if you are using Helm2. | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | +| configs.secret.argocdServerAdminPassword | Admin password | `null` | +| configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set | | configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` | | configs.secret.createSecret | Create the argocd-secret. | `true` | | configs.secret.githubSecret | GitHub incoming webhook secret | `""` | diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml index f9036347..ad8da483 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml @@ -35,7 +35,7 @@ data: {{- end }} {{- if .Values.configs.secret.argocdServerAdminPassword }} admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }} - admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }} + admin.passwordMtime: {{ default (date "2006-01-02T15:04:05Z" now) .Values.configs.secret.argocdServerAdminPasswordMtime | b64enc }} {{- end }} {{- range $key, $value := .Values.configs.secret.extra }} {{ $key }}: {{ $value | b64enc }} diff --git a/charts/argo-cd/templates/argocd-server/certificate.yaml b/charts/argo-cd/templates/argocd-server/certificate.yaml index 246519f6..bc90305a 100644 --- a/charts/argo-cd/templates/argocd-server/certificate.yaml +++ b/charts/argo-cd/templates/argocd-server/certificate.yaml @@ -1,5 +1,9 @@ {{- if .Values.server.certificate.enabled -}} +{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" }} +apiVersion: cert-manager.io/v1alpha2 +{{- else }} apiVersion: certmanager.k8s.io/v1alpha1 +{{- end }} kind: Certificate metadata: name: {{ template "argo-cd.server.fullname" . }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 18a30d72..6cc7a43c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.4.0 + tag: v1.4.1 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -23,7 +23,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Argo controller commandline flags @@ -270,7 +270,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -511,7 +511,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.3.6 + tag: # v1.4.1 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server @@ -742,3 +742,5 @@ configs: # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'` # argocdServerAdminPassword: + # Password modification time defaults to current time if not set + # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z" diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 996e5148..6f1e1a58 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.6.1 +version: 0.7.0 keywords: - argo-events - sensor-controller @@ -11,6 +11,6 @@ sources: maintainers: - name: VaibhavPage - name: magaldima -appVersion: 0.11 +appVersion: 0.12 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-events/crds/event-source-crd.yml b/charts/argo-events/crds/event-source-crd.yml new file mode 100644 index 00000000..2ed64f2e --- /dev/null +++ b/charts/argo-events/crds/event-source-crd.yml @@ -0,0 +1,18 @@ +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: eventsources.argoproj.io +spec: + group: argoproj.io + scope: Namespaced + names: + kind: EventSource + plural: eventsources + singular: eventsource + listKind: EventSourceList + shortNames: + - es + version: "v1alpha1" + + diff --git a/charts/argo-events/crds/gateway-crd.yml b/charts/argo-events/crds/gateway-crd.yml new file mode 100644 index 00000000..7b9178f4 --- /dev/null +++ b/charts/argo-events/crds/gateway-crd.yml @@ -0,0 +1,16 @@ +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: gateways.argoproj.io +spec: + group: argoproj.io + names: + kind: Gateway + listKind: GatewayList + plural: gateways + singular: gateway + shortNames: + - gw + scope: Namespaced + version: "v1alpha1" diff --git a/charts/argo-events/crds/sensor-crd.yml b/charts/argo-events/crds/sensor-crd.yml new file mode 100644 index 00000000..b38207f7 --- /dev/null +++ b/charts/argo-events/crds/sensor-crd.yml @@ -0,0 +1,17 @@ +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: sensors.argoproj.io +spec: + group: argoproj.io + names: + kind: Sensor + listKind: SensorList + plural: sensors + singular: sensor + shortNames: + - sn + scope: Namespaced + version: "v1alpha1" + diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml index 878b8520..a0b79f78 100644 --- a/charts/argo-events/templates/argo-events-cluster-roles.yaml +++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml @@ -24,20 +24,9 @@ kind: ClusterRole metadata: name: argo-events-role rules: - - apiGroups: - - apiextensions.k8s.io - - apiextensions.k8s.io/v1beta1 - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - resources: - - customresourcedefinitions +{{- if .Values.additionalServiceAccountRules }} +{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}} +{{- end }} - apiGroups: - argoproj.io verbs: @@ -58,6 +47,8 @@ rules: - gateways/finalizers - sensors - sensors/finalizers + - eventsources + - eventsources/finalizers - apiGroups: - "" resources: @@ -89,9 +80,7 @@ rules: - patch - delete - apiGroups: - - "apps/v1" - - "apps/v1beta2" - - "apps/v1beta1" + - "apps" resources: - deployments verbs: @@ -102,3 +91,4 @@ rules: - update - patch - delete + diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml new file mode 100644 index 00000000..c174ae56 --- /dev/null +++ b/charts/argo-events/templates/eventsource-crd.yaml @@ -0,0 +1,17 @@ +{{- if .Values.installCRD }} +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: eventsources.argoproj.io +spec: + group: argoproj.io + scope: Namespaced + names: + kind: EventSource + plural: eventsources + singular: eventsource + listKind: EventSourceList + shortNames: + - es + version: "v1alpha1" +{{- end }} diff --git a/charts/argo-events/templates/gateway-controller-deployment.yaml b/charts/argo-events/templates/gateway-controller-deployment.yaml index fba3bd1f..63350fbf 100644 --- a/charts/argo-events/templates/gateway-controller-deployment.yaml +++ b/charts/argo-events/templates/gateway-controller-deployment.yaml @@ -25,9 +25,9 @@ spec: image: "{{ .Values.registry }}/{{ .Values.gatewayController.image }}:{{ .Values.gatewayController.tag }}" imagePullPolicy: {{ .Values.imagePullPolicy }} env: - - name: GATEWAY_NAMESPACE + - name: NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - - name: GATEWAY_CONTROLLER_CONFIG_MAP + - name: CONTROLLER_CONFIG_MAP value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap diff --git a/charts/argo-events/templates/gateway-crd.yaml b/charts/argo-events/templates/gateway-crd.yaml index d31dc574..fd6e1d26 100644 --- a/charts/argo-events/templates/gateway-crd.yaml +++ b/charts/argo-events/templates/gateway-crd.yaml @@ -11,6 +11,8 @@ spec: listKind: GatewayList plural: gateways singular: gateway + shortNames: + - gw scope: Namespaced - version: v1alpha1 + version: "v1alpha1" {{- end }} diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml index c5a260fe..2dd9602e 100644 --- a/charts/argo-events/templates/sensor-controller-deployment.yaml +++ b/charts/argo-events/templates/sensor-controller-deployment.yaml @@ -25,9 +25,9 @@ spec: image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}" imagePullPolicy: {{ .Values.imagePullPolicy }} env: - - name: SENSOR_NAMESPACE + - name: NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - - name: SENSOR_CONFIG_MAP + - name: CONTROLLER_CONFIG_MAP value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml index a9c2ca5d..12e19e0f 100644 --- a/charts/argo-events/templates/sensor-crd.yaml +++ b/charts/argo-events/templates/sensor-crd.yaml @@ -11,6 +11,8 @@ spec: listKind: SensorList plural: sensors singular: sensor + shortNames: + - sn scope: Namespaced version: v1alpha1 {{- end }} diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 1ee2fa5a..66ac688f 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -9,10 +9,26 @@ installCRD: true # ServiceAccount to use for running controller. serviceAccount: argo-events-sa + # Create service accounts in additional namespaces specified # The SA will always be created in the release namespaces additionalSaNamespaces: [] # - argo-prod +additionalServiceAccountRules: +- apiGroups: + - apiextensions.k8s.io + - apiextensions.k8s.io/v1beta1 + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + resources: + - customresourcedefinitions instanceID: argo-events @@ -26,11 +42,11 @@ singleNamespace: true sensorController: name: sensor-controller image: sensor-controller - tag: v0.11 + tag: v0.12 replicaCount: 1 gatewayController: name: gateway-controller image: gateway-controller - tag: v0.11 + tag: v0.12 replicaCount: 1