diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml index a05a3ab7c..0d81eef18 100644 --- a/roles/download/tasks/main.yml +++ b/roles/download/tasks/main.yml @@ -30,7 +30,6 @@ - name: download | Get kubeadm binary and list of required images include_tasks: prep_kubeadm_images.yml when: - - kube_version is version('v1.11.0', '>=') - not skip_downloads|default(false) - inventory_hostname in groups['kube-master'] tags: diff --git a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2 b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2 index c14d65af1..428fdb825 100644 --- 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 }} diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 index 9cacf6079..53e691c95 100644 --- 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 diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-ds.yml.j2 index 414e79abc..c91733cb3 100644 --- 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 diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml.j2 index c41e6f3f2..22eb2db68 100644 --- 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 diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-server-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-server-deployment.yml.j2 index 28327e124..76d50e4a4 100644 --- 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 }}" diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 index 61c8a5476..98f877caa 100644 --- 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. diff --git a/roles/kubernetes-apps/cluster_roles/tasks/main.yml b/roles/kubernetes-apps/cluster_roles/tasks/main.yml index 3a4b0fcc1..91955ea8a 100644 --- 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 diff --git a/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2 b/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2 index e6dd7d1a1..b96186e3e 100644 --- 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 %} diff --git 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 index e75c8feff..ac3bb33db 100644 --- 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 diff --git 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 index b1c05c244..f6be8cc77 100644 --- 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 diff --git 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 index 0d66bac88..dccc16564 100644 --- 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 diff --git a/roles/kubernetes-apps/helm/tasks/main.yml b/roles/kubernetes-apps/helm/tasks/main.yml index 900261fd2..ecb3688a7 100644 --- 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 }}" diff --git 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 index edc952b5a..daf82ebe0 100644 --- 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 diff --git 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 index f8499cbd6..8c48089d5 100644 --- 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 }} diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 index 126bb37cd..a536cfd35 100644 --- 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 diff --git 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 index f015046e5..84e057de9 100644 --- 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 }} diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 index 71f29d842..8b7740a60 100644 --- 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 diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 index df3bed9d7..c4b6040a9 100644 --- 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 diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index 61df859d9..b7b0f2c30 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -90,7 +90,7 @@ imageRepository: {{ kube_image_repo }} useHyperKubeImage: false apiServer: extraArgs: -{% if kube_api_anonymous_auth is defined and kube_version is version('v1.5', '>=') %} +{% if kube_api_anonymous_auth is defined %} anonymous-auth: "{{ kube_api_anonymous_auth }}" {% endif %} authorization-mode: {{ authorization_modes | join(',') }} @@ -106,9 +106,7 @@ apiServer: disable-admission-plugins: {{ kube_apiserver_disable_admission_plugins | join(',') }} {% endif %} apiserver-count: "{{ kube_apiserver_count }}" -{% if kube_version is version('v1.9', '>=') %} endpoint-reconciler-type: lease -{% endif %} {% if etcd_events_cluster_enabled %} etcd-servers-overrides: "/events#{{ etcd_events_access_addresses_semicolon }}" {% endif %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 index 7414460c1..3d13577fe 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 @@ -94,7 +94,7 @@ imageRepository: {{ kube_image_repo }} useHyperKubeImage: false apiServer: extraArgs: -{% if kube_api_anonymous_auth is defined and kube_version is version('v1.5', '>=') %} +{% if kube_api_anonymous_auth is defined %} anonymous-auth: "{{ kube_api_anonymous_auth }}" {% endif %} authorization-mode: {{ authorization_modes | join(',') }} @@ -110,9 +110,7 @@ apiServer: disable-admission-plugins: {{ kube_apiserver_disable_admission_plugins | join(',') }} {% endif %} apiserver-count: "{{ kube_apiserver_count }}" -{% if kube_version is version('v1.9', '>=') %} endpoint-reconciler-type: lease -{% endif %} {% if etcd_events_cluster_enabled %} etcd-servers-overrides: "/events#{{ etcd_events_access_addresses_semicolon }}" {% endif %} diff --git a/roles/kubernetes/node/templates/cloud-configs/aws-cloud-config.j2 b/roles/kubernetes/node/templates/cloud-configs/aws-cloud-config.j2 index c1fe08649..f6d0c3de0 100644 --- a/roles/kubernetes/node/templates/cloud-configs/aws-cloud-config.j2 +++ b/roles/kubernetes/node/templates/cloud-configs/aws-cloud-config.j2 @@ -1,17 +1,11 @@ [Global] -{% if kube_version is version('v1.6', '>=') %} zone={{ aws_zone|default("") }} vpc={{ aws_vpc|default("") }} subnetId={{ aws_subnet_id|default("") }} routeTableId={{ aws_route_table_id|default("") }} -{% if kube_version is version('v1.10', '>=') %} roleArn={{ aws_role_arn|default("") }} -{% endif %} kubernetesClusterTag={{ aws_kubernetes_cluster_tag|default("") }} kubernetesClusterId={{ aws_kubernetes_cluster_id|default("") }} disableSecurityGroupIngress={{ "true" if aws_disable_security_group_ingress|default(False) else "false" }} disableStrictZoneCheck={{ "true" if aws_disable_strict_zone_check|default(False) else "false" }} -{% if kube_version is version('v1.7', '>=') %} elbSecurityGroup={{ aws_elb_security_group|default("") }} -{% endif %} -{% endif %} diff --git a/roles/kubernetes/node/templates/cloud-configs/vsphere-cloud-config.j2 b/roles/kubernetes/node/templates/cloud-configs/vsphere-cloud-config.j2 index fda0dd199..2cda7f6d6 100644 --- a/roles/kubernetes/node/templates/cloud-configs/vsphere-cloud-config.j2 +++ b/roles/kubernetes/node/templates/cloud-configs/vsphere-cloud-config.j2 @@ -4,22 +4,7 @@ password = "{{ vsphere_password }}" port = {{ vsphere_vcenter_port }} insecure-flag = {{ vsphere_insecure }} -{% if kube_version is version('v1.9.2', '>=') %} datacenters = "{{ vsphere_datacenter }}" -{% else %} -datastore = "{{ vsphere_datastore }}" -datacenter = "{{ vsphere_datacenter }}" -working-dir = "{{ vsphere_working_dir }}" -server = "{{ vsphere_vcenter_ip }}" -{% if vsphere_vm_uuid is defined and vsphere_vm_uuid != "" %} -vm-uuid = "{{ vsphere_vm_uuid }}" -{% endif %} -{% if vsphere_vm_name is defined and vsphere_vm_name != "" %} -vm-name = "{{ vsphere_vm_name }}" -{% endif %} -{% endif %} - -{% if kube_version is version('v1.9.2', '>=') %} [VirtualCenter "{{ vsphere_vcenter_ip }}"] @@ -32,7 +17,6 @@ default-datastore = "{{ vsphere_datastore }}" {% if vsphere_resource_pool is defined and vsphere_resource_pool != "" %} resourcepool-path = "{{ vsphere_resource_pool }}" {% endif %} -{% endif %} [Disk] @@ -43,7 +27,6 @@ scsicontrollertype = {{ vsphere_scsi_controller_type }} public-network = {{ vsphere_public_network }} {% endif %} -{% if kube_version is version('v1.12.0', '>=') %} [Labels] {% if vsphere_zone_category is defined and vsphere_zone_category != "" %} zone = {{ vsphere_zone_category }} @@ -51,4 +34,3 @@ zone = {{ vsphere_zone_category }} {% if vsphere_region_category is defined and vsphere_region_category != "" %} region = {{ vsphere_region_category }} {% endif %} -{% endif %} diff --git a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 index 6b46f5b48..6210b30fc 100644 --- a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 +++ b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 @@ -13,9 +13,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet nodeSelector: beta.kubernetes.io/os: linux -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} containers: - name: haproxy image: {{ haproxy_image_repo }}:{{ haproxy_image_tag }} diff --git a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 index beb3e9660..b4ea84c58 100644 --- a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 +++ b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 @@ -13,9 +13,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet nodeSelector: beta.kubernetes.io/os: linux -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} containers: - name: nginx-proxy image: {{ nginx_image_repo }}:{{ nginx_image_tag }} diff --git a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 index 55266c923..6f62f9536 100755 --- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 @@ -26,9 +26,7 @@ spec: prometheus.io/port: "9090" {% endif %} spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} serviceAccountName: cilium initContainers: - name: clean-cilium-state diff --git a/roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2 b/roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2 index 82f94d6ec..156c3d9a0 100644 --- a/roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2 @@ -16,9 +16,7 @@ spec: labels: k8s-app: contiv-api-proxy spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} # The API proxy must run in the host network namespace so that # it isn't governed by policy that would prevent it from working. hostNetwork: true diff --git a/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2 b/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2 index 3cd9cf399..a1354f425 100644 --- a/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2 @@ -15,9 +15,7 @@ spec: labels: k8s-app: contiv-cleanup spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true diff --git a/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2 b/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2 index b1754f838..6651ad9a5 100644 --- a/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2 @@ -15,9 +15,7 @@ spec: labels: k8s-app: contiv-etcd-proxy spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true diff --git a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 index 2a788c98e..0b49bbfa4 100644 --- a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 @@ -15,9 +15,7 @@ spec: labels: k8s-app: contiv-etcd spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true diff --git a/roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2 b/roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2 index 5e2ae26a2..e3d390789 100644 --- a/roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2 @@ -16,9 +16,7 @@ spec: labels: k8s-app: contiv-netmaster spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} # The netmaster must run in the host network namespace so that # it isn't governed by policy that would prevent it from working. hostNetwork: true diff --git a/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2 b/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2 index 449a6f9f3..a3cf6bc9e 100644 --- a/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2 @@ -20,9 +20,7 @@ spec: labels: k8s-app: contiv-netplugin spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true diff --git a/roles/network_plugin/contiv/templates/contiv-ovs.yml.j2 b/roles/network_plugin/contiv/templates/contiv-ovs.yml.j2 index c521e8fd5..4bb4be096 100644 --- a/roles/network_plugin/contiv/templates/contiv-ovs.yml.j2 +++ b/roles/network_plugin/contiv/templates/contiv-ovs.yml.j2 @@ -17,9 +17,7 @@ spec: labels: k8s-app: contiv-ovs spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet hostPID: true diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 index 11e498cca..c549e0804 100644 --- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 +++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 @@ -52,9 +52,7 @@ spec: tier: node k8s-app: flannel spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} serviceAccountName: flannel nodeSelector: beta.kubernetes.io/os: linux diff --git a/roles/network_plugin/kube-router/templates/kube-router.yml.j2 b/roles/network_plugin/kube-router/templates/kube-router.yml.j2 index a915281cb..cc8208824 100644 --- a/roles/network_plugin/kube-router/templates/kube-router.yml.j2 +++ b/roles/network_plugin/kube-router/templates/kube-router.yml.j2 @@ -61,9 +61,7 @@ spec: k8s-app: kube-router tier: node spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-cluster-critical -{% endif %} serviceAccountName: kube-router containers: - name: kube-router diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2 index 40e610497..33931fd48 100644 --- a/roles/network_plugin/weave/templates/weave-net.yml.j2 +++ b/roles/network_plugin/weave/templates/weave-net.yml.j2 @@ -115,9 +115,7 @@ items: labels: name: weave-net spec: -{% if kube_version is version('v1.11.1', '>=') %} priorityClassName: system-node-critical -{% endif %} containers: - name: weave command: