See 0ekk/kubean@11d1b96 from refs/tags/v0.99.0

Author: tu1h

charts/kubean/.relok8s-images.yaml

@@ -0,0 +1,6 @@
+# kubean-operator
+- "{{ .kubeanOperator.image.registry }}/{{ .kubeanOperator.image.repository }}:{{ .kubeanOperator.image.tag }}"
+# spray-job
+- "{{ .sprayJob.image.registry }}/{{ .sprayJob.image.repository }}:{{ .sprayJob.image.tag }}"
+# kubean-admission
+- "{{ .kubeanAdmission.image.registry }}/{{ .kubeanAdmission.image.repository }}:{{ .kubeanAdmission.image.tag }}"

charts/kubean/Chart.yaml

@@ -1,7 +1,6 @@
 apiVersion: v2
 name: kubean
 description: A Helm chart for kubean
-
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -11,16 +10,13 @@ description: A Helm chart for kubean
 # a dependency of application charts to inject those utilities and functions into the rendering
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v0.0.7
-
+version: "v0.99.0"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.1"
-
+appVersion: "v0.99.0"
 icon: https://avatars.githubusercontent.com/u/108458246

charts/kubean/crds/kubean.io_clusteroperations.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -43,9 +42,23 @@ spec:
             properties:
               action:
                 type: string
+              actionSource:
+                default: builtin
+                type: string
+              actionSourceRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               actionType:
                 type: string
-              backoffLimit:
+              activeDeadlineSeconds:
+                format: int64
                 type: integer
               cluster:
                 description: Cluster the name of Cluster.kubean.io.
@@ -83,6 +96,19 @@ spec:
                   properties:
                     action:
                       type: string
+                    actionSource:
+                      default: builtin
+                      type: string
+                    actionSourceRef:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      required:
+                      - name
+                      - namespace
+                      type: object
                     actionType:
                       type: string
                     extraArgs:
@@ -97,6 +123,19 @@ spec:
                   properties:
                     action:
                       type: string
+                    actionSource:
+                      default: builtin
+                      type: string
+                    actionSourceRef:
+                      properties:
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                      required:
+                      - name
+                      - namespace
+                      type: object
                     actionType:
                       type: string
                     extraArgs:
@@ -106,6 +145,53 @@ spec:
                   - actionType
                   type: object
                 type: array
+              resources:
+                description: ResourceRequirements describes the compute resource requirements.
+                properties:
+                  claims:
+                    description: "Claims lists the names of resources, defined in
+                      spec.resourceClaims, that are used by this container. \n This
+                      is an alpha field and requires enabling the DynamicResourceAllocation
+                      feature gate. \n This field is immutable. It can only be set
+                      for containers."
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: Name must match the name of one entry in pod.spec.resourceClaims
+                            of the Pod where this field is used. It makes that resource
+                            available inside a container.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Limits describes the maximum amount of compute resources
+                      allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Requests describes the minimum amount of compute
+                      resources required. If Requests is omitted for a container,
+                      it defaults to Limits if that is explicitly specified, otherwise
+                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                type: object
               sshAuthRef:
                 description: SSHAuthRef will be filled by operator when it performs
                   backup.
@@ -133,7 +219,6 @@ spec:
             required:
             - action
             - actionType
-            - backoffLimit
             - cluster
             - image
             type: object

charts/kubean/crds/kubean.io_clusters.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -62,6 +61,16 @@ spec:
                 - name
                 - namespace
                 type: object
+              preCheckRef:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               sshAuthRef:
                 description: SSHAuthRef stores ssh key and if it is empty ,then use
                   sshpass.

charts/kubean/crds/kubean.io_localartifactsets.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

charts/kubean/crds/kubean.io_manifests.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -90,6 +89,20 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  imageRepoAuth:
+                    items:
+                      properties:
+                        imageRepoAddress:
+                          type: string
+                        passwordBase64:
+                          type: string
+                        userName:
+                          type: string
+                      type: object
+                    type: array
+                  imageRepoScheme:
+                    default: https
+                    type: string
                   yumRepos:
                     additionalProperties:
                       items:

charts/kubean/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "kubean.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.kubeanOperator.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "kubean.namespace" -}}
@@ -15,10 +15,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "kubean.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- if .Values.kubeanOperator.fullnameOverride }}
+{{- .Values.kubeanOperator.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- $name := default .Chart.Name .Values.kubeanOperator.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -27,6 +27,10 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{- define "kubean.admissionName" -}}
+{{- printf "%s-admission" .Release.Name }}
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -38,25 +42,38 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "kubean.labels" -}}
-{{ include "kubean.selectorLabels" . }}
+{{ include "kubeanOperator.selectorLabels" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "kubean.selectorLabels" -}}
+{{- define "kubeanOperator.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "kubean.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{- define "kubeanAdmission.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubean.name" . }}
+app.kubernetes.io/instance: {{ printf "%s-admission-controller" .Release.Name }}
+{{- end }}
+
+{{- define "kubeanAdmission.svcName" -}}
+{{- printf "%s-admission" .Chart.Name }}
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}
 {{- define "kubean.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "kubean.fullname" .) .Values.serviceAccount.name }}
+{{- if .Values.kubeanOperator.serviceAccount.create }}
+{{- default (include "kubean.fullname" .) .Values.kubeanOperator.serviceAccount.name }}
 {{- else }}
-{{- default "default" .Values.serviceAccount.name }}
+{{- default "default" .Values.kubeanOperator.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "kubean.prehookImage" -}}
+{{- printf "%s/%s:%s" .Values.sprayJob.image.registry .Values.sprayJob.image.repository (.Values.sprayJob.image.tag | default .Chart.Version) }}
+{{- end }}

charts/kubean/templates/clusterrole.yaml

@@ -22,3 +22,6 @@ rules:
   - apiGroups: ['authorization.k8s.io']
     resources: ['*']
     verbs: ['*']
+  - apiGroups: ['admissionregistration.k8s.io']
+    resources: ['*']
+    verbs: ['*']

charts/kubean/templates/clusterrolebinding.yaml

@@ -9,5 +9,5 @@ roleRef:
   name: {{ $name }}
 subjects:
   - kind: ServiceAccount
-    name: {{ $name }}
+    name: {{ include "kubean.serviceAccountName" . }}
     namespace: {{ include "kubean.namespace" . }}

charts/kubean/templates/configmap.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "kubean.fullname" . }}-config
+  name: kubean-config
   namespace: {{ include "kubean.namespace" . }}
   labels:
   {{- include "kubean.labels" . | nindent 4}}
 data:
-  BACKEND_LIMIT: "10"
+  CLUSTER_OPERATIONS_BACKEND_LIMIT: "{{ .Values.kubeanOperator.operationsBackendLimit }}"