Merge "Add an ARCH parameter to handle arch specific things"
This commit is contained in:
commit
0ae0135a7d
|
@ -270,7 +270,7 @@ spec:
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
containers:
|
containers:
|
||||||
- name: autoscaler
|
- name: autoscaler
|
||||||
image: ${_autoscaler_prefix}cluster-proportional-autoscaler-amd64:1.1.2
|
image: ${_autoscaler_prefix}cluster-proportional-autoscaler-${ARCH}:1.1.2
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "20m"
|
cpu: "20m"
|
||||||
|
|
|
@ -159,7 +159,7 @@ data:
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: kube-flannel-ds-amd64
|
name: kube-flannel-ds-${ARCH}
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
labels:
|
labels:
|
||||||
tier: node
|
tier: node
|
||||||
|
@ -182,7 +182,7 @@ spec:
|
||||||
type: "spc_t"
|
type: "spc_t"
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/arch: amd64
|
beta.kubernetes.io/arch: ${ARCH}
|
||||||
tolerations:
|
tolerations:
|
||||||
- operator: Exists
|
- operator: Exists
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
|
|
|
@ -12,8 +12,8 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$(echo $KUBE_DASHBOARD_ENABLED | tr '[:upper:]' '[:lower:]')" == "true" ]; then
|
if [ "$(echo $KUBE_DASHBOARD_ENABLED | tr '[:upper:]' '[:lower:]')" == "true" ]; then
|
||||||
KUBE_DASH_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}kubernetes-dashboard-amd64:${KUBE_DASHBOARD_VERSION}"
|
KUBE_DASH_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}kubernetes-dashboard-${ARCH}:${KUBE_DASHBOARD_VERSION}"
|
||||||
HEAPSTER_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-amd64:v1.4.2"
|
HEAPSTER_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-${ARCH}:v1.4.2"
|
||||||
|
|
||||||
KUBE_DASH_DEPLOY=/srv/magnum/kubernetes/kubernetes-dashboard.yaml
|
KUBE_DASH_DEPLOY=/srv/magnum/kubernetes/kubernetes-dashboard.yaml
|
||||||
|
|
||||||
|
@ -209,8 +209,8 @@ EOF
|
||||||
# Deploy INFLUX AND GRAFANA
|
# Deploy INFLUX AND GRAFANA
|
||||||
if [ "$(echo $INFLUX_GRAFANA_DASHBOARD_ENABLED | tr '[:upper:]' '[:lower:]')" == "true" ]; then
|
if [ "$(echo $INFLUX_GRAFANA_DASHBOARD_ENABLED | tr '[:upper:]' '[:lower:]')" == "true" ]; then
|
||||||
INFLUX_SINK=" - --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086"
|
INFLUX_SINK=" - --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086"
|
||||||
INFLUX_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-influxdb-amd64:v1.3.3"
|
INFLUX_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-influxdb-${ARCH}:v1.3.3"
|
||||||
GRAFANA_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-grafana-amd64:v4.4.3"
|
GRAFANA_IMAGE="${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}heapster-grafana-${ARCH}:v4.4.3"
|
||||||
|
|
||||||
INFLUX_DEPLOY=/srv/magnum/kubernetes/influxdb.yaml
|
INFLUX_DEPLOY=/srv/magnum/kubernetes/influxdb.yaml
|
||||||
GRAFANA_DEPLOY=/srv/magnum/kubernetes/grafana.yaml
|
GRAFANA_DEPLOY=/srv/magnum/kubernetes/grafana.yaml
|
||||||
|
|
|
@ -2,11 +2,26 @@
|
||||||
|
|
||||||
echo "START: write-heat-params"
|
echo "START: write-heat-params"
|
||||||
|
|
||||||
|
arch=$(uname -m)
|
||||||
|
|
||||||
|
case "$arch" in
|
||||||
|
aarch64)
|
||||||
|
ARCH=arm64
|
||||||
|
;;
|
||||||
|
x86_64)
|
||||||
|
ARCH=amd64
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ARCH=$arch
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
HEAT_PARAMS=/etc/sysconfig/heat-params
|
HEAT_PARAMS=/etc/sysconfig/heat-params
|
||||||
[ -f ${HEAT_PARAMS} ] || {
|
[ -f ${HEAT_PARAMS} ] || {
|
||||||
echo "Writing File: $HEAT_PARAMS"
|
echo "Writing File: $HEAT_PARAMS"
|
||||||
mkdir -p "$(dirname ${HEAT_PARAMS})"
|
mkdir -p "$(dirname ${HEAT_PARAMS})"
|
||||||
cat > ${HEAT_PARAMS} <<EOF
|
cat > ${HEAT_PARAMS} <<EOF
|
||||||
|
ARCH="$ARCH"
|
||||||
INSTANCE_NAME="$INSTANCE_NAME"
|
INSTANCE_NAME="$INSTANCE_NAME"
|
||||||
HEAPSTER_ENABLED="$HEAPSTER_ENABLED"
|
HEAPSTER_ENABLED="$HEAPSTER_ENABLED"
|
||||||
METRICS_SERVER_ENABLED="$METRICS_SERVER_ENABLED"
|
METRICS_SERVER_ENABLED="$METRICS_SERVER_ENABLED"
|
||||||
|
|
|
@ -2,11 +2,26 @@
|
||||||
|
|
||||||
echo "START: write-heat-params"
|
echo "START: write-heat-params"
|
||||||
|
|
||||||
|
arch=$(uname -m)
|
||||||
|
|
||||||
|
case "$arch" in
|
||||||
|
aarch64)
|
||||||
|
ARCH=arm64
|
||||||
|
;;
|
||||||
|
x86_64)
|
||||||
|
ARCH=amd64
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ARCH=$arch
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
HEAT_PARAMS=/etc/sysconfig/heat-params
|
HEAT_PARAMS=/etc/sysconfig/heat-params
|
||||||
[ -f ${HEAT_PARAMS} ] || {
|
[ -f ${HEAT_PARAMS} ] || {
|
||||||
echo "Writing File: $HEAT_PARAMS"
|
echo "Writing File: $HEAT_PARAMS"
|
||||||
mkdir -p "$(dirname ${HEAT_PARAMS})"
|
mkdir -p "$(dirname ${HEAT_PARAMS})"
|
||||||
cat > ${HEAT_PARAMS} <<EOF
|
cat > ${HEAT_PARAMS} <<EOF
|
||||||
|
ARCH="$ARCH"
|
||||||
INSTANCE_NAME="$INSTANCE_NAME"
|
INSTANCE_NAME="$INSTANCE_NAME"
|
||||||
HEAPSTER_ENABLED="$HEAPSTER_ENABLED"
|
HEAPSTER_ENABLED="$HEAPSTER_ENABLED"
|
||||||
METRICS_SERVER_ENABLED="$METRICS_SERVER_ENABLED"
|
METRICS_SERVER_ENABLED="$METRICS_SERVER_ENABLED"
|
||||||
|
|
|
@ -50,7 +50,7 @@ data:
|
||||||
|
|
||||||
install-${CHART_NAME}-values.yaml: |
|
install-${CHART_NAME}-values.yaml: |
|
||||||
image:
|
image:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}metrics-server-amd64
|
repository: ${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}metrics-server-${ARCH}
|
||||||
args:
|
args:
|
||||||
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
|
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
|
||||||
---
|
---
|
||||||
|
|
|
@ -52,7 +52,7 @@ data:
|
||||||
|
|
||||||
install-${CHART_NAME}-values.yaml: |
|
install-${CHART_NAME}-values.yaml: |
|
||||||
image:
|
image:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-docker.io/directxman12/}k8s-prometheus-adapter-amd64
|
repository: ${CONTAINER_INFRA_PREFIX:-docker.io/directxman12/}k8s-prometheus-adapter-${ARCH}
|
||||||
|
|
||||||
priorityClassName: "system-cluster-critical"
|
priorityClassName: "system-cluster-critical"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue