Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit a1a6976

Browse files
committed
hotfix for PRC network environment
1 parent 7b21c10 commit a1a6976

File tree

8 files changed

+17
-6
lines changed

8 files changed

+17
-6
lines changed

inventory/default/group_vars/all/10-default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ telemetry_statsd_exporter_tcp_port: 8125
281281
telemetry_cadvisor_enable: true
282282

283283
# Telegraf
284-
telemetry_telegraf_enable: true
284+
telemetry_telegraf_enable: false
285285
telemetry_telegraf_port: 9105
286286
###############
287287

roles/baseline_ansible/infrastructure/install_golang/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44
golang_version: 1.16
55
golang_download_name: "go{{ golang_version }}.linux-amd64.tar.gz"
6-
golang_download_url_base: "https://dl.google.com/go/"
6+
golang_download_url_base: "https://golang.google.cn/dl/"
77
golang_download_url: "{{ golang_download_url_base }}{{ golang_download_name }}"
88
golang_download_dest: "{{ project_dir }}/golang/{{ golang_download_name }}"
99
golang_download_checksum: "sha256:013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"

roles/baseline_ansible/infrastructure/install_golang/tasks/install.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@
4545
mode: a=rx,u+w
4646
become: yes
4747
loop: "{{ golang_default_exports + golang_additional_exports }}"
48+
49+
- name: set goproxy for PRC
50+
shell: "source /etc/profile && go env -w GO111MODULE=on && go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct"

roles/baseline_ansible/infrastructure/install_packages/tasks/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@
2020
name: infrastructure/install_dependencies
2121
vars:
2222
install_dependencies: "{{ hardware_details_tools }}"
23+
24+
- name: set gitconfig to speed github access in PRC
25+
blockinfile:
26+
path: "{{ ansible_env.HOME }}/.gitconfig"
27+
block: |
28+
[url "https://gitclone.com/github.com/"]
29+
insteadOf = https://github.com/

roles/kubernetes/controlplane/templates/config.yaml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
apiVersion: kubeadm.k8s.io/v1beta2
55
kind: ClusterConfiguration
66
kubernetesVersion: v{{ _kubernetes_version }}
7+
imageRepository: registry.aliyuncs.com/google_containers
78
controllerManager:
89
extraArgs:
910
terminated-pod-gc-threshold: "600"

roles/kubernetes/install/vars/debian.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright (c) 2019-2020 Intel Corporation
33

44
---
5-
_kubernetes_repository_url: "deb http://apt.kubernetes.io/ kubernetes-xenial main"
5+
_kubernetes_repository_url: "deb https://mirrors.aliyun.com/kubernetes/apt/ kubernetes-xenial main"
66
_kubernetes_repository_keys:
7-
- https://packages.cloud.google.com/apt/doc/apt-key.gpg
7+
- https://mirrors.aliyun.com/kubernetes/apt/doc/apt-key.gpg
88
_kubernetes_ver_separator: "="
99
_kubernetes_ver_suffix: "-00"

roles/kubernetes/nfd/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) 2019-2022 Intel Corporation
33

44
---
5-
_nfd_image_name: "k8s.gcr.io/nfd/node-feature-discovery"
5+
_nfd_image_name: "registry.cn-shanghai.aliyuncs.com/joez/node-feature-discovery"
66
_nfd_tag: "v0.10.1"
77

88
_nfd_chart_dir: "{{ ne_helm_charts_default_dir }}/node-feature-discovery"

roles/telemetry/cadvisor/templates/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ component: cadvisor
88
projectDir: "{{ project_dir }}"
99
# cAdvisor Values
1010
cadvisor:
11-
image: gcr.io/cadvisor/cadvisor:v0.43.0
11+
image: registry.cn-shanghai.aliyuncs.com/joez/cadvisor:v0.43.0
1212
name: cadvisor
1313
resources:
1414
requests:

0 commit comments

Comments
 (0)