remove unused code (#4981)

2026-03-22 11:25:11 -02:30 · 2019-07-16 16:39:24 +08:00
parent 99c5f7e013
commit de9443a694
36 changed files with 6 additions and 100 deletions
--- a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
@@ -140,9 +140,7 @@ spec:
      labels:
        k8s-app: kubernetes-dashboard
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: system-cluster-critical
-{% endif %}
      containers:
      - name: kubernetes-dashboard
        image: {{ dashboard_image_repo }}:{{ dashboard_image_tag }}
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -34,9 +34,7 @@ spec:
        scheduler.alpha.kubernetes.io/critical-pod: ""
        seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: system-cluster-critical
-{% endif %}
      securityContext:
        supplementalGroups: [ 65534 ]
        fsGroup: 65534
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2
@@ -12,9 +12,7 @@ spec:
      labels:
        app: netchecker-agent
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      tolerations:
        - effect: NoSchedule
          operator: Exists
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2
@@ -16,9 +16,7 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      nodeSelector:
        beta.kubernetes.io/os: linux
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      tolerations:
        - effect: NoSchedule
          operator: Exists
--- a/roles/kubernetes-apps/ansible/templates/netchecker-server-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-server-deployment.yml.j2
@@ -11,9 +11,7 @@ spec:
        app: netchecker-server
      namespace: {{ netcheck_namespace }}
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if netcheck_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      containers:
        - name: netchecker-server
          image: "{{ netcheck_server_image_repo }}:{{ netcheck_server_image_tag }}"
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@@ -19,9 +19,7 @@ spec:
        prometheus.io/scrape: 'true'
        prometheus.io/port: '9253'
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: system-cluster-critical
-{% endif %}
      serviceAccountName: nodelocaldns
      hostNetwork: true
      dnsPolicy: Default  # Don't use cluster DNS.
--- a/roles/kubernetes-apps/cluster_roles/tasks/main.yml
+++ b/roles/kubernetes-apps/cluster_roles/tasks/main.yml
@@ -140,9 +140,7 @@

 - name: PriorityClass | Copy k8s-cluster-critical-pc.yml file
  copy: src=k8s-cluster-critical-pc.yml dest={{ kube_config_dir }}/k8s-cluster-critical-pc.yml
-  when:
-    - kube_version is version('v1.11.1', '>=')
-    - inventory_hostname == groups['kube-master']|last
+  when: inventory_hostname == groups['kube-master']|last

 - name: PriorityClass | Create k8s-cluster-critical
  kube:
@@ -151,6 +149,4 @@
    resource: "PriorityClass"
    filename: "{{ kube_config_dir }}/k8s-cluster-critical-pc.yml"
    state: latest
-  when:
-    - kube_version is version('v1.11.1', '>=')
-    - inventory_hostname == groups['kube-master']|last
+  when: inventory_hostname == groups['kube-master']|last
--- a/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
+++ b/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
@@ -43,10 +43,8 @@ spec:
      - min: 1
        max: 65535
  readOnlyRootFilesystem: false
-{% if kube_version is version('v1.12.1', '>=') %}
  forbiddenSysctls:
  - '*'
-{% endif %}
 ---
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
@@ -79,8 +77,6 @@ spec:
  fsGroup:
    rule: 'RunAsAny'
  readOnlyRootFilesystem: false
-{% if kube_version is version('v1.12.1', '>=') %}
  # This will fail if allowed-unsafe-sysctls is not set accordingly in kubelet flags
  allowedUnsafeSysctls:
  - '*'
-{% endif %}
--- a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/deploy-cephfs-provisioner.yml.j2
@@ -19,9 +19,7 @@ spec:
        app: cephfs-provisioner
        version: {{ cephfs_provisioner_image_tag }}
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if cephfs_provisioner_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccount: cephfs-provisioner
      containers:
        - name: cephfs-provisioner
--- a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2
@@ -18,9 +18,7 @@ spec:
        k8s-app: local-volume-provisioner
        version: {{ local_volume_provisioner_image_tag }}
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if local_volume_provisioner_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccountName: local-volume-provisioner
      tolerations:
        - effect: NoSchedule
--- a/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/deploy-rbd-provisioner.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/deploy-rbd-provisioner.yml.j2
@@ -21,9 +21,7 @@ spec:
        app: rbd-provisioner
        version: {{ rbd_provisioner_image_tag }}
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if rbd_provisioner_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccount: rbd-provisioner
      containers:
        - name: rbd-provisioner
--- a/roles/kubernetes-apps/helm/tasks/main.yml
+++ b/roles/kubernetes-apps/helm/tasks/main.yml
@@ -45,7 +45,7 @@
    --upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }}
    {% if rbac_enabled %} --service-account=tiller{% endif %}
    {% if tiller_node_selectors is defined %} --node-selectors {{ tiller_node_selectors }}{% endif %}
