robot: project kubean chart upgrades from v0.4.3 to v0.21.0

Signed-off-by: robot <[email protected]>
DaoCloud · Nov 13, 2024 · 6089a24 · 6089a24
1 parent 88c224b
commit 6089a24
Show file tree

Hide file tree

Showing 25 changed files with 844 additions and 149 deletions.
diff --git a/charts/kubean/config b/charts/kubean/config
@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://kubean-io.github.io/kubean-helm-chart
 export REPO_NAME=kubean-io
 export CHART_NAME=kubean
-export VERSION=v0.4.3
+export VERSION=v0.21.0
 
 # pr issue
 export UPGRADE_METHOD=pr

diff --git a/charts/kubean/kubean/Chart.yaml b/charts/kubean/kubean/Chart.yaml
@@ -1,13 +1,13 @@
 apiVersion: v2
-appVersion: v0.4.3
+appVersion: v0.21.0
 description: A Helm chart for kubean
 icon: https://avatars.githubusercontent.com/u/108458246
 name: kubean
 type: application
-version: v0.4.3
+version: v0.21.0
 dependencies:
   - name: kubean
-    version: "v0.4.3"
+    version: "v0.21.0"
     repository: "https://kubean-io.github.io/kubean-helm-chart"
 annotations:
   addon.kpanda.io/namespace: kubean-system

diff --git a/charts/kubean/kubean/README.md b/charts/kubean/kubean/README.md
@@ -18,12 +18,55 @@ The Kubean provides the following features.
 
 * Support for both AMD64 and ARM64.
 
