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
This commit is contained in:
parent
caf6874944
commit
799563eb61
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -x
|
set -x
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="calico-service-v3-3-x"
|
step="calico-service-v3-3-x"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
step="calico-service"
|
step="calico-service"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -x
|
set -x
|
||||||
|
@ -405,6 +403,7 @@ EOF
|
||||||
echo "export KUBECONFIG=${ADMIN_KUBECONFIG}" >> /etc/bashrc
|
echo "export KUBECONFIG=${ADMIN_KUBECONFIG}" >> /etc/bashrc
|
||||||
chown root:root ${ADMIN_KUBECONFIG}
|
chown root:root ${ADMIN_KUBECONFIG}
|
||||||
chmod 600 ${ADMIN_KUBECONFIG}
|
chmod 600 ${ADMIN_KUBECONFIG}
|
||||||
|
export KUBECONFIG=${ADMIN_KUBECONFIG}
|
||||||
|
|
||||||
# Add controller manager args
|
# Add controller manager args
|
||||||
KUBE_CONTROLLER_MANAGER_ARGS="--leader-elect=true"
|
KUBE_CONTROLLER_MANAGER_ARGS="--leader-elect=true"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -x
|
set -x
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="core-dns-service"
|
step="core-dns-service"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#cloud-boothook
|
#cloud-boothook
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
setenforce `[[ "$SELINUX_MODE" == "enforcing" ]] && echo 1 || echo 0`
|
setenforce `[[ "$SELINUX_MODE" == "enforcing" ]] && echo 1 || echo 0`
|
||||||
sed -i '
|
sed -i '
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-node-problem-detector"
|
step="enable-node-problem-detector"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-auto-scaling"
|
step="enable-auto-scaling"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-cert-api-manager"
|
step="enable-cert-api-manager"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-cinder-csi"
|
step="enable-cinder-csi"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
step="enable-helm-tiller"
|
step="enable-helm-tiller"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-ingress-controller"
|
step="enable-ingress-controller"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
step="enable-keystone-auth"
|
step="enable-keystone-auth"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="enable-prometheus-monitoring"
|
step="enable-prometheus-monitoring"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
|
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
|
ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
step="install-clients"
|
step="install-clients"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
echo "START: install cri"
|
echo "START: install cri"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
step="install-helm-modules"
|
step="install-helm-modules"
|
||||||
echo "START: ${step}"
|
echo "START: ${step}"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="kube-apiserver-to-kubelet-role"
|
step="kube-apiserver-to-kubelet-role"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
step="kube-dashboard-service"
|
step="kube-dashboard-service"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright 2014 The Kubernetes Authors All rights reserved.
|
# Copyright 2014 The Kubernetes Authors All rights reserved.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright 2014 The Kubernetes Authors All rights reserved.
|
# Copyright 2014 The Kubernetes Authors All rights reserved.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
set +u
|
set +u
|
||||||
HTTP_PROXY="$HTTP_PROXY"
|
HTTP_PROXY="$HTTP_PROXY"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
if [ "$VERIFY_CA" == "True" ]; then
|
if [ "$VERIFY_CA" == "True" ]; then
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "START: write-heat-params"
|
echo "START: write-heat-params"
|
||||||
|
|
||||||
arch=$(uname -m)
|
arch=$(uname -m)
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "START: write-heat-params"
|
echo "START: write-heat-params"
|
||||||
|
|
||||||
arch=$(uname -m)
|
arch=$(uname -m)
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -x
|
set -x
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -ex
|
set -ex
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -ex
|
set -ex
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -ex
|
set -ex
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
set -ex
|
set -ex
|
||||||
|
|
|
@ -1271,6 +1271,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
|
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
|
||||||
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
|
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
|
||||||
- if:
|
- if:
|
||||||
|
|
|
@ -706,6 +706,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- str_replace:
|
- str_replace:
|
||||||
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
|
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
|
||||||
params:
|
params:
|
||||||
|
@ -995,7 +996,11 @@ resources:
|
||||||
- name: ostree_remote_input
|
- name: ostree_remote_input
|
||||||
- name: ostree_commit_input
|
- name: ostree_commit_input
|
||||||
config:
|
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:
|
upgrade_kubernetes_deployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
|
|
@ -400,6 +400,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- str_replace:
|
- str_replace:
|
||||||
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
|
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
|
||||||
params:
|
params:
|
||||||
|
@ -582,7 +583,11 @@ resources:
|
||||||
- name: ostree_remote_input
|
- name: ostree_remote_input
|
||||||
- name: ostree_commit_input
|
- name: ostree_commit_input
|
||||||
config:
|
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:
|
upgrade_kubernetes_deployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
|
|
@ -1307,6 +1307,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
|
- get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh
|
||||||
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
|
- get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh
|
||||||
- if:
|
- if:
|
||||||
|
|
|
@ -717,6 +717,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- str_replace:
|
- str_replace:
|
||||||
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
|
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh}
|
||||||
params:
|
params:
|
||||||
|
@ -1006,7 +1007,11 @@ resources:
|
||||||
- name: ostree_remote_input
|
- name: ostree_remote_input
|
||||||
- name: ostree_commit_input
|
- name: ostree_commit_input
|
||||||
config:
|
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:
|
upgrade_kubernetes_deployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
|
|
@ -402,6 +402,7 @@ resources:
|
||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
-
|
-
|
||||||
|
- "#!/bin/bash"
|
||||||
- str_replace:
|
- str_replace:
|
||||||
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
|
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh}
|
||||||
params:
|
params:
|
||||||
|
@ -582,7 +583,11 @@ resources:
|
||||||
- name: ostree_remote_input
|
- name: ostree_remote_input
|
||||||
- name: ostree_commit_input
|
- name: ostree_commit_input
|
||||||
config:
|
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:
|
upgrade_kubernetes_deployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
|
Loading…
Reference in New Issue