big change

替换部分个性化路径和域名，增强通用性和可读性

Author: Leif160519

confluence/2.deployment.yaml

@@ -35,7 +35,7 @@ spec:
               value: root
             - name: RUN_GROUP
               value: root
-          image: harbor.github.icu/peanut-public/confluence-server:8.5.2
+          image: harbor.github.icu/public/confluence-server:8.5.2
           securityContext:
             privileged: true
             runAsUser: 0

confluence/readme.md

@@ -2,8 +2,8 @@
 若confluence使用ingress访问https形式，则为了避免登录confluence后总是出现`base url`的警告，可以先将server.xml的`confluence.example.net`域名改为你实际的域名
 之后执行：
 ```
-docker build . -t harbor.github.icu/peanut-public/confluence-server:8.5.2
-docker push harbor.github.icu/peanut-public/confluence-server:8.5.2
+docker build . -t harbor.github.icu/public/confluence-server:8.5.2
+docker push harbor.github.icu/public/confluence-server:8.5.2
 kubectl create configmap -n devops confluence-config --from-file=server.xml
 kubectl apply -f .
 ```

hesk/1.deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: hesk
-          image: harbor.github.icu/peanut-public/hesk:latest
+          image: harbor.github.icu/public/hesk:latest
           securityContext:
             runAsUser: 0
           imagePullPolicy: IfNotPresent

hesk/readme.md

@@ -16,8 +16,8 @@ hesk
 
 ## 使用方法
 ```
-docker build . -t harbor.github.icu/peanut-public/hesk:latest
-docker push harbor.github.icu/peanut-public/hesk:latest
+docker build . -t harbor.github.icu/public/hesk:latest
+docker push harbor.github.icu/public/hesk:latest
 kubectl apply -f .
 ```
 

jenkins/jmx_exporter/deployment.yaml

@@ -33,7 +33,7 @@ spec:
               --prefix=/
               --sessionTimeout=1440
               --sessionEviction=1440
-          image: docker.github.icu/jenkins:2.415-jmx_0.19.0
+          image: harbor.github.icu/jenkins:2.415-jmx_0.19.0
           securityContext:
             runAsUser: 0
           imagePullPolicy: IfNotPresent

jenkins/jmx_exporter/readme.md

@@ -2,12 +2,12 @@
 
 - 1.构建镜像
 ```
-docker build . -t docker.github.icu/jenkins:2.415-jmx_0.19.0
+docker build . -t harbor.github.icu/jenkins:2.415-jmx_0.19.0
 ```
 
 - 2.上传镜像到私有仓库
 ```
-docker push docker.github.icu/jenkins:2.415-jmx_0.19.0
+docker push harbor.github.icu/jenkins:2.415-jmx_0.19.0
 ```
 
 - 3.创建jmx配置文件configmap

jenkins/readme.md

@@ -9,8 +9,8 @@ mfsseteattr -f nodatacache <jenkins-pv挂载路径>/jobs -r
 ## 若想用jdk 1.8部署低版本jenkins
 - 1.下载jdk1.8安装包
 ```
-wget -c https://nexus.example.com/repository/peanut/jdk/install-java.sh -P jdk/
-wget -c https://nexus.example.com/repository/peanut/jdk/jdk-8u201-linux-x64.tar.gz -P jdk/
+wget -c https://nexus.github.icu/repository/jdk/install-java.sh -P jdk/
+wget -c https://nexus.github.icu/repository/jdk/jdk-8u201-linux-x64.tar.gz -P jdk/
 ```
 
 - 2.准备Dockerfile重新编译jenkins镜像：
@@ -31,20 +31,20 @@ USER jenkins
 
 - 3.开始构建新镜像
 ```
-docker build . -t docker.example.com/jenkins:2.356-jdk8
+docker build . -t harbor.github.icu/jenkins:2.356-jdk8
 ```
 
 - 4.登录私有仓库
 ```
-docker login docker.example.com
+docker login harbor.github.icu
 ```
 
 - 5.上传私有镜像
 ```
-docker push docker.example.com/jenkins:2.356-jdk8
+docker push harbor.github.icu/jenkins:2.356-jdk8
 ```
 
-- 6.修改`5.deployment.yaml`中的镜像地址为`docker.example.com/jenkins:2.356-jdk8`
+- 6.修改`5.deployment.yaml`中的镜像地址为`harbor.github.icu/jenkins:2.356-jdk8`
 
 - 7.部署jenkins
 ```

monitoring/alertmanager/1.configmap.yaml

@@ -45,15 +45,15 @@ data:
       group_wait: 3m
       group_interval: 5m
       repeat_interval: 24h
-      receiver: 'peanut'
+      receiver: 'test'
       routes:
       - receiver: "webhook"
         match_re: { level: "(.*)?P([0-3].*)?" }
         continue: true
 
     receivers:
-      - name: 'peanut'
+      - name: 'test'
       - name: 'webhook'
         webhook_configs:
-          - url: 'https://prometheusalert.github.icu/prometheusalert?type=fs&tpl=prometheus-peanut&fsurl=https://open.feishu.cn/open-apis/bot/v2/hook/xxxx-xxxx-xxxx-xxxx-xxxx'
+          - url: 'https://prometheusalert.github.icu/prometheusalert?type=fs&tpl=prometheus-test&fsurl=https://open.feishu.cn/open-apis/bot/v2/hook/xxxx-xxxx-xxxx-xxxx-xxxx'
             send_resolved: true

monitoring/grafana/1.configmap.yaml

@@ -122,7 +122,7 @@ data:
     start_tls = false
     ssl_skip_verify = false
 
-    bind_dn = "cn=public,ou=peanut,dc=github,dc=icu"
+    bind_dn = "cn=public,ou=users,dc=github,dc=icu"
     bind_password = '123456'
 
     search_filter = "(sAMAccountName=%s)"

monitoring/sonar-exporter/akawork/2.deployment.yaml

@@ -23,7 +23,7 @@ spec:
           value: admin
         - name: SONAR_PASSWORD
           value: "123456"
-        image: harbor.github.icu/peanut-public/akaword/sonar-exporter:latest
+        image: harbor.github.icu/public/akaword/sonar-exporter:latest
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5

script/docker-proxy.sh

@@ -2,8 +2,8 @@
 src_image=$1
 docker pull ${src_image}
 image=`echo ${src_image} | awk -F / '{print $NF}'`
-dest_image=docker.github.icu/${image}
+dest_image=harbor.github.icu/${image}
 docker tag ${src_image} ${dest_image}
-docker login --username=admin --password=admin docker.github.icu
+docker login --username=admin --password=admin harbor.github.icu
 docker push ${dest_image}
 echo -e "\ndocker pull ${dest_image}"