Merge pull request #168 from openinfradev/harbor-repo

change image repo from harbor-cicd to harbor
openinfradev · Aug 16, 2023 · fd00d9d · fd00d9d
2 parents 061ea3a + 61127d5
commit fd00d9d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/check_image_repo.sh b/.github/workflows/check_image_repo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-VALIDATE_TARGET_REPO='harbor-cicd.taco-cat.xyz/tks'
+VALIDATE_TARGET_REPO='harbor.taco-cat.xyz/tks'
 EXCEPTION_LIST='quay.io/argoproj/workflow-controller:v3.2.6,quay.io/argoproj/argocli:v3.2.6,docker.io/bitnami/postgresql:15.1.0-debian-11-r0,appscode/kubed:v0.12.0-rc.3,quay.io/bitnami/sealed-secrets-controller:v0.16.0,k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.5.1,k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0,k8s.gcr.io/sig-storage/livenessprobe:v2.4.0,k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.5.1,k8s.gcr.io/sig-storage/csi-provisioner:v2.1.1,k8s.gcr.io/sig-storage/csi-attacher:v3.1.0,k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3,k8s.gcr.io/sig-storage/csi-resizer:v1.1.0,k8s.gcr.io/sig-storage/livenessprobe:v2.4.0,k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2,k8s.gcr.io/ingress-nginx/controller:v1.1.1@sha256:0bc88eb15f9e7f84e8e56c14fa5735aaa488b840983f87bd79b1054190e660de,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660,appscode/kubed:v0.12.0,calico/node:v3.15.5,calico/cni:v3.15.5,calico/cni:v3.15.5,calico/pod2daemon-flexvol:v3.15.5,calico/kube-controllers:v3.15.5,rancher/local-path-provisioner:v0.0.22,k8s.gcr.io/metrics-server/metrics-server:v0.6.1' # except lma and service-mesh
 #'appscode/kubed:v0.12.0,appscode/kubed:v0.12.0-rc.3,busybox:1.31,busybox:1.31.1,calico/cni:v3.15.5,calico/kube-controllers:v3.15.5,calico/node:v3.15.5,calico/pod2daemon-flexvol:v3.15.5,directxman12/k8s-prometheus-adapter-amd64:v0.7.0,docker.elastic.co/eck/eck-operator:1.8.0,docker.elastic.co/elasticsearch/elasticsearch:7.5.1,docker.elastic.co/kibana/kibana:7.5.1,docker.io/bitnami/kube-state-metrics:1.9.7-debian-10-r143,docker.io/bitnami/minio:2021.6.14-debian-10-r0,docker.io/bitnami/postgresql:11.7.0-debian-10-r98,docker.io/bitnami/postgresql:15.1.0-debian-11-r0,docker.io/bitnami/thanos:0.17.2-scratch-r1,docker.io/grafana/loki:2.6.1,docker.io/grafana/promtail:2.4.1,docker.io/jboss/keycloak:10.0.0,docker.io/ncabatoff/process-exporter:0.2.11,docker.io/nginxinc/nginx-unprivileged:1.19-alpine,docker:19.03,ghcr.io/openinfradev/fluentbit:25bc31cd4333f7f77435561ec70bc68e0c73a194,ghcr.io/resmoio/kubernetes-event-exporter:v1.0,grafana/grafana:8.3.3,istio/pilot:1.13.1,istio/proxyv2:1.13.1,jaegertracing/jaeger-operator:1.29.1,k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2,k8s.gcr.io/hyperkube:v1.18.8,k8s.gcr.io/ingress-nginx/controller:v1.1.1@sha256:0bc88eb15f9e7f84e8e56c14fa5735aaa488b840983f87bd79b1054190e660de,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660,k8s.gcr.io/metrics-server/metrics-server:v0.6.1,kubesphere/fluent-operator:v1.5.0,prom/pushgateway:v1.3.0,quay.io/airshipit/kubernetes-entrypoint:v1.0.0,quay.io/argoproj/argocli:v3.2.6,quay.io/argoproj/workflow-controller:v3.2.6,quay.io/bitnami/sealed-secrets-controller:v0.16.0,quay.io/keycloak/keycloak-operator:17.0.0,quay.io/kiali/kiali-operator:v1.45.1,quay.io/kiwigrid/k8s-sidecar:1.14.2,quay.io/prometheus-operator/prometheus-operator:v0.52.0,quay.io/prometheus/alertmanager:v0.23.0,quay.io/prometheus/node-exporter:v1.0.1,quay.io/prometheus/prometheus:v2.31.1,rancher/local-path-provisioner:v0.0.22,siim/logalert-exporter:v0.1.1,sktdev/cloud-console:v1.0.4,sktdev/os-eventrouter:69a58b,fluent/fluent-bit:1.9.7-debug,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0'
 if [ $EXCEPTION_LIST ]; then

