Browse Source

Remove shebang from scripts

Without this, heat container agents using  kubectl version
1.18.x (e.g. ussuri-dev) fail because they do not have the correct
KUBECONFIG in the environment.

Task: 39938
Story: 2007591

Change-Id: Ifc212478ae09c658adeb6ba4c8e8afc8943e3977
changes/24/732524/8
Bharat Kunwar 2 years ago
parent
commit
799563eb61
  1. 2
      magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh
  2. 2
      magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh
  3. 1
      magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh
  4. 2
      magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh
  5. 3
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
  6. 2
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
  7. 2
      magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh
  8. 1
      magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh
  9. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh
  10. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh
  11. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh
  12. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
  13. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh
  14. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh
  15. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh
  16. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
  17. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
  18. 2
      magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh
  19. 2
      magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh
  20. 1
      magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh
  21. 2
      magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
  22. 2
      magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh
  23. 2
      magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
  24. 2
      magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh
  25. 2
      magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh
  26. 2
      magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh
  27. 2
      magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh
  28. 2
      magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh
  29. 2
      magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh
  30. 2
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh
  31. 2
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh
  32. 2
      magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
  33. 2
      magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
  34. 2
      magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
  35. 2
      magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
  36. 2
      magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
  37. 1
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  38. 7
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  39. 7
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
  40. 1
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
  41. 7
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
  42. 7
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml

2
magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh

@ -1,5 +1,3 @@
#!/bin/sh
set +x
. /etc/sysconfig/heat-params
set -x

2
magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="calico-service-v3-3-x"
printf "Starting to run ${step}\n"

1
magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh

@ -1,4 +1,3 @@
#!/bin/sh
step="calico-service"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh

@ -1,5 +1,3 @@
#!/bin/sh
. /etc/sysconfig/heat-params
set -x

3
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -x
@ -405,6 +403,7 @@ EOF
echo "export KUBECONFIG=${ADMIN_KUBECONFIG}" >> /etc/bashrc
chown root:root ${ADMIN_KUBECONFIG}
chmod 600 ${ADMIN_KUBECONFIG}
export KUBECONFIG=${ADMIN_KUBECONFIG}
# Add controller manager args
KUBE_CONTROLLER_MANAGER_ARGS="--leader-elect=true"

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -x

2
magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="core-dns-service"
printf "Starting to run ${step}\n"

1
magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh

@ -1,5 +1,4 @@
#cloud-boothook
#!/bin/sh
setenforce `[[ "$SELINUX_MODE" == "enforcing" ]] && echo 1 || echo 0`
sed -i '

2
magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-node-problem-detector"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-auto-scaling"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-cert-api-manager"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-cinder-csi"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh

@ -1,5 +1,3 @@
#!/bin/bash
. /etc/sysconfig/heat-params
step="enable-helm-tiller"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-ingress-controller"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh

@ -1,5 +1,3 @@
#!/bin/sh
. /etc/sysconfig/heat-params
step="enable-keystone-auth"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="enable-prometheus-monitoring"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh

@ -1,5 +1,3 @@
#!/bin/sh
. /etc/sysconfig/heat-params
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"

2
magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh

@ -1,5 +1,3 @@
#!/bin/sh
set -x
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"

2
magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh

@ -1,5 +1,3 @@
#!/bin/bash
set -e
set +x
. /etc/sysconfig/heat-params

1
magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh

@ -1,4 +1,3 @@
#!/bin/bash
step="install-clients"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
echo "START: install cri"

2
magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh

@ -1,5 +1,3 @@
#!/bin/bash
step="install-helm-modules"
echo "START: ${step}"

2
magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="kube-apiserver-to-kubelet-role"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh

@ -1,5 +1,3 @@
#!/bin/sh
step="kube-dashboard-service"
printf "Starting to run ${step}\n"

2
magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh

@ -1,5 +1,3 @@
#!/bin/sh
# Copyright 2014 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");

2
magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh

@ -1,5 +1,3 @@
#!/bin/sh
# Copyright 2014 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");

2
magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh

@ -1,5 +1,3 @@
#!/bin/bash
set -x
set +u
HTTP_PROXY="$HTTP_PROXY"

2
magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh

@ -1,5 +1,3 @@
#!/bin/bash
. /etc/sysconfig/heat-params
set -x

2
magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh

@ -1,5 +1,3 @@
#!/bin/sh
. /etc/sysconfig/heat-params
if [ "$VERIFY_CA" == "True" ]; then

2
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh

@ -1,5 +1,3 @@
#!/bin/sh
echo "START: write-heat-params"
arch=$(uname -m)

2
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh

@ -1,5 +1,3 @@
#!/bin/sh
echo "START: write-heat-params"
arch=$(uname -m)

2
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh

@ -1,5 +1,3 @@
#!/bin/sh
set +x
. /etc/sysconfig/heat-params
set -x

2
magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -ex

2
magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -ex

2
magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -ex

2
magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh

@ -1,5 +1,3 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -ex

1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@ -1271,6 +1271,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
- if:

7
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml

@ -706,6 +706,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
params:
@ -995,7 +996,11 @@ resources:
- name: ostree_remote_input
- name: ostree_commit_input
config:
get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
upgrade_kubernetes_deployment:
type: OS::Heat::SoftwareDeployment

7
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

@ -400,6 +400,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
params:
@ -582,7 +583,11 @@ resources:
- name: ostree_remote_input
- name: ostree_commit_input
config:
get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
upgrade_kubernetes_deployment:
type: OS::Heat::SoftwareDeployment

1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

@ -1307,6 +1307,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
- if:

7
magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml

@ -717,6 +717,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
params:
@ -1006,7 +1007,11 @@ resources:
- name: ostree_remote_input
- name: ostree_commit_input
config:
get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
upgrade_kubernetes_deployment:
type: OS::Heat::SoftwareDeployment

7
magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml

@ -402,6 +402,7 @@ resources:
list_join:
- "\n"
-
- "#!/bin/bash"
- str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
params:
@ -582,7 +583,11 @@ resources:
- name: ostree_remote_input
- name: ostree_commit_input
config:
get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
list_join:
- "\n"
-
- "#!/bin/bash"
- get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh
upgrade_kubernetes_deployment:
type: OS::Heat::SoftwareDeployment

Loading…
Cancel
Save