mirror of https://github.com/easzlab/kubeasz.git
update cilium v1.13.2
parent
c09656b0c5
commit
975921e89f
22
ezdown
22
ezdown
|
@ -31,7 +31,7 @@ metricsVer=v0.5.2
|
||||||
pauseVer=3.9
|
pauseVer=3.9
|
||||||
|
|
||||||
# images not downloaded by default(only download with '-X')
|
# images not downloaded by default(only download with '-X')
|
||||||
ciliumVer=1.12.4
|
ciliumVer=1.13.2
|
||||||
flannelVer=v0.19.2
|
flannelVer=v0.19.2
|
||||||
nfsProvisionerVer=v4.0.2
|
nfsProvisionerVer=v4.0.2
|
||||||
promChartVer=39.11.0
|
promChartVer=39.11.0
|
||||||
|
@ -416,15 +416,15 @@ function get_extra_images() {
|
||||||
docker pull "cilium/cilium:v$ciliumVer" && \
|
docker pull "cilium/cilium:v$ciliumVer" && \
|
||||||
docker pull "cilium/operator-generic:v$ciliumVer" && \
|
docker pull "cilium/operator-generic:v$ciliumVer" && \
|
||||||
docker pull "cilium/hubble-relay:v$ciliumVer" && \
|
docker pull "cilium/hubble-relay:v$ciliumVer" && \
|
||||||
docker pull cilium/hubble-ui-backend:v0.9.2 && \
|
docker pull cilium/hubble-ui-backend:v0.11.0 && \
|
||||||
docker pull cilium/hubble-ui:v0.9.2 && \
|
docker pull cilium/hubble-ui:v0.11.0 && \
|
||||||
docker pull easzlab/json-mock:v1.3.0 && \
|
docker pull easzlab/json-mock:v1.3.0 && \
|
||||||
docker pull easzlab/alpine-curl:v7.85.0 && \
|
docker pull easzlab/alpine-curl:v7.85.0 && \
|
||||||
docker save -o "$imageDir/cilium_$ciliumVer.tar" "cilium/cilium:v$ciliumVer" \
|
docker save -o "$imageDir/cilium_$ciliumVer.tar" "cilium/cilium:v$ciliumVer" \
|
||||||
"cilium/operator-generic:v$ciliumVer" \
|
"cilium/operator-generic:v$ciliumVer" \
|
||||||
"cilium/hubble-relay:v$ciliumVer" \
|
"cilium/hubble-relay:v$ciliumVer" \
|
||||||
cilium/hubble-ui-backend:v0.9.2 \
|
cilium/hubble-ui-backend:v0.11.0 \
|
||||||
cilium/hubble-ui:v0.9.2 \
|
cilium/hubble-ui:v0.11.0 \
|
||||||
easzlab/json-mock:v1.3.0 \
|
easzlab/json-mock:v1.3.0 \
|
||||||
easzlab/alpine-curl:v7.85.0
|
easzlab/alpine-curl:v7.85.0
|
||||||
else
|
else
|
||||||
|
@ -436,10 +436,10 @@ function get_extra_images() {
|
||||||
docker push "easzlab.io.local:5000/cilium/operator-generic:v$ciliumVer"
|
docker push "easzlab.io.local:5000/cilium/operator-generic:v$ciliumVer"
|
||||||
docker tag "cilium/hubble-relay:v$ciliumVer" "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
|
docker tag "cilium/hubble-relay:v$ciliumVer" "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
|
||||||
docker push "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
|
docker push "easzlab.io.local:5000/cilium/hubble-relay:v$ciliumVer"
|
||||||
docker tag cilium/hubble-ui-backend:v0.9.2 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.2
|
docker tag cilium/hubble-ui-backend:v0.11.0 easzlab.io.local:5000/cilium/hubble-ui-backend:v0.11.0
|
||||||
docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.9.2
|
docker push easzlab.io.local:5000/cilium/hubble-ui-backend:v0.11.0
|
||||||
docker tag cilium/hubble-ui:v0.9.2 easzlab.io.local:5000/cilium/hubble-ui:v0.9.2
|
docker tag cilium/hubble-ui:v0.11.0 easzlab.io.local:5000/cilium/hubble-ui:v0.11.0
|
||||||
docker push easzlab.io.local:5000/cilium/hubble-ui:v0.9.2
|
docker push easzlab.io.local:5000/cilium/hubble-ui:v0.11.0
|
||||||
docker tag easzlab/json-mock:v1.3.0 easzlab.io.local:5000/cilium/json-mock:v1.3.0
|
docker tag easzlab/json-mock:v1.3.0 easzlab.io.local:5000/cilium/json-mock:v1.3.0
|
||||||
docker push easzlab.io.local:5000/cilium/json-mock:v1.3.0
|
docker push easzlab.io.local:5000/cilium/json-mock:v1.3.0
|
||||||
docker tag easzlab/alpine-curl:v7.85.0 easzlab.io.local:5000/easzlab/alpine-curl:v7.85.0
|
docker tag easzlab/alpine-curl:v7.85.0 easzlab.io.local:5000/easzlab/alpine-curl:v7.85.0
|
||||||
|
@ -531,7 +531,7 @@ function start_kubeasz_docker() {
|
||||||
|
|
||||||
[[ -d "$BASE/roles/kube-node" ]] || { logger error "not initialized. try 'ezdown -D' first."; exit 1; }
|
[[ -d "$BASE/roles/kube-node" ]] || { logger error "not initialized. try 'ezdown -D' first."; exit 1; }
|
||||||
docker ps -a --format="{{ .Names }}"|grep kubeasz > /dev/null 2>&1 && \
|
docker ps -a --format="{{ .Names }}"|grep kubeasz > /dev/null 2>&1 && \
|
||||||
{ logger warn "kubeasz container is already existed"; return 0; }
|
docker rm -f kubeasz > /dev/null
|
||||||
|
|
||||||
logger info "try to run kubeasz in a container"
|
logger info "try to run kubeasz in a container"
|
||||||
# get host's IP
|
# get host's IP
|
||||||
|
@ -563,7 +563,7 @@ function start_kubeasz_docker() {
|
||||||
--volume /root/.kube:/root/.kube \
|
--volume /root/.kube:/root/.kube \
|
||||||
--volume /root/.ssh:/root/.ssh \
|
--volume /root/.ssh:/root/.ssh \
|
||||||
--volume /etc/docker:/etc/docker \
|
--volume /etc/docker:/etc/docker \
|
||||||
easzlab/kubeasz:${KUBEASZ_VER} sleep 36000
|
easzlab/kubeasz:${KUBEASZ_VER}
|
||||||
}
|
}
|
||||||
|
|
||||||
function clean_container() {
|
function clean_container() {
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -17,9 +17,6 @@ resources:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 512Mi
|
memory: 512Mi
|
||||||
|
|
||||||
cni:
|
|
||||||
binPath: /opt/cni/bin
|
|
||||||
|
|
||||||
containerRuntime:
|
containerRuntime:
|
||||||
integration: containerd
|
integration: containerd
|
||||||
socketPath: unix:///run/containerd/containerd.sock
|
socketPath: unix:///run/containerd/containerd.sock
|
||||||
|
@ -42,11 +39,11 @@ hubble:
|
||||||
backend:
|
backend:
|
||||||
image:
|
image:
|
||||||
repository: "easzlab.io.local:5000/cilium/hubble-ui-backend"
|
repository: "easzlab.io.local:5000/cilium/hubble-ui-backend"
|
||||||
tag: "v0.9.2"
|
tag: "v0.11.0"
|
||||||
frontend:
|
frontend:
|
||||||
image:
|
image:
|
||||||
repository: "easzlab.io.local:5000/cilium/hubble-ui"
|
repository: "easzlab.io.local:5000/cilium/hubble-ui"
|
||||||
tag: "v0.9.2"
|
tag: "v0.11.0"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
identityAllocationMode: "crd"
|
identityAllocationMode: "crd"
|
||||||
|
@ -58,6 +55,7 @@ ipam:
|
||||||
clusterPoolIPv4PodCIDRList: ["{{ CLUSTER_CIDR }}"]
|
clusterPoolIPv4PodCIDRList: ["{{ CLUSTER_CIDR }}"]
|
||||||
clusterPoolIPv4MaskSize: 24
|
clusterPoolIPv4MaskSize: 24
|
||||||
|
|
||||||
|
# -- Enable Layer 7 network policy.
|
||||||
l7Proxy: true
|
l7Proxy: true
|
||||||
|
|
||||||
# -- Configure Istio proxy options.
|
# -- Configure Istio proxy options.
|
||||||
|
|
Loading…
Reference in New Issue