ソースを参照

Merge "k8s: stop introspecting instance name" into stable/rocky

tags/7.2.0
Zuul Gerrit Code Review 4ヶ月前
コミット
d6440704bc
10個のファイルの変更13行の追加20行の削除
  1. +3
    -5
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
  2. +3
    -6
      magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
  3. +1
    -2
      magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh
  4. +0
    -1
      magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh
  5. +1
    -0
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml
  6. +1
    -0
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml
  7. +1
    -3
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
  8. +1
    -3
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
  9. +1
    -0
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  10. +1
    -0
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

+ 3
- 5
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh ファイルの表示

@@ -157,8 +157,7 @@ sed -i '
sed -i '/^KUBE_SCHEDULER_ARGS=/ s/=.*/="--leader-elect=true"/' /etc/kubernetes/scheduler

mkdir -p /etc/kubernetes/manifests
HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')
KUBELET_ARGS="--register-node=true --pod-manifest-path=/etc/kubernetes/manifests --cadvisor-port=0 --hostname-override=${HOSTNAME_OVERRIDE}"
KUBELET_ARGS="--register-node=true --pod-manifest-path=/etc/kubernetes/manifests --cadvisor-port=0 --hostname-override=${INSTANCE_NAME}"
KUBELET_ARGS="${KUBELET_ARGS} --pod-infra-container-image=${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}pause:3.0"
KUBELET_ARGS="${KUBELET_ARGS} --cluster_dns=${DNS_SERVICE_IP} --cluster_domain=${DNS_CLUSTER_DOMAIN}"
KUBELET_ARGS="${KUBELET_ARGS} --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
@@ -182,7 +181,6 @@ KUBELET_ARGS="${KUBELET_ARGS} --register-with-taints=CriticalAddonsOnly=True:NoS
KUBELET_ARGS="${KUBELET_ARGS} --node-labels=node-role.kubernetes.io/master=\"\""

KUBELET_KUBECONFIG=/etc/kubernetes/kubelet-config.yaml
HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')
cat << EOF >> ${KUBELET_KUBECONFIG}
apiVersion: v1
clusters:
@@ -193,13 +191,13 @@ clusters:
contexts:
- context:
cluster: kubernetes
user: system:node:${HOSTNAME_OVERRIDE}
user: system:node:${INSTANCE_NAME}
name: default
current-context: default
kind: Config
preferences: {}
users:
- name: system:node:${HOSTNAME_OVERRIDE}
- name: system:node:${INSTANCE_NAME}
user:
as-user-extra: {}
client-certificate: ${CERT_DIR}/server.crt


+ 3
- 6
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh ファイルの表示

@@ -57,7 +57,6 @@ KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT"
if [ -z "${KUBE_NODE_IP}" ]; then
KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
fi
HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')
cat << EOF >> ${KUBELET_KUBECONFIG}
apiVersion: v1
clusters:
@@ -68,13 +67,13 @@ clusters:
contexts:
- context:
cluster: kubernetes
user: system:node:${HOSTNAME_OVERRIDE}
user: system:node:${INSTANCE_NAME}
name: default
current-context: default
kind: Config
preferences: {}
users:
- name: system:node:${HOSTNAME_OVERRIDE}
- name: system:node:${INSTANCE_NAME}
user:
as-user-extra: {}
client-certificate: ${CERT_DIR}/kubelet.crt
@@ -126,7 +125,7 @@ sed -i '
# the option --hostname-override for kubelet uses the hostname to register the node.
# Using any other name will break the load balancer and cinder volume features.
mkdir -p /etc/kubernetes/manifests
KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests --cadvisor-port=0 --kubeconfig ${KUBELET_KUBECONFIG} --hostname-override=${HOSTNAME_OVERRIDE}"
KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests --cadvisor-port=0 --kubeconfig ${KUBELET_KUBECONFIG} --hostname-override=${INSTANCE_NAME}"
KUBELET_ARGS="${KUBELET_ARGS} --address=${KUBE_NODE_IP} --port=10250 --read-only-port=0 --anonymous-auth=false --authorization-mode=Webhook --authentication-token-webhook=true"
KUBELET_ARGS="${KUBELET_ARGS} --cluster_dns=${DNS_SERVICE_IP} --cluster_domain=${DNS_CLUSTER_DOMAIN}"
KUBELET_ARGS="${KUBELET_ARGS} --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
@@ -234,5 +233,3 @@ fi
cat >> /etc/environment <<EOF
KUBERNETES_MASTER=$KUBE_MASTER_URI
EOF