-## Install
+## Parameters
+
+### kubean-operator parameters
+
+| Name                                        | Description                                           | Value                       |
+| ------------------------------------------- | ----------------------------------------------------- | --------------------------- |
+| `kubeanOperator.replicaCount`               | Number of kubean-operator replicas to deploy          | `1`                         |
+| `kubeanOperator.nameOverride`               | String to partially override kubean-operator.fullname | `""`                        |
+| `kubeanOperator.fullnameOverride`           | String to fully override kubean-operator.fullname     | `""`                        |
+| `kubeanOperator.operationsBackendLimit`     | Limit of operations backend                           | `5`                         |
+| `kubeanOperator.podAnnotations`             | Annotations to add to the kubean-operator pods        | `{}`                        |
+| `kubeanOperator.podSecurityContext`         | Security context for kubean-operator pods             | `{}`                        |
+| `kubeanOperator.securityContext`            | Security context for kubean-operator containers       | `{}`                        |
+| `kubeanOperator.serviceAccount.create`      | Specifies whether a service account should be created | `true`                      |
+| `kubeanOperator.serviceAccount.annotations` | Annotations to add to the service account             | `{}`                        |
+| `kubeanOperator.serviceAccount.name`        | The name of the service account to use.               | `""`                        |
+| `kubeanOperator.image.registry`             | kubean-operator image registry                        | `ghcr.io`                   |
+| `kubeanOperator.image.repository`           | kubean-operator image repository                      | `kubean-io/kubean-operator` |
+| `kubeanOperator.image.tag`                  | kubean-operator image tag                             | `""`                        |
+| `kubeanOperator.image.pullPolicy`           | kubean-operator image pull policy                     | `IfNotPresent`              |
+| `kubeanOperator.image.pullSecrets`          | kubean-operator image pull secrets                    | `[]`                        |
+| `kubeanOperator.service.type`               | kubean-operator service type                          | `ClusterIP`                 |
+| `kubeanOperator.service.port`               | kubean-operator service port                          | `80`                        |
+| `kubeanOperator.resources`                  | kubean-operator resources                             | `{}`                        |
+| `kubeanOperator.nodeSelector`               | kubean-operator node selector                         | `{}`                        |
+| `kubeanOperator.tolerations`                | kubean-operator tolerations                           | `[]`                        |
+
+### kubean admission parameters
+
+| Name                               | Description                                   | Value                        |
+| ---------------------------------- | --------------------------------------------- | ---------------------------- |
+| `kubeanAdmission.replicaCount`     | Number of kubean-admission replicas to deploy | `1`                          |
+| `kubeanAdmission.image.registry`   | kubean-admission image registry               | `ghcr.io`                    |
+| `kubeanAdmission.image.repository` | kubean-admission image repository             | `kubean-io/kubean-admission` |
+| `kubeanAdmission.image.tag`        | kubean-admission image tag                    | `""`                         |
+
+### sprayJob parameters
+
+| Name                        | Description                | Value                 |
+| --------------------------- | -------------------------- | --------------------- |
+| `sprayJob.image.registry`   | spray-job image registry   | `ghcr.io`             |
+| `sprayJob.image.repository` | spray-job image repository | `kubean-io/spray-job` |
+| `sprayJob.image.tag`        | spray-job image tag        | `""`                  |
+
 
 First, add the Kubean chart repo to your local repository.
 ``` bash 
 $ helm repo add kubean-io https://kubean-io.github.io/kubean-helm-chart/
-
+$ helm repo update
 $ helm repo list
 NAME          	URL
 kubean-io     	https://kubean-io.github.io/kubean-helm-chart/

diff --git a/charts/kubean/kubean/charts/kubean/.relok8s-images.yaml b/charts/kubean/kubean/charts/kubean/.relok8s-images.yaml
@@ -2,3 +2,5 @@
 - "{{ .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 }}"
diff --git a/charts/kubean/kubean/charts/kubean/Chart.yaml b/charts/kubean/kubean/charts/kubean/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-appVersion: v0.4.3
+appVersion: v0.21.0
 description: A Helm chart for kubean
 icon: https://avatars.githubusercontent.com/u/108458246
 name: kubean
 type: application
-version: v0.4.3
+version: v0.21.0
diff --git a/charts/kubean/kubean/charts/kubean/README.md b/charts/kubean/kubean/charts/kubean/README.md
@@ -18,12 +18,55 @@ The Kubean provides the following features.
 
 * Support for both AMD64 and ARM64.
 
-## Install
+## Parameters
+
+### kubean-operator parameters
+
+| Name                                        | Description                                           | Value                       |
+| ------------------------------------------- | ----------------------------------------------------- | --------------------------- |
+| `kubeanOperator.replicaCount`               | Number of kubean-operator replicas to deploy          | `1`                         |
+| `kubeanOperator.nameOverride`               | String to partially override kubean-operator.fullname | `""`                        |
+| `kubeanOperator.fullnameOverride`           | String to fully override kubean-operator.fullname     | `""`                        |
+| `kubeanOperator.operationsBackendLimit`     | Limit of operations backend                           | `5`                         |
+| `kubeanOperator.podAnnotations`             | Annotations to add to the kubean-operator pods        | `{}`                        |
+| `kubeanOperator.podSecurityContext`         | Security context for kubean-operator pods             | `{}`                        |
+| `kubeanOperator.securityContext`            | Security context for kubean-operator containers       | `{}`                        |
+| `kubeanOperator.serviceAccount.create`      | Specifies whether a service account should be created | `true`                      |
+| `kubeanOperator.serviceAccount.annotations` | Annotations to add to the service account             | `{}`                        |
+| `kubeanOperator.serviceAccount.name`        | The name of the service account to use.               | `""`                        |
+| `kubeanOperator.image.registry`             | kubean-operator image registry                        | `ghcr.io`                   |
+| `kubeanOperator.image.repository`           | kubean-operator image repository                      | `kubean-io/kubean-operator` |
+| `kubeanOperator.image.tag`                  | kubean-operator image tag                             | `""`                        |
+| `kubeanOperator.image.pullPolicy`           | kubean-operator image pull policy                     | `IfNotPresent`              |
+| `kubeanOperator.image.pullSecrets`          | kubean-operator image pull secrets                    | `[]`                        |
+| `kubeanOperator.service.type`               | kubean-operator service type                          | `ClusterIP`                 |
+| `kubeanOperator.service.port`               | kubean-operator service port                          | `80`                        |
+| `kubeanOperator.resources`                  | kubean-operator resources                             | `{}`                        |
+| `kubeanOperator.nodeSelector`               | kubean-operator node selector                         | `{}`                        |
+| `kubeanOperator.tolerations`                | kubean-operator tolerations                           | `[]`                        |
+
+### kubean admission parameters
+
+| Name                               | Description                                   | Value                        |
+| ---------------------------------- | --------------------------------------------- | ---------------------------- |
+| `kubeanAdmission.replicaCount`     | Number of kubean-admission replicas to deploy | `1`                          |
+| `kubeanAdmission.image.registry`   | kubean-admission image registry               | `ghcr.io`                    |
+| `kubeanAdmission.image.repository` | kubean-admission image repository             | `kubean-io/kubean-admission` |
+| `kubeanAdmission.image.tag`        | kubean-admission image tag                    | `""`                         |
+
+### sprayJob parameters
+
+| Name                        | Description                | Value                 |
+| --------------------------- | -------------------------- | --------------------- |
+| `sprayJob.image.registry`   | spray-job image registry   | `ghcr.io`             |
+| `sprayJob.image.repository` | spray-job image repository | `kubean-io/spray-job` |
+| `sprayJob.image.tag`        | spray-job image tag        | `""`                  |
+
 
 First, add the Kubean chart repo to your local repository.
 ``` bash 
 $ helm repo add kubean-io https://kubean-io.github.io/kubean-helm-chart/
