Bump github.com/docker/docker from 20.10.17+incompatible to 20.10.24+incompatible

chart/choerodon-cluster-agent/Chart.yaml

@@ -1,5 +1,24 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
+annotations:
+  category: Infrastructure
+apiVersion: v2
+appVersion: 2.0.0
+dependencies:
+  - name: common
+    repository: https://openchart.choerodon.com.cn/choerodon/c7n
+    version: 1.x.x
+description: Cluster agent of Choerodon.
+engine: gotpl
+home: https://github.com/open-hand/choerodon-cluster-agent/tree/master/chart/choerodon-cluster-agent
+icon: https://ui-avatars.com/api/?name=choerodon-cluster-agent
+keywords:
+  - choerodon
+  - agent
+maintainers:
+  - email: [email protected]
+    name: choerodon
+    url: https://choerodon.io
 name: choerodon-cluster-agent
-version: 0.1.0
+sources:
+  - https://github.com/open-hand/choerodon-cluster-agent
+  - https://gitee.com/open-hand/choerodon-cluster-agent
+version: 2.0.0

chart/choerodon-cluster-agent/README.md

@@ -1,25 +1,121 @@
-## Choerodon Agent
-
-```yaml
-config:
-  # The WebSocket Address of devops-service
-  connect:
-  #the token of this environment
-  token: ""
-  port: 8088
-  logLevel: 0
-  #the environment Id
-  envId: ""
+# choerodon-cluster-agent
 
+Cluster agent of Choerodon.
+
+## Installing the Chart
+
+To install the chart with the release name `choerodon-cluster-agent`:
+
+```console
+$ helm repo add c7n https://openchart.choerodon.com.cn/choerodon/c7n
+$ helm repo update
+$ helm install choerodon-cluster-agent c7n/choerodon-cluster-agent
 ```
 
-## Resource
-`Role`:
-  In the RBAC API, a role contains rules that represent a set of permissions. Permissions are purely additive (there are no “deny” rules).
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+## Uninstalling the Chart
+
+```bash
+$ helm delete choerodon-cluster-agent
+```
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://openchart.choerodon.com.cn/choerodon/c7n | common | 1.x.x |
+
+## Values
 
-`RoleBinding`:
-  A RoleBinding may reference a Role in the same namespace. The following RoleBinding grants the “pod-reader” role to the user “jane” within the “default” namespace. This allows “jane” to read pods in the “default” namespace.
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Affinity for pod assignment. Evaluated as a template. Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set |
+| args | list | `[]` | Args for running the server container (set to default if not set). Use array form |
+| command | list | `[]` | Command for running the server container (set to default if not set). Use array form |
+| commonAnnotations | object | `{}` | Add annotations to all the deployed resources |
+| commonLabels | object | `{}` | Add labels to all the deployed resources |
+| config.choerodonId | string | `"default"` |  |
+| config.clusterId | int | `0` |  |
+| config.connect | string | `nil` |  |
+| config.envId | string | `""` |  |
+| config.extraArgs | object | `{}` |  |
+| config.logLevel | int | `0` |  |
+| config.token | string | `""` |  |
+| containerPort.healthyPort | int | `8000` | healthy port |
+| customLivenessProbe | object | `{}` | Custom Liveness |
+| customReadinessProbe | object | `{}` | Custom Readiness |
+| customStartupProbe | object | `{}` | Custom Startup probes |
+| dnsPolicy | string | `"ClusterFirstWithHostNet"` | server pod dns policy |
+| enableServiceLinks | bool | `false` | EnableServiceLinks indicates whether information about services should be injected into pod's environment variables,  matching the syntax of Docker links. Optional: Defaults to false. |
+| extraEnv.ACME_EMAIL | string | `nil` |  |
+| extraEnv.ORIGIN_SHH_URL | string | `nil` |  |
+| extraEnv.REWRITE_SSH_URL | string | `nil` |  |
+| extraEnvVarsCM | string | `""` | ConfigMap with extra environment variables |
+| extraEnvVarsSecret | string | `""` | Secret with extra environment variables |
+| extraVolumeMounts | list | `[]` | Extra volume mounts to add to server containers |
+| extraVolumes | list | `[]` | Extra volumes to add to the server statefulset |
+| fullnameOverride | string | `nil` | String to fully override common.names.fullname template |
+| global.imagePullSecrets | list | `[]` | Global Docker registry secret names as an array |
+| global.imageRegistry | string | `nil` | Global Docker image registry |
+| global.storageClass | string | `nil` | Global StorageClass for Persistent Volume(s) |
+| hostAliases | list | `[]` | server pod host aliases |
+| image.pullPolicy | string | `"IfNotPresent"` | Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' |
+| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. |
+| image.registry | string | `"registry.cn-shanghai.aliyuncs.com"` | service image registry |
+| image.repository | string | `"c7n/choerodon-cluster-agent"` | service image repository |
+| image.tag | string | `nil` | service image tag. Default Chart.AppVersion |
+| initContainers | object | `{}` | Add init containers to the server pods. |
+| kubeVersion | string | `nil` | Force target Kubernetes version (using Helm capabilites if not set) |
+| kubeconfig | string | `nil` |  |
+| livenessProbe.enabled | bool | `true` | Enable livenessProbe |
+| livenessProbe.failureThreshold | int | `5` | Failure threshold for livenessProbe |
+| livenessProbe.initialDelaySeconds | int | `180` | Initial delay seconds for livenessProbe |
+| livenessProbe.periodSeconds | int | `5` | Period seconds for livenessProbe |
+| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe |
+| livenessProbe.timeoutSeconds | int | `3` | Timeout seconds for livenessProbe |
+| nameOverride | string | `nil` | String to partially override common.names.fullname template (will maintain the release name) |
+| nodeAffinityPreset.key | string | `""` | Node label key to match |
+| nodeAffinityPreset.type | string | `""` | Node affinity type. Allowed values: soft, hard |
+| nodeAffinityPreset.values | list | `[]` | Node label values to match |
+| nodeSelector | object | `{}` | Node labels for pod assignment. Evaluated as a template. |
+| persistence.accessModes | list | `["ReadWriteOnce"]` | Persistent Volume Access Mode |
+| persistence.annotations | object | `{}` | Persistent Volume Claim annotations |
+| persistence.enabled | bool | `false` | If true, use a Persistent Volume Claim, If false, use emptyDir |
+| persistence.existingClaim | string | `nil` | Enable persistence using an existing PVC |
+| persistence.mountPath | string | `"/data"` | Data volume mount path |
+| persistence.size | string | `"8Gi"` | Persistent Volume size |
+| persistence.storageClass | string | `nil` | Persistent Volume Storage Class |
+| podAffinityPreset | string | `""` | Pod affinity preset. Allowed values: soft, hard |
+| podAnnotations | object | `{}` | Pod annotations |
+| podAntiAffinityPreset | string | `"soft"` | Pod anti-affinity preset. Allowed values: soft, hard |
+| podLabels | object | `{}` | Pod labels |
+| rbac.create | bool | `true` | Set to true to create serviceAccount |
+| rbac.name | string | `""` | The name of the ServiceAccount to use. |
+| readinessProbe.enabled | bool | `true` | Enable readinessProbe |
+| readinessProbe.failureThreshold | int | `5` | Failure threshold for readinessProbe |
+| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe |
+| readinessProbe.periodSeconds | int | `5` | Period seconds for readinessProbe |
+| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe |
+| readinessProbe.timeoutSeconds | int | `3` | Timeout seconds for readinessProbe |
+| replicaCount | int | `1` | Number of deployment replicas |
+| resources.limits | object | `{"memory":"1024Mi"}` | The resources limits for the init container |
+| resources.requests | object | `{"memory":"768Mi"}` | The requested resources for the init container |
+| schedulerName | string | `nil` | Scheduler name |
+| securityContext | object | `{"enabled":true,"fsGroup":33,"runAsUser":33}` | Security Context |
+| sidecars | object | `{}` | Add sidecars to the server pods. |
+| startupProbe.enabled | bool | `false` | Enable startupProbe |
+| startupProbe.failureThreshold | int | `60` | Failure threshold for startupProbe |
+| startupProbe.initialDelaySeconds | int | `0` | Initial delay seconds for startupProbe |
+| startupProbe.periodSeconds | int | `3` | Period seconds for startupProbe |
+| startupProbe.successThreshold | int | `1` | Success threshold for startupProbe |
+| startupProbe.timeoutSeconds | int | `2` | Timeout seconds for startupProbe |
+| tolerations | list | `[]` | Tolerations for pod assignment. Evaluated as a template. |
+| updateStrategy.rollingUpdate | object | `{"maxSurge":"100%","maxUnavailable":0}` | Rolling update config params. Present only if DeploymentStrategyType = RollingUpdate. |
+| updateStrategy.type | string | `"RollingUpdate"` | Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate. |
 
-`ServiceAccount`:
-The ServiceAccount is access the API server, and when you create a pod, if you do not specify a service account, it is automatically assigned the default service account in the same namespace 
+## Maintainers
 
+| Name | Email | Url |
+| ---- | ------ | --- |
+| choerodon | [email protected] | https://choerodon.io |

chart/choerodon-cluster-agent/README.md.gotmpl

@@ -0,0 +1,26 @@
+{{ template "chart.header" . }}
+{{ template "chart.description" . }}
+
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`:
+
+```console
+$ helm repo add c7n https://openchart.choerodon.com.cn/choerodon/c7n
+$ helm repo update
+$ helm install {{ template "chart.name" . }} c7n/{{ template "chart.name" . }}
+```
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+## Uninstalling the Chart
+
+```bash
+$ helm delete {{ template "chart.name" . }}
+```
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "chart.maintainersSection" . }}

