From ad86723544e39302c951dab0e8004ec5c646e67a Mon Sep 17 00:00:00 2001 From: Joe Zheng Date: Tue, 27 Dec 2022 01:19:41 +0000 Subject: [PATCH 1/3] hotfix for PRC network environment --- inventory/default/group_vars/all/10-default.yml | 2 +- .../infrastructure/install_golang/defaults/main.yml | 2 +- .../infrastructure/install_golang/tasks/install.yml | 3 +++ .../infrastructure/install_packages/tasks/main.yml | 3 +++ roles/infrastructure/docker/defaults/main.yml | 4 ++-- roles/kubernetes/cert_manager/defaults/main.yml | 2 +- roles/kubernetes/controlplane/templates/config.yaml.j2 | 1 + roles/kubernetes/install/vars/debian.yml | 4 ++-- roles/kubernetes/nfd/defaults/main.yml | 4 ++-- roles/telemetry/cadvisor/templates/values.yaml.j2 | 2 +- 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/inventory/default/group_vars/all/10-default.yml b/inventory/default/group_vars/all/10-default.yml index a639333..34d7baf 100644 --- a/inventory/default/group_vars/all/10-default.yml +++ b/inventory/default/group_vars/all/10-default.yml @@ -281,7 +281,7 @@ telemetry_statsd_exporter_tcp_port: 8125 telemetry_cadvisor_enable: true # Telegraf -telemetry_telegraf_enable: true +telemetry_telegraf_enable: false telemetry_telegraf_port: 9105 ############### diff --git a/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml b/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml index b1bdd3a..a9255e8 100644 --- a/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml +++ b/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml @@ -3,7 +3,7 @@ --- golang_version: 1.16 golang_download_name: "go{{ golang_version }}.linux-amd64.tar.gz" -golang_download_url_base: "https://dl.google.com/go/" +golang_download_url_base: "https://golang.google.cn/dl/" golang_download_url: "{{ golang_download_url_base }}{{ golang_download_name }}" golang_download_dest: "{{ project_dir }}/golang/{{ golang_download_name }}" golang_download_checksum: "sha256:013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2" diff --git a/roles/baseline_ansible/infrastructure/install_golang/tasks/install.yml b/roles/baseline_ansible/infrastructure/install_golang/tasks/install.yml index a90afbd..a141eb6 100644 --- a/roles/baseline_ansible/infrastructure/install_golang/tasks/install.yml +++ b/roles/baseline_ansible/infrastructure/install_golang/tasks/install.yml @@ -45,3 +45,6 @@ mode: a=rx,u+w become: yes loop: "{{ golang_default_exports + golang_additional_exports }}" + +- name: set goproxy for PRC + shell: "source /etc/profile && go env -w GO111MODULE=on && go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct" \ No newline at end of file diff --git a/roles/baseline_ansible/infrastructure/install_packages/tasks/main.yml b/roles/baseline_ansible/infrastructure/install_packages/tasks/main.yml index b6a7cce..fea1dfe 100644 --- a/roles/baseline_ansible/infrastructure/install_packages/tasks/main.yml +++ b/roles/baseline_ansible/infrastructure/install_packages/tasks/main.yml @@ -20,3 +20,6 @@ name: infrastructure/install_dependencies vars: install_dependencies: "{{ hardware_details_tools }}" + +- name: set gitconfig to speed github access in PRC + shell: git config --global url."https://gitclone.com/github.com/".insteadOf https://github.com/ diff --git a/roles/infrastructure/docker/defaults/main.yml b/roles/infrastructure/docker/defaults/main.yml index d09f700..14665a3 100644 --- a/roles/infrastructure/docker/defaults/main.yml +++ b/roles/infrastructure/docker/defaults/main.yml @@ -29,5 +29,5 @@ _docker_audit_files: - "/usr/bin/docker-containerd" - "/usr/bin/docker-runc" -_docker_completion_url: "https://raw.githubusercontent.com/docker/cli/v{{ _docker_version }}/contrib/completion/bash/docker" -_docker_compose_completion_url: "https://raw.githubusercontent.com/docker/compose/{{ _docker_compose_version }}/contrib/completion/bash/docker-compose" +_docker_completion_url: "https://cdn.jsdelivr.net/gh/docker/cli@v{{ _docker_version }}/contrib/completion/bash/docker" +_docker_compose_completion_url: "https://cdn.jsdelivr.net/gh/docker/compose@{{ _docker_compose_version }}/contrib/completion/bash/docker-compose" diff --git a/roles/kubernetes/cert_manager/defaults/main.yml b/roles/kubernetes/cert_manager/defaults/main.yml index 12e4ed3..999949d 100644 --- a/roles/kubernetes/cert_manager/defaults/main.yml +++ b/roles/kubernetes/cert_manager/defaults/main.yml @@ -9,5 +9,5 @@ _cert_manager_version: v1.6.1 _cert_manager_namespace: cert-manager _ca_secret_name: root-ca _cmctl_version: v1.6.1 -_cmctl_url: https://github.com/jetstack/cert-manager/releases/download/{{ _cmctl_version }}/cmctl-linux-amd64.tar.gz +_cmctl_url: https://ghps.cc/https://github.com/cert-manager/cert-manager/releases/download/{{ _cmctl_version }}/cmctl-linux-amd64.tar.gz _subject: "*.smartedge.open" diff --git a/roles/kubernetes/controlplane/templates/config.yaml.j2 b/roles/kubernetes/controlplane/templates/config.yaml.j2 index 876e3a6..84969ba 100644 --- a/roles/kubernetes/controlplane/templates/config.yaml.j2 +++ b/roles/kubernetes/controlplane/templates/config.yaml.j2 @@ -4,6 +4,7 @@ apiVersion: kubeadm.k8s.io/v1beta2 kind: ClusterConfiguration kubernetesVersion: v{{ _kubernetes_version }} +imageRepository: registry.aliyuncs.com/google_containers controllerManager: extraArgs: terminated-pod-gc-threshold: "600" diff --git a/roles/kubernetes/install/vars/debian.yml b/roles/kubernetes/install/vars/debian.yml index 610740e..f30e7b8 100644 --- a/roles/kubernetes/install/vars/debian.yml +++ b/roles/kubernetes/install/vars/debian.yml @@ -2,8 +2,8 @@ # Copyright (c) 2019-2020 Intel Corporation --- -_kubernetes_repository_url: "deb http://apt.kubernetes.io/ kubernetes-xenial main" +_kubernetes_repository_url: "deb https://mirrors.aliyun.com/kubernetes/apt/ kubernetes-xenial main" _kubernetes_repository_keys: - - https://packages.cloud.google.com/apt/doc/apt-key.gpg + - https://mirrors.aliyun.com/kubernetes/apt/doc/apt-key.gpg _kubernetes_ver_separator: "=" _kubernetes_ver_suffix: "-00" diff --git a/roles/kubernetes/nfd/defaults/main.yml b/roles/kubernetes/nfd/defaults/main.yml index ab484f6..da3588e 100644 --- a/roles/kubernetes/nfd/defaults/main.yml +++ b/roles/kubernetes/nfd/defaults/main.yml @@ -2,12 +2,12 @@ # Copyright (c) 2019-2022 Intel Corporation --- -_nfd_image_name: "k8s.gcr.io/nfd/node-feature-discovery" +_nfd_image_name: "registry.cn-shanghai.aliyuncs.com/joez/node-feature-discovery" _nfd_tag: "v0.10.1" _nfd_chart_dir: "{{ ne_helm_charts_default_dir }}/node-feature-discovery" _nfd_chart_url: - "https://raw.githubusercontent.com/kubernetes-sigs/\ + "https://ghps.cc/https://raw.githubusercontent.com/kubernetes-sigs/\ node-feature-discovery/{{ _nfd_tag }}/deployment/helm/node-feature-discovery" _nfd_release_name: "nfd-release" diff --git a/roles/telemetry/cadvisor/templates/values.yaml.j2 b/roles/telemetry/cadvisor/templates/values.yaml.j2 index c1bd711..115d801 100644 --- a/roles/telemetry/cadvisor/templates/values.yaml.j2 +++ b/roles/telemetry/cadvisor/templates/values.yaml.j2 @@ -8,7 +8,7 @@ component: cadvisor projectDir: "{{ project_dir }}" # cAdvisor Values cadvisor: - image: gcr.io/cadvisor/cadvisor:v0.43.0 + image: registry.cn-shanghai.aliyuncs.com/joez/cadvisor:v0.43.0 name: cadvisor resources: requests: From e4b0af3a42530f557bab3a715671b275721e9a85 Mon Sep 17 00:00:00 2001 From: Joe Zheng Date: Fri, 26 May 2023 23:57:13 +0800 Subject: [PATCH 2/3] hotfix for PRC network environment - update v1 * https://cdn.jsdelivr.net is not stable * https://get.helm.sh is too slowly --- roles/infrastructure/docker/defaults/main.yml | 4 ++-- roles/kubernetes/helm/defaults/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/infrastructure/docker/defaults/main.yml b/roles/infrastructure/docker/defaults/main.yml index 14665a3..2ee50e2 100644 --- a/roles/infrastructure/docker/defaults/main.yml +++ b/roles/infrastructure/docker/defaults/main.yml @@ -29,5 +29,5 @@ _docker_audit_files: - "/usr/bin/docker-containerd" - "/usr/bin/docker-runc" -_docker_completion_url: "https://cdn.jsdelivr.net/gh/docker/cli@v{{ _docker_version }}/contrib/completion/bash/docker" -_docker_compose_completion_url: "https://cdn.jsdelivr.net/gh/docker/compose@{{ _docker_compose_version }}/contrib/completion/bash/docker-compose" +_docker_completion_url: "https://ghps.cc/https://raw.githubusercontent.com/docker/cli/v{{ _docker_version }}/contrib/completion/bash/docker" +_docker_compose_completion_url: "https://ghps.cc/https://raw.githubusercontent.com/docker/compose/{{ _docker_compose_version }}/contrib/completion/bash/docker-compose" diff --git a/roles/kubernetes/helm/defaults/main.yml b/roles/kubernetes/helm/defaults/main.yml index 55e29b0..35a0fc8 100644 --- a/roles/kubernetes/helm/defaults/main.yml +++ b/roles/kubernetes/helm/defaults/main.yml @@ -5,6 +5,6 @@ _helm_version: "v3.8.0" _helm_name: "helm-{{ _helm_version }}-linux-amd64" -_helm_download_url: "https://get.helm.sh" +_helm_download_url: "https://mirrors.huaweicloud.com/helm/{{ _helm_version }}" _helm_download_item: "{{ _helm_name }}.tar.gz" _helm_binary_path: /usr/local/bin/helm From 46ee1d4ecd73ed64f3a38c937b349b647e2a289d Mon Sep 17 00:00:00 2001 From: Joe Zheng Date: Tue, 31 Oct 2023 14:48:00 +0800 Subject: [PATCH 3/3] hotfix for PRC network environment - update v2 avoid patch conflict which changes golang_version --- .../infrastructure/install_golang/defaults/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml b/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml index a9255e8..66e789d 100644 --- a/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml +++ b/roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml @@ -3,7 +3,7 @@ --- golang_version: 1.16 golang_download_name: "go{{ golang_version }}.linux-amd64.tar.gz" -golang_download_url_base: "https://golang.google.cn/dl/" +golang_download_url_base: "https://dl.google.com/go/" golang_download_url: "{{ golang_download_url_base }}{{ golang_download_name }}" golang_download_dest: "{{ project_dir }}/golang/{{ golang_download_name }}" golang_download_checksum: "sha256:013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2" @@ -14,4 +14,8 @@ golang_default_exports: [ "export PATH=$GOPATH/bin:$GOROOT/bin:$PATH" ] +# override these two variables here to avoid patch conflict +golang_download_url_base: "https://golang.google.cn/dl/" +golang_download_url: "{{ golang_download_url_base }}{{ golang_download_name }}" + golang_additional_exports: []