diff --git a/aws-msa-reference/service-mesh/site-values.yaml b/aws-msa-reference/service-mesh/site-values.yaml
@@ -6,7 +6,7 @@ metadata:
 global:
   clusterName: cluster.local
   namespace: tks-msa
-  imageRepo: harbor-cicd.taco-cat.xyz/tks
+  imageRepo: harbor.taco-cat.xyz/tks
   serviceMeshControlNodeSelector:
     tks-msa: enabled
   serviceMeshIngressNodeSelector:
@@ -101,7 +101,7 @@ charts:
     collector.resources.limits.cpu: 1000m
     collector.resources.limits.memory: 2048Mi
     collector:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-collector:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -119,9 +119,9 @@ charts:
           keyspace: jaeger_v1_datacenter
         dependencies:
           enabled: true
-          image: harbor-cicd.taco-cat.xyz/tks/spark-dependencies:1.35.0
+          image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
     query:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-query:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
       basePath: /
       affinity:
         nodeAffinity:
@@ -133,7 +133,7 @@ charts:
                 values:
                 - enabled
     agent:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-agent:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
     cassandra:
       user:
         enabled: true
@@ -146,7 +146,7 @@ charts:
 - name: kiali-operator
   override:
     image:
-      repo: harbor-cicd.taco-cat.xyz/tks/kiali-operator
+      repo: harbor.taco-cat.xyz/tks/kiali-operator
       tag: v1.63.0
     nodeSelector: $(serviceMeshControlNodeSelector)
 
@@ -155,7 +155,7 @@ charts:
     namespace: tks-msa
     istioNamespace: tks-msa
     deployment.namespace: tks-msa
-    deployment.image_name: harbor-cicd.taco-cat.xyz/tks/kiali
+    deployment.image_name: harbor.taco-cat.xyz/tks/kiali
     deployment.image_version: v1.63.0
     deployment.resources.requests.cpu: 500m
     deployment.resources.requests.memory: 512Mi

diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml
@@ -111,7 +111,7 @@ charts:
         taco-lma: enabled
       replicas: 2
       image:
-        registry: harbor-cicd.taco-cat.xyz
+        registry: harbor.taco-cat.xyz
         repository: tks/argo-rollouts
         tag: v1.4.1
 
diff --git a/eks-msa-reference/service-mesh/site-values.yaml b/eks-msa-reference/service-mesh/site-values.yaml
@@ -6,7 +6,7 @@ metadata:
 global:
   clusterName: cluster.local
   namespace: tks-msa
-  imageRepo: harbor-cicd.taco-cat.xyz/tks
+  imageRepo: harbor.taco-cat.xyz/tks
   serviceMeshControlNodeSelector:
     tks-msa: enabled
   serviceMeshIngressNodeSelector:
@@ -101,7 +101,7 @@ charts:
     collector.resources.limits.cpu: 1000m
     collector.resources.limits.memory: 2048Mi
     collector:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-collector:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -119,9 +119,9 @@ charts:
           keyspace: jaeger_v1_datacenter
         dependencies:
           enabled: true
-          image: harbor-cicd.taco-cat.xyz/tks/spark-dependencies:1.35.0
+          image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
     query:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-query:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
       basePath: /
       affinity:
         nodeAffinity:
@@ -133,7 +133,7 @@ charts:
                 values:
                 - enabled
     agent:
-      image: harbor-cicd.taco-cat.xyz/tks/jaeger-agent:1.35.0
+      image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
     cassandra:
       user:
         enabled: true
@@ -146,7 +146,7 @@ charts:
 - name: kiali-operator
   override:
     image:
-      repo: harbor-cicd.taco-cat.xyz/tks/kiali-operator
+      repo: harbor.taco-cat.xyz/tks/kiali-operator
       tag: v1.63.0
     nodeSelector: $(serviceMeshControlNodeSelector)
 
@@ -155,7 +155,7 @@ charts:
     namespace: tks-msa
     istioNamespace: tks-msa
     deployment.namespace: tks-msa
-    deployment.image_name: harbor-cicd.taco-cat.xyz/tks/kiali
+    deployment.image_name: harbor.taco-cat.xyz/tks/kiali
     deployment.image_version: v1.63.0
     deployment.resources.requests.cpu: 500m
     deployment.resources.requests.memory: 512Mi

diff --git a/eks-msa-reference/tks-cluster/site-values.yaml b/eks-msa-reference/tks-cluster/site-values.yaml
@@ -97,7 +97,7 @@ charts:
 - name: k8s-cluster-autoscaler
   override:
     image:
-      repository: harbor-cicd.taco-cat.xyz/tks/cluster-autoscaler
+      repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
       tag: v1.25.2
     awsRegion: ap-northeast-2
     autoDiscovery:

diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml
@@ -98,7 +98,7 @@ charts:
   override:
     image:
       tag: v1.25.2
-      repository: harbor-cicd.taco-cat.xyz/tks/cluster-autoscaler
+      repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
     awsRegion: ap-northeast-2
     autoDiscovery:
       clusterName: $(clusterName)