From a9fb74f3328060119ae3ebd7d06aa3ea33e29e88 Mon Sep 17 00:00:00 2001 From: ks-ci-bot Date: Thu, 19 Sep 2024 10:45:31 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/Chart.yaml | 2 +- .../charts/ks-crds/scripts/post-delete.sh | 48 ++++++++++ .../charts/ks-crds/templates/_images.tpl | 21 +++++ .../templates/post-delete-crd-job.yaml | 89 +++++++++++++++++++ ...rade-job.yaml => pre-upgrade-crd-job.yaml} | 36 +++++++- src/test/ks-core/charts/ks-crds/values.yaml | 9 +- src/test/ks-core/scripts/post-delete.sh | 48 +--------- src/test/ks-core/templates/_images.tpl | 4 - .../ks-core/templates/extension-museum.yaml | 2 +- .../ks-core/templates/post-delete-job.yaml | 18 ---- src/test/ks-core/values.yaml | 2 +- 11 files changed, 199 insertions(+), 80 deletions(-) create mode 100755 src/test/ks-core/charts/ks-crds/scripts/post-delete.sh create mode 100644 src/test/ks-core/charts/ks-crds/templates/_images.tpl create mode 100644 src/test/ks-core/charts/ks-crds/templates/post-delete-crd-job.yaml rename src/test/ks-core/charts/ks-crds/templates/{pre-upgrade-job.yaml => pre-upgrade-crd-job.yaml} (53%) diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index 76961973a..3ef8f06ca 100644 --- a/src/test/ks-core/Chart.yaml +++ b/src/test/ks-core/Chart.yaml @@ -7,7 +7,7 @@ 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: 1.1.1 +version: 1.1.2 # 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 diff --git a/src/test/ks-core/charts/ks-crds/scripts/post-delete.sh b/src/test/ks-core/charts/ks-crds/scripts/post-delete.sh new file mode 100755 index 000000000..bf07838f7 --- /dev/null +++ b/src/test/ks-core/charts/ks-crds/scripts/post-delete.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +# set -x + +CRD_NAMES=$1 +MAPPING_CONFIG=$2 + +for extension in `kubectl get installplan -o json | jq -r '.items[] | select(.status.state == "Installed") | .metadata.name'` +do + namespace=$(kubectl get installplan $extension -o=jsonpath='{.status.targetNamespace}') + version=$(kubectl get extension $extension -o=jsonpath='{.status.installedVersion}') + extensionversion=$extension-$version + echo "Found extension $extensionversion installed" + helm status $extension --namespace $namespace + if [ $? -eq 0 ]; then + helm mapkubeapis $extension --namespace $namespace --mapfile $MAPPING_CONFIG + fi + helm status $extension-agent --namespace $namespace + if [ $? -eq 0 ]; then + helm mapkubeapis $extension-agent --namespace $namespace --mapfile $MAPPING_CONFIG + fi +done + + +# remove namespace's finalizers && ownerReferences +kubectl patch workspaces.tenant.kubesphere.io system-workspace -p '{"metadata":{"finalizers":[]}}' --type=merge +kubectl patch workspacetemplates.tenant.kubesphere.io system-workspace -p '{"metadata":{"finalizers":[]}}' --type=merge +for ns in $(kubectl get ns -o jsonpath='{.items[*].metadata.name}' -l 'kubesphere.io/managed=true') +do + kubectl label ns $ns kubesphere.io/workspace- && \ + kubectl patch ns $ns -p '{"metadata":{"ownerReferences":[]}}' --type=merge && \ + echo "{\"kind\":\"Namespace\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"$ns\",\"finalizers\":null}}" | kubectl replace --raw "/api/v1/namespaces/$ns/finalize" -f - +done + + +# delete crds +for crd in `kubectl get crds -o jsonpath="{.items[*].metadata.name}"` +do + if [[ ${CRD_NAMES[@]/${crd}/} != ${CRD_NAMES[@]} ]]; then + scop=$(eval echo $(kubectl get crd ${crd} -o jsonpath="{.spec.scope}")) + if [[ $scop =~ "Namespaced" ]] ; then + kubectl get $crd -A --no-headers | awk '{print $1" "$2" ""'$crd'"}' | xargs -n 3 sh -c 'kubectl patch $2 -n $0 $1 -p "{\"metadata\":{\"finalizers\":null}}" --type=merge 2>/dev/null && kubectl delete $2 -n $0 $1 2>/dev/null' + else + kubectl get $crd -A --no-headers | awk '{print $1" ""'$crd'"}' | xargs -n 2 sh -c 'kubectl patch $1 $0 -p "{\"metadata\":{\"finalizers\":null}}" --type=merge 2>/dev/null && kubectl delete $1 $0 2>/dev/null' + fi + kubectl delete crd $crd 2>/dev/null; + fi +done diff --git a/src/test/ks-core/charts/ks-crds/templates/_images.tpl b/src/test/ks-core/charts/ks-crds/templates/_images.tpl new file mode 100644 index 000000000..d27be2fde --- /dev/null +++ b/src/test/ks-core/charts/ks-crds/templates/_images.tpl @@ -0,0 +1,21 @@ +{{- define "kubectl.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.kubectl.image "global" (default .Values.global (dict "imageRegistry" "docker.io"))) }} +{{- end -}} + +{{- define "common.images.image" -}} +{{- $registryName := .global.imageRegistry -}} +{{- $repositoryName := .imageRoot.repository -}} +{{- $separator := ":" -}} +{{- $termination := .global.tag | toString -}} +{{- if .imageRoot.registry }} + {{- $registryName = .imageRoot.registry -}} +{{- end -}} +{{- if .imageRoot.tag }} + {{- $termination = .imageRoot.tag | toString -}} +{{- end -}} +{{- if .imageRoot.digest }} + {{- $separator = "@" -}} + {{- $termination = .imageRoot.digest | toString -}} +{{- end -}} +{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}} +{{- end -}} diff --git a/src/test/ks-core/charts/ks-crds/templates/post-delete-crd-job.yaml b/src/test/ks-core/charts/ks-crds/templates/post-delete-crd-job.yaml new file mode 100644 index 000000000..82827d433 --- /dev/null +++ b/src/test/ks-core/charts/ks-crds/templates/post-delete-crd-job.yaml @@ -0,0 +1,89 @@ +{{- $kubeVersion := .Capabilities.KubeVersion }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: "{{ .Release.Name }}-post-delete-crd-scripts" + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-weight": "-3" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed +data: + map.yaml: | + mappings: + {{- range $path, $_ := .Files.Glob "crds/**" }} + {{- $crd := $.Files.Get $path | fromYaml }} + {{- range $_, $version := $crd.spec.versions }} + - deprecatedAPI: "apiVersion: {{ $crd.spec.group }}/{{ $version.name }}\nkind: {{ $crd.spec.names.kind }}\n" + removedInVersion: "{{ $kubeVersion }}" + {{- end }} + {{- end }} +{{ (.Files.Glob "scripts/post-delete.sh").AsConfig | indent 2 }} + +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: "{{ .Release.Name }}-post-delete-crd" + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-weight": "-3" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: "{{ .Release.Name }}-post-delete-crd" + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-weight": "-3" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: + - kind: ServiceAccount + name: "{{ .Release.Name }}-post-delete-crd" + namespace: {{ .Release.Namespace }} + +--- + +{{- $crdNameList := list }} +{{- range $path, $_ := .Files.Glob "crds/**" }} +{{- $crd := $.Files.Get $path | fromYaml }} +{{- $crdNameList = append $crdNameList $crd.metadata.name }} +{{- end }} + +apiVersion: batch/v1 +kind: Job +metadata: + name: "{{ .Release.Name }}-post-delete-crd" + annotations: + "helm.sh/hook": post-delete + "helm.sh/hook-weight": "-2" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +spec: + template: + spec: + restartPolicy: Never + serviceAccountName: "{{ .Release.Name }}-post-delete-crd" + containers: + - name: post-delete-job + image: {{ template "kubectl.image" . }} + command: + - /bin/bash + - /scripts/post-delete.sh + - '{{ join " " $crdNameList }}' + - /scripts/map.yaml + volumeMounts: + - mountPath: /scripts + name: scripts + resources: {{- toYaml .Values.kubectl.resources | nindent 12 }} + volumes: + - name: scripts + configMap: + name: "{{ .Release.Name }}-post-delete-crd-scripts" + defaultMode: 420 diff --git a/src/test/ks-core/charts/ks-crds/templates/pre-upgrade-job.yaml b/src/test/ks-core/charts/ks-crds/templates/pre-upgrade-crd-job.yaml similarity index 53% rename from src/test/ks-core/charts/ks-crds/templates/pre-upgrade-job.yaml rename to src/test/ks-core/charts/ks-crds/templates/pre-upgrade-crd-job.yaml index 29872d064..a3e342a20 100644 --- a/src/test/ks-core/charts/ks-crds/templates/pre-upgrade-job.yaml +++ b/src/test/ks-core/charts/ks-crds/templates/pre-upgrade-crd-job.yaml @@ -10,6 +10,36 @@ data: {{ (.Files.Glob "scripts/install.sh").AsConfig | indent 2 }} {{ (.Files.Glob "crds/*").AsConfig | indent 2 }} +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: "{{ .Release.Name }}-pre-upgrade-crd" + annotations: + "helm.sh/hook": pre-upgrade + "helm.sh/hook-weight": "-1" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + +--- + +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: "{{ .Release.Name }}-pre-upgrade-crd" + annotations: + "helm.sh/hook": pre-upgrade + "helm.sh/hook-weight": "-1" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: + - kind: ServiceAccount + name: "{{ .Release.Name }}-pre-upgrade-crd" + namespace: {{ .Release.Namespace }} + --- apiVersion: batch/v1 kind: Job @@ -23,10 +53,10 @@ spec: template: spec: restartPolicy: Never - serviceAccountName: {{ include "ks-core.serviceAccountName" . }} + serviceAccountName: "{{ .Release.Name }}-pre-upgrade-crd" containers: - name: crd-install - image: {{ template "preUpgrade.image" . }} + image: {{ template "kubectl.image" . }} command: - /bin/bash - /scripts/install.sh @@ -34,7 +64,7 @@ spec: volumeMounts: - mountPath: /scripts name: scripts - resources: {{- toYaml .Values.preUpgrade.resources | nindent 12 }} + resources: {{- toYaml .Values.kubectl.resources | nindent 12 }} volumes: - name: scripts configMap: diff --git a/src/test/ks-core/charts/ks-crds/values.yaml b/src/test/ks-core/charts/ks-crds/values.yaml index f5790d2da..5816ade14 100644 --- a/src/test/ks-core/charts/ks-crds/values.yaml +++ b/src/test/ks-core/charts/ks-crds/values.yaml @@ -1,12 +1,11 @@ # Default values for ks-crds. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - -preUpgrade: +kubectl: image: registry: "" - repository: kubesphereio/kubectl - tag: "v1.27.12" + repository: kubesphere/kubectl + tag: "v1.27.16" pullPolicy: IfNotPresent resources: limits: @@ -14,4 +13,4 @@ preUpgrade: memory: 1024Mi requests: cpu: 20m - memory: 100Mi \ No newline at end of file + memory: 100Mi diff --git a/src/test/ks-core/scripts/post-delete.sh b/src/test/ks-core/scripts/post-delete.sh index e97f9a8b7..44e8c8dba 100755 --- a/src/test/ks-core/scripts/post-delete.sh +++ b/src/test/ks-core/scripts/post-delete.sh @@ -2,55 +2,9 @@ # set -x -CRD_NAMES=$1 -MAPPING_CONFIG=$2 - -for extension in `kubectl get installplan -o json | jq -r '.items[] | select(.status.state == "Installed") | .metadata.name'` -do - namespace=$(kubectl get installplan $extension -o=jsonpath='{.status.targetNamespace}') - version=$(kubectl get extension $extension -o=jsonpath='{.status.installedVersion}') - extensionversion=$extension-$version - echo "Found extension $extensionversion installed" - helm status $extension --namespace $namespace - if [ $? -eq 0 ]; then - helm mapkubeapis $extension --namespace $namespace --mapfile $MAPPING_CONFIG - fi - helm status $extension-agent --namespace $namespace - if [ $? -eq 0 ]; then - helm mapkubeapis $extension-agent --namespace $namespace --mapfile $MAPPING_CONFIG - fi -done - - -# remove namespace's finalizers && ownerReferences -kubectl patch workspaces.tenant.kubesphere.io system-workspace -p '{"metadata":{"finalizers":[]}}' --type=merge -kubectl patch workspacetemplates.tenant.kubesphere.io system-workspace -p '{"metadata":{"finalizers":[]}}' --type=merge -for ns in $(kubectl get ns -o jsonpath='{.items[*].metadata.name}' -l 'kubesphere.io/managed=true') -do - kubectl label ns $ns kubesphere.io/workspace- && \ - kubectl patch ns $ns -p '{"metadata":{"ownerReferences":[]}}' --type=merge && \ - echo "{\"kind\":\"Namespace\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"$ns\",\"finalizers\":null}}" | kubectl replace --raw "/api/v1/namespaces/$ns/finalize" -f - -done - - -# delete crds -for crd in `kubectl get crds -o jsonpath="{.items[*].metadata.name}"` -do - if [[ ${CRD_NAMES[@]/${crd}/} != ${CRD_NAMES[@]} ]]; then - scop=$(eval echo $(kubectl get crd ${crd} -o jsonpath="{.spec.scope}")) - if [[ $scop =~ "Namespaced" ]] ; then - kubectl get $crd -A --no-headers | awk '{print $1" "$2" ""'$crd'"}' | xargs -n 3 sh -c 'kubectl patch $2 -n $0 $1 -p "{\"metadata\":{\"finalizers\":null}}" --type=merge 2>/dev/null && kubectl delete $2 -n $0 $1 2>/dev/null' - else - kubectl get $crd -A --no-headers | awk '{print $1" ""'$crd'"}' | xargs -n 2 sh -c 'kubectl patch $1 $0 -p "{\"metadata\":{\"finalizers\":null}}" --type=merge 2>/dev/null && kubectl delete $1 $0 2>/dev/null' - fi - kubectl delete crd $crd 2>/dev/null; - fi -done - - EXTENSION_RELATED_RESOURCES='jobs.batch roles.rbac.authorization.k8s.io rolebindings.rbac.authorization.k8s.io clusterroles.rbac.authorization.k8s.io clusterrolebindings.rbac.authorization.k8s.io' for resource in $EXTENSION_RELATED_RESOURCES;do echo "kubectl delete $resource -l kubesphere.io/extension-ref --all-namespaces" kubectl delete $resource -l kubesphere.io/managed=true --all-namespaces -done \ No newline at end of file +done diff --git a/src/test/ks-core/templates/_images.tpl b/src/test/ks-core/templates/_images.tpl index f77da091a..cb9fd0d57 100644 --- a/src/test/ks-core/templates/_images.tpl +++ b/src/test/ks-core/templates/_images.tpl @@ -33,10 +33,6 @@ Return the proper image name {{ include "common.images.image" (dict "imageRoot" .Values.redis.image "global" .Values.global) }} {{- end -}} -{{- define "preUpgrade.image" -}} -{{ include "common.images.image" (dict "imageRoot" .Values.preUpgrade.image "global" .Values.global) }} -{{- end -}} - {{- define "extensions_museum.image" -}} {{ include "common.images.image" (dict "imageRoot" .Values.ksExtensionRepository.image "global" .Values.global) }} {{- end -}} diff --git a/src/test/ks-core/templates/extension-museum.yaml b/src/test/ks-core/templates/extension-museum.yaml index ae9ca355d..8b601cb23 100644 --- a/src/test/ks-core/templates/extension-museum.yaml +++ b/src/test/ks-core/templates/extension-museum.yaml @@ -51,7 +51,7 @@ spec: url: http://extensions-museum.{{ .Release.Namespace }}.svc --- -apiVersion: batch/v1 +apiVersion: {{ if semverCompare ">=1.20.0" .Capabilities.KubeVersion.Version }}batch/v1{{ else }}batch/v1beta1{{end}} kind: CronJob metadata: name: restart-extensions-museum diff --git a/src/test/ks-core/templates/post-delete-job.yaml b/src/test/ks-core/templates/post-delete-job.yaml index 22c99bd02..cacb32d37 100644 --- a/src/test/ks-core/templates/post-delete-job.yaml +++ b/src/test/ks-core/templates/post-delete-job.yaml @@ -1,4 +1,3 @@ -{{- $kubeVersion := .Capabilities.KubeVersion }} apiVersion: v1 kind: ConfigMap metadata: @@ -8,15 +7,6 @@ metadata: "helm.sh/hook-weight": "-1" "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed data: - map.yaml: | - mappings: - {{- range $path, $_ := .Files.Glob "charts/ks-crds/crds/**" }} - {{- $crd := $.Files.Get $path | fromYaml }} - {{- range $_, $version := $crd.spec.versions }} - - deprecatedAPI: "apiVersion: {{ $crd.spec.group }}/{{ $version.name }}\nkind: {{ $crd.spec.names.kind }}\n" - removedInVersion: "{{ $kubeVersion }}" - {{- end }} - {{- end }} {{ (.Files.Glob "scripts/post-delete.sh").AsConfig | indent 2 }} --- @@ -51,12 +41,6 @@ subjects: --- -{{- $crdNameList := list }} -{{- range $path, $_ := .Files.Glob "charts/ks-crds/crds/**" }} -{{- $crd := $.Files.Get $path | fromYaml }} -{{- $crdNameList = append $crdNameList $crd.metadata.name }} -{{- end }} - apiVersion: batch/v1 kind: Job metadata: @@ -76,8 +60,6 @@ spec: command: - /bin/bash - /scripts/post-delete.sh - - '{{ join " " $crdNameList }}' - - /scripts/map.yaml volumeMounts: - mountPath: /scripts name: scripts diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index b865ad709..560e6ddec 100644 --- a/src/test/ks-core/values.yaml +++ b/src/test/ks-core/values.yaml @@ -421,7 +421,7 @@ redisHA: - "" ksCRDs: - preUpgrade: + kubectl: image: registry: "" repository: kubesphere/kubectl