chart/choerodon-cluster-agent/templates/NOTES.txt

@@ -0,0 +1,11 @@
+** Please be patient while the chart is being deployed **
+
+Verify deployment:
+
+    curl -s $(kubectl get po --namespace {{ .Release.Namespace }} \
+        -l app.kubernetes.io/name={{ .Release.Name }} \
+        -o jsonpath="{.items[0].status.podIP}"):{{ .Values.containerPort.serverPort }}
+
+If the following similar information appears, it is a successful deployment:
+
+    healthy

chart/choerodon-cluster-agent/templates/_helpers.tpl

@@ -1,49 +1,61 @@
-{{- define "service.labels.standard" -}}
-choerodon.io/release: {{ .Release.Name | quote }}
-{{- end -}}
+{{/* vim: set filetype=mustache: */}}
 
-{{- define "service.match.labels" -}}
-choerodon.io/release: {{ .Release.Name | quote }}
+{{/*
+Return the proper image name
+*/}}
+{{- define "server.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "chart" .Chart "global" .Values.global) }}
 {{- end -}}
 
-{{- define "service.logging.deployment.label" -}}
-choerodon.io/logs-parser: {{ .Values.logs.parser | quote }}
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "server.imagePullSecrets" -}}
+{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
 {{- end -}}
 
-{{- define "service.monitoring.pod.annotations" -}}
-choerodon.io/metrics-group: {{ .Values.metrics.group | quote }}
-choerodon.io/metrics-path: {{ .Values.metrics.path | quote }}
+{{/*
+Get the credentials secret.
+*/}}
+{{- define "server.secretName" -}}
+{{- if .Values.global.server.existingSecret }}
+    {{- printf "%s" .Values.global.server.existingSecret -}}
+{{- else if .Values.existingSecret -}}
+    {{- printf "%s" .Values.existingSecret -}}
+{{- else -}}
+    {{- printf "%s" (include "common.names.fullname" .) -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
-Return the appropriate apiVersion for deployment.
+Return true if a PVC object should be created
 */}}
-{{- define "app.deployment.apiVersion" -}}
-{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "apps/v1beta2" -}}
-{{- else -}}
-{{- print "apps/v1" -}}
+{{- define "server.createPVC" -}}
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+    {{- true -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Return the appropriate apiVersion for statefulset.
+Return the PVC name
 */}}