-    {% if kube_version is version('v1.11.1', '>=') %} --override spec.template.spec.priorityClassName={% if tiller_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{% endif %}
+    --override spec.template.spec.priorityClassName={% if tiller_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}
    {% if tiller_override is defined and tiller_override %} --override {{ tiller_override }}{% endif %}
    {% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
    {% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
@@ -66,7 +66,7 @@
    {% if helm_stable_repo_url is defined %} --stable-repo-url {{ helm_stable_repo_url }}{% endif %}
    {% if rbac_enabled %} --service-account=tiller{% endif %}
    {% if tiller_node_selectors is defined %} --node-selectors {{ tiller_node_selectors }}{% endif %}
-    {% if kube_version is version('v1.11.1', '>=') %} --override spec.template.spec.priorityClassName={% if tiller_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{% endif %}
+    --override spec.template.spec.priorityClassName={% if tiller_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}
    {% if tiller_override is defined and tiller_override %} --override {{ tiller_override }}{% endif %}
    {% if tiller_max_history is defined %} --history-max={{ tiller_max_history }}{% endif %}
    {% if tiller_enable_tls %} --tiller-tls --tiller-tls-verify --tiller-tls-cert={{ tiller_tls_cert }} --tiller-tls-key={{ tiller_tls_key }} --tls-ca-cert={{ tiller_tls_ca_cert }} {% endif %}
@@ -76,7 +76,6 @@
    | {{ bin_dir }}/kubectl apply -f -
  changed_when: false
  when:
-    - (tiller_override is defined and tiller_override) or (kube_version is version('v1.11.1', '>='))
    - inventory_hostname == groups['kube-master'][0]
  environment: "{{ proxy_env }}"

--- a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/deploy-cert-manager.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/deploy-cert-manager.yml.j2
@@ -22,9 +22,7 @@ spec:
        release: cert-manager
      annotations:
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if cert_manager_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccountName: cert-manager
      containers:
        - name: cert-manager
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
@@ -34,9 +34,7 @@ spec:
      tolerations:
        {{ ingress_nginx_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
 {% endif %}
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if ingress_nginx_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      containers:
        - name: ingress-nginx-controller
          image: {{ ingress_nginx_controller_image_repo }}:{{ ingress_nginx_controller_image_tag }}
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -23,9 +23,7 @@ spec:
      annotations:
        seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: system-cluster-critical
-{% endif %}
      serviceAccountName: metrics-server
      containers:
      - name: metrics-server
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@@ -32,9 +32,7 @@ spec:
          operator: Exists
        - key: node-role.kubernetes.io/master
          effect: NoSchedule
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: system-cluster-critical
-{% endif %}
      containers:
        - name: calico-kube-controllers
          image: {{ calico_policy_image_repo }}:{{ calico_policy_image_tag }}
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -21,9 +21,7 @@ spec:
        kubernetes.io/cluster-service: "true"
        version: v{{ registry_proxy_image_tag }}
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if registry_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccountName: registry-proxy
      containers:
        - name: registry-proxy
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -22,9 +22,7 @@ spec:
        version: v{{ registry_image_tag }}
        kubernetes.io/cluster-service: "true"
    spec:
-{% if kube_version is version('v1.11.1', '>=') %}
      priorityClassName: {% if registry_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
-{% endif %}
      serviceAccountName: registry
      containers:
        - name: registry