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] 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: []