Browse Source

Merge "Remove shebang from scripts"

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

+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

set +x
. /etc/sysconfig/heat-params
set -x


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

@@ -1,5 +1,3 @@
#!/bin/sh

step="calico-service-v3-3-x"
printf "Starting to run ${step}\n"



+ 0
- 1
magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh View File

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



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

. /etc/sysconfig/heat-params

set -x


+ 1
- 2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh View File

@@ -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"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x
. /etc/sysconfig/heat-params
set -x


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="core-dns-service"
printf "Starting to run ${step}\n"



+ 0
- 1
magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh View File

@@ -1,5 +1,4 @@
#cloud-boothook
#!/bin/sh

setenforce `[[ "$SELINUX_MODE" == "enforcing" ]] && echo 1 || echo 0`
sed -i '


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-node-problem-detector"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-auto-scaling"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-cert-api-manager"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-cinder-csi"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

. /etc/sysconfig/heat-params

step="enable-helm-tiller"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-ingress-controller"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

. /etc/sysconfig/heat-params

step="enable-keystone-auth"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="enable-prometheus-monitoring"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

. /etc/sysconfig/heat-params

ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

set -x

ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set -e
set +x
. /etc/sysconfig/heat-params


+ 0
- 1
magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh View File

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



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x

echo "START: install cri"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

step="install-helm-modules"
echo "START: ${step}"



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

@@ -1,5 +1,3 @@
#!/bin/sh

step="kube-apiserver-to-kubelet-role"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

step="kube-dashboard-service"
printf "Starting to run ${step}\n"



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

# Copyright 2014 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

# Copyright 2014 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set -x
set +u
HTTP_PROXY="$HTTP_PROXY"


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

. /etc/sysconfig/heat-params
set -x



+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

. /etc/sysconfig/heat-params

if [ "$VERIFY_CA" == "True" ]; then


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

echo "START: write-heat-params"

arch=$(uname -m)


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

echo "START: write-heat-params"

arch=$(uname -m)


+ 0
- 2
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh View File

@@ -1,5 +1,3 @@
#!/bin/sh

set +x
. /etc/sysconfig/heat-params
set -x


+ 0
- 2
magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x
. /etc/sysconfig/heat-params
set -ex


+ 0
- 2
magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x
. /etc/sysconfig/heat-params
set -ex


+ 0
- 2
magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x
. /etc/sysconfig/heat-params
set -ex


+ 0
- 2
magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh View File

@@ -1,5 +1,3 @@
#!/bin/bash

set +x
. /etc/sysconfig/heat-params
set -ex


+ 1
- 0
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

@@ -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:


+ 6
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml View File

@@ -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


+ 6
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml View File

@@ -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
- 0
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml View File

@@ -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:


+ 6
- 1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml View File

@@ -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


+ 6
- 1
magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml View File

@@ -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