-
+$ helm repo update
 $ helm repo list
 NAME          	URL
 kubean-io     	https://kubean-io.github.io/kubean-helm-chart/

diff --git a/charts/kubean/kubean/charts/kubean/crds/kubean.io_clusteroperations.yaml b/charts/kubean/kubean/charts/kubean/crds/kubean.io_clusteroperations.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -43,13 +42,24 @@ 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
               activeDeadlineSeconds:
                 format: int64
                 type: integer
-              backoffLimit:
-                type: integer
               cluster:
                 description: Cluster the name of Cluster.kubean.io.
                 type: string
@@ -86,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:
@@ -100,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:
@@ -112,6 +148,27 @@ spec:
               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:
@@ -162,7 +219,6 @@ spec:
             required:
             - action
             - actionType
-            - backoffLimit
             - cluster
             - image
             type: object

diff --git a/charts/kubean/kubean/charts/kubean/crds/kubean.io_clusters.yaml b/charts/kubean/kubean/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.

diff --git a/charts/kubean/kubean/charts/kubean/crds/kubean.io_localartifactsets.yaml b/charts/kubean/kubean/charts/kubean/crds/kubean.io_localartifactsets.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/charts/kubean/kubean/charts/kubean/crds/kubean.io_manifests.yaml b/charts/kubean/kubean/charts/kubean/crds/kubean.io_manifests.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -101,6 +100,9 @@ spec:
                           type: string
                       type: object
                     type: array
+                  imageRepoScheme:
+                    default: https
+                    type: string
                   yumRepos:
                     additionalProperties:
                       items:

diff --git a/charts/kubean/kubean/charts/kubean/templates/_helpers.tpl b/charts/kubean/kubean/charts/kubean/templates/_helpers.tpl
@@ -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,18 +42,27 @@ 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
 */}}
@@ -60,3 +73,7 @@ Create the name of the service account to use
 {{- default "default" .Values.kubeanOperator.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "kubean.prehookImage" -}}
+{{- printf "%s/%s:%v" .Values.sprayJob.image.registry .Values.sprayJob.image.repository (.Values.sprayJob.image.tag | default .Chart.Version) }}
+{{- end }}
diff --git a/charts/kubean/kubean/charts/kubean/templates/clusterrole.yaml b/charts/kubean/kubean/charts/kubean/templates/clusterrole.yaml
@@ -4,21 +4,10 @@ kind: ClusterRole
 metadata:
   name: {{ $name }}
 rules:
-  - apiGroups: ['*']
-    resources: ['*']
-    verbs: ['*']
-  - nonResourceURLs: ['*']
-    verbs: ['*']
-  - apiGroups: ['certificates.k8s.io']
-    resourceNames: ['kubernetes.io/*']
-    resources: ['signers']
-    verbs: ['approve']
-  - apiGroups: ['rbac.authorization.k8s.io']
-    resources: ['clusterroles']
-    verbs: ['*']
-  - apiGroups: ['authentication.k8s.io']
-    resources: ['*']
-    verbs: ['*']
-  - apiGroups: ['authorization.k8s.io']
-    resources: ['*']
-    verbs: ['*']
+  - apiGroups: [ 'kubean.io' ]
+    resources: [ 'clusteroperations','clusteroperations/status','clusters','clusters/status','localartifactsets','localartifactsets/status','manifests','manifests/status' ]
+    verbs: [ '*' ]
+  - apiGroups: [ 'admissionregistration.k8s.io' ]
+    resources: [ 'validatingwebhookconfigurations' ]
+    resourceNames: [ 'kubean-admission-webhook' ]
+    verbs: [ 'get', 'create', 'update' ]
diff --git a/charts/kubean/kubean/charts/kubean/templates/configmap.yaml b/charts/kubean/kubean/charts/kubean/templates/configmap.yaml
@@ -2,9 +2,10 @@
 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 }}"
+  SPRAY_JOB_IMAGE_REGISTRY: "{{ .Values.sprayJob.image.registry }}"