See kubean-io/kubean@9f1fbca from refs/tags/v0.19.0

charts/kubean/Chart.yaml

@@ -13,10 +13,10 @@ 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.18.5"
+version: "v0.19.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: "v0.18.5"
+appVersion: "v0.19.0"
 icon: https://avatars.githubusercontent.com/u/108458246

charts/kubean/templates/manifest.cr.yaml

@@ -2,14 +2,14 @@
 apiVersion: kubean.io/v1alpha1
 kind: Manifest
 metadata:
-  name: "manifest-v0-18-5"
+  name: "manifest-v0-19-0"
   labels:
     kubean.io/sprayRelease: master
   annotations:
     helm.sh/resource-policy: keep
 spec:
-  kubesprayVersion: "2f84567a6911b7258d17a967081b1d464990473d"
-  kubeanVersion: "v0.18.5"
+  kubesprayVersion: "4b324cb0f0be82a5b2d63c553888ff29e206017f"
+  kubeanVersion: "v0.19.0"
   docker:
     - os: redhat-7
       defaultVersion: "26.1"
@@ -81,7 +81,7 @@ spec:
         - "v1.1.9"
         - "v1.1.8"
     - name: kube
-      defaultVersion: "v1.29.5"
+      defaultVersion: "v1.30.4"
       versionRange:
         - "v1.30.4"
         - "v1.30.3"
@@ -120,8 +120,10 @@ spec:
         - "v1.0.1"
         - "v1.0.0"
     - name: calico
-      defaultVersion: "v3.27.3"
+      defaultVersion: "v3.28.1"
       versionRange:
+        - "v3.28.1"
+        - "v3.28.0"
         - "v3.27.3"
         - "v3.27.2"
         - "v3.27.1"
@@ -144,8 +146,9 @@ spec:
         - "v3.23.5"
         - "v3.23.4"
     - name: containerd
-      defaultVersion: "1.7.20"
+      defaultVersion: "1.7.21"
       versionRange:
+        - "1.7.21"
         - "1.7.20"
         - "1.7.19"
         - "1.7.18"

charts/kubean/templates/prehook-job.yml

@@ -54,13 +54,77 @@ spec:
           configMap:
             name: {{ $name }}-pre-manifests
 ---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ $name }}-pre-hook-add-manifest-annotation"
+  namespace: {{ $namespace }}
+  annotations:
+    # only for pre-upgrade and do not need this for pre-install
+    "helm.sh/hook": pre-upgrade
+    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  template:
+    metadata:
+      name: {{ $name }}
+      labels:
+        app.kubernetes.io/instance: {{ $name | quote }}
+    spec:
+      serviceAccountName: {{ $name }}-pre-hook-job
+      restartPolicy: Never
+      containers:
+        - name: keep-manifest
+          image: {{ include "kubean.prehookImage" . }}
+          imagePullPolicy: IfNotPresent
+          command:
+            - /bin/sh
+            - -c
+            - |
+              bash <<'EOF'
+              set -ex
+              kubectl annotate manifest --all helm.sh/resource-policy=keep
+              EOF
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ $name }}-pre-hook-delete-all-manifest"
+  namespace: {{ $namespace }}
+  annotations:
+    # delete all manifests in pre-hook to avoid being kept due to the resource policy (helm.sh/resource-policy=keep).
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  template:
+    metadata:
+      name: {{ $name }}
+      labels:
+        app.kubernetes.io/instance: {{ $name | quote }}
+    spec:
+      serviceAccountName: {{ $name }}-pre-hook-job
+      restartPolicy: Never
+      containers:
+        - name: delete-all-manifest
+          image: {{ include "kubean.prehookImage" . }}
+          imagePullPolicy: IfNotPresent
+          command:
+            - /bin/sh
+            - -c
+            - |
+              bash <<'EOF'
+              set -ex
+              kubectl delete manifest --all
+              EOF
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ $name }}-pre-hook-job
   namespace: {{ $namespace }}
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook": pre-install,pre-upgrade,pre-delete
     "helm.sh/hook-weight": "1"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 ---
@@ -69,7 +133,7 @@ kind: ClusterRole
 metadata:
   name: {{ $name }}-pre-hook-job
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook": pre-install,pre-upgrade,pre-delete
     "helm.sh/hook-weight": "1"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 rules:
@@ -84,7 +148,7 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ $name }}-pre-hook-job
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook": pre-install,pre-upgrade,pre-delete
     "helm.sh/hook-weight": "1"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 roleRef:

charts/kubean/values.yaml

@@ -49,7 +49,7 @@ kubeanOperator:
     # -- kubean-operator image registry
     repository: kubean-io/kubean-operator
     # -- the image tag whose default is the chart appVersion
-    tag: "v0.18.5"
+    tag: "v0.19.0"
     # -- Pull policy of image
     pullPolicy: IfNotPresent
     # -- Pull secrets of image
@@ -103,7 +103,7 @@ kubeanAdmission:
     # -- spray-job image registry
     repository: kubean-io/kubean-admission
     # -- the image tag whose default is the chart appVersion
-    tag: "v0.18.5"
+    tag: "v0.19.0"
 ## @section sprayJob parameters
 ## @param sprayJob.image.registry spray-job image registry
 ## @param sprayJob.image.repository spray-job image repository
@@ -116,4 +116,4 @@ sprayJob:
     # -- spray-job image registry
     repository: kubean-io/spray-job
     # -- the image tag whose default is the chart appVersion
-    tag: "v0.18.5"
+    tag: "v0.19.0"