Merge pull request #1776 from pixiake/devel

Add default tolerations for ks-core

Author: pixiake

Dockerfile

@@ -1,4 +1,4 @@
-FROM kubespheredev/shell-operator:v1.0.0-beta.5-alpine3.13
+FROM kubespheredev/shell-operator:v1.0.0-beta.5-alpine3.14
 
 ENV  ANSIBLE_ROLES_PATH /kubesphere/installer/roles
 WORKDIR /kubesphere

Dockerfile.complete

@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine3.13
+FROM golang:1.16-alpine3.14
 
 ARG appVersion=latest
 
@@ -12,7 +12,7 @@ WORKDIR /go/src/github.com/flant/shell-operator
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" -o shell-operator ./cmd/shell-operator
 
 
-FROM python:3.9.7-alpine3.13
+FROM python:3.9.7-alpine3.14
 
 RUN apk --no-cache add jq bash curl unzip openssl && \
     apk --no-cache add gcc libffi-dev openssl-dev musl-dev && \

Dockerfile.shelloperator

@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine3.13
+FROM golang:1.16-alpine3.14
 
 ARG appVersion=latest
 
@@ -12,7 +12,7 @@ WORKDIR /go/src/github.com/flant/shell-operator
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" -o shell-operator ./cmd/shell-operator
 
 
-FROM python:3.9.7-alpine3.13
+FROM python:3.9.7-alpine3.14
 
 RUN apk --no-cache add jq bash curl unzip openssl && \
     apk --no-cache add gcc libffi-dev openssl-dev musl-dev && \

roles/ks-core/ks-core/templates/custom-values-ks-core.yaml.j2

@@ -104,5 +104,17 @@ tolerations:
 tolerations:
   {{ tolerations | to_nice_yaml(indent=2) | indent(2) }}
 {% else %}
-tolerations: []
+tolerations:
+  - key: node-role.kubernetes.io/master
+    effect: NoSchedule
+  - key: CriticalAddonsOnly
+    operator: Exists
+  - effect: NoExecute
+    key: node.kubernetes.io/not-ready
+    operator: Exists
+    tolerationSeconds: 60
+  - effect: NoExecute
+    key: node.kubernetes.io/unreachable
+    operator: Exists
+    tolerationSeconds: 60
 {% endif %}

roles/ks-events/files/kube-events/templates/operator/deploy.yaml

@@ -18,17 +18,17 @@ spec:
         app: {{ template "kube-events.operator.fullname" . }}
 {{ include "kube-events.labels" . | indent 8 }}
     spec:
-      {{- if .Values.operator.affinity }}
-      affinity:
-{{ toYaml .Values.operator.affinity | indent 8 }}
+      {{- with .Values.operator.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.operator.nodeSelector }}
+      {{- with .Values.operator.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.operator.nodeSelector | indent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.operator.tolerations }}
-      tolerations:
-{{ toYaml .Values.operator.tolerations | indent 8 }}
+      {{- with .Values.operator.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
       - name: events-operator

roles/ks-events/tasks/main.yaml

@@ -48,12 +48,12 @@
       {{ kubesphere_dir }}/ks-events/kube-events
       -f {{ kubesphere_dir }}/ks-events/custom-values-events.yaml
       -n kubesphere-logging-system --force
-    register: events_result
-    until: events_result is succeeded
+    register: events_re_result
+    until: events_re_result is succeeded
     retries: 3
     delay: 10
     when:
-      - "events_result.stderr"
+      - "events_result.stderr and 'field is immutable' in events_result.stderr"
 
   when:
     - (events_check.stdout.find("deployed") == -1) or (events_check.stdout.find("0.3.0") == -1) or (events_ruler_check.stdout != 'true' and events.ruler is defined and events.ruler.enabled is defined and events.ruler.enabled == True)