-{{- define "app.statefulset.apiVersion" -}}
-{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "apps/v1beta2" -}}
+{{- define "server.claimName" -}}
+{{- if and .Values.persistence.existingClaim }}
+    {{- printf "%s" (tpl .Values.persistence.existingClaim $) -}}
 {{- else -}}
-{{- print "apps/v1" -}}
+    {{- printf "%s" (include "common.names.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Return the appropriate apiVersion for ingress.
+Returns the proper service account name depending if an explicit service account name is set
+in the values file. If the name is not set it will default to either common.names.fullname if serviceAccount.create
+is true or default otherwise.
 */}}
-{{- define "app.ingress.apiVersion" -}}
-{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
-{{- print "networking.k8s.io/v1beta1" -}}
+{{- define "server.serviceAccountName" -}}
+    {{- if .Values.rbac.create -}}
+        {{ default (include "common.names.fullname" .) .Values.rbac.name }}
+    {{- else -}}
+        {{ default "default" .Values.rbac.name }}
+    {{- end -}}
 {{- end -}}
-{{- end -}}

chart/choerodon-cluster-agent/templates/clusterrole.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create }}
+kind: ClusterRole
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "server.serviceAccountName" . }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+rules:
+- apiGroups:
+  - "*"
+  resources:
+  - "*"
+  verbs:
+  - "*"
+{{- end -}}

chart/choerodon-cluster-agent/templates/clusterrolebinding.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.rbac.create }}
+kind: ClusterRoleBinding
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "server.serviceAccountName" . }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ template "server.serviceAccountName" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end -}}