hostname `hostname | sed 's/.novalocal//'`

+ 1
- 2
magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh ファイルの表示

@@ -96,8 +96,7 @@ EOF
}

#Kubelet Certs
INSTANCE_NAME=$(hostname --short | sed 's/\.novalocal//')
HOSTNAME=$(hostname)
HOSTNAME=$(cat /etc/hostname | head -1)

cat > ${cert_dir}/kubelet.conf <<EOF
[req]


+ 0
- 1
magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh ファイルの表示

@@ -147,7 +147,6 @@ extendedKeyUsage = clientAuth,serverAuth
EOF

#Kubelet Certs
INSTANCE_NAME=$(hostname --short | sed 's/\.novalocal//')
cat > ${cert_dir}/kubelet.conf <<EOF
[req]
distinguished_name = req_distinguished_name


+ 1
- 0
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml ファイルの表示

@@ -5,6 +5,7 @@ write_files:
owner: "root:root"
permissions: "0600"
content: |
INSTANCE_NAME="$INSTANCE_NAME"
PROMETHEUS_MONITORING="$PROMETHEUS_MONITORING"
KUBE_API_PUBLIC_ADDRESS="$KUBE_API_PUBLIC_ADDRESS"
KUBE_API_PRIVATE_ADDRESS="$KUBE_API_PRIVATE_ADDRESS"


+ 1
- 0
magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml ファイルの表示

@@ -5,6 +5,7 @@ write_files:
owner: "root:root"
permissions: "0600"
content: |
INSTANCE_NAME="$INSTANCE_NAME"
PROMETHEUS_MONITORING="$PROMETHEUS_MONITORING"
KUBE_ALLOW_PRIV="$KUBE_ALLOW_PRIV"
KUBE_MASTER_IP="$KUBE_MASTER_IP"


+ 1
- 3
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml ファイルの表示

@@ -31,8 +31,6 @@ write_files:
INSECURE_REGISTRY_ARGS=""
fi

HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')

uuid_file="/var/run/kubelet-pod.uuid"
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
@@ -59,7 +57,7 @@ write_files:
--kubeconfig=/etc/kubernetes/master-kubeconfig.yaml \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--network-plugin=cni \
--hostname-override=${HOSTNAME_OVERRIDE} \
--hostname-override=${INSTANCE_NAME} \
--container-runtime=${CONTAINER_RUNTIME} \
--register-with-taints=node.alpha.kubernetes.io/role=master:NoSchedule \
--allow-privileged=true \


+ 1
- 3
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml ファイルの表示

@@ -43,8 +43,6 @@ write_files:
fi
KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT"

HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')

uuid_file="/var/run/kubelet-pod.uuid"
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
@@ -70,7 +68,7 @@ write_files:
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--cni-conf-dir=/etc/kubernetes/cni/net.d \
--network-plugin=cni \
--hostname-override=${HOSTNAME_OVERRIDE} \
--hostname-override=${INSTANCE_NAME} \
--container-runtime=${CONTAINER_RUNTIME} \
--allow-privileged=true \
--pod-manifest-path=/etc/kubernetes/manifests \


+ 1
- 0
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml ファイルの表示

@@ -447,6 +447,7 @@ resources:
str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.yaml}
params:
"$INSTANCE_NAME": {get_param: name}
"$PROMETHEUS_MONITORING": {get_param: prometheus_monitoring}
"$KUBE_API_PUBLIC_ADDRESS": {get_attr: [api_address_switch, public_ip]}
"$KUBE_API_PRIVATE_ADDRESS": {get_attr: [api_address_switch, private_ip]}


+ 1
- 0
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml ファイルの表示

@@ -306,6 +306,7 @@ resources:
str_replace:
template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.yaml}
params:
$INSTANCE_NAME: {get_param: name}
$PROMETHEUS_MONITORING: {get_param: prometheus_monitoring}
$KUBE_ALLOW_PRIV: {get_param: kube_allow_priv}
$KUBE_MASTER_IP: {get_param: kube_master_ip}


読み込み中…
キャンセル
保存