From 43d5eb99d6f05602a8da6eb9cd6627e93f9c7081 Mon Sep 17 00:00:00 2001
From: yankay <kay.yan@daocloud.io>
Date: Mon, 13 Sep 2021 11:37:59 +0800
Subject: [PATCH] add back calico

---
 mirror.txt            |  9 ++++++++-
 not_sync.yaml         |  4 ++--
 scripts/sync-to-jp.py | 14 +++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/mirror.txt b/mirror.txt
index 4b73220..db052bd 100644
--- a/mirror.txt
+++ b/mirror.txt
@@ -21,6 +21,8 @@ docker.io/nginx
 docker.io/rancher/local-path-provisioner
 docker.io/redis
 docker.io/registry
+docker.io/weaveworks/weave-kube
+docker.io/weaveworks/weave-npc
 docker.io/xueshanf/install-socat
 gcr.io/google-containers/pause
 ghcr.io/k8snetworkplumbingwg/multus-cni
@@ -31,6 +33,7 @@ ghcr.io/klts-io/kubernetes-lts/kube-controller-manager
 ghcr.io/klts-io/kubernetes-lts/kube-proxy
 ghcr.io/klts-io/kubernetes-lts/kube-scheduler
 ghcr.io/klts-io/kubernetes-lts/pause
+k8s.gcr.io/addon-resizer
 k8s.gcr.io/coredns
 k8s.gcr.io/coredns/coredns
 k8s.gcr.io/cpa/cluster-proportional-autoscaler-amd64
@@ -44,10 +47,14 @@ k8s.gcr.io/kube-registry-proxy
 k8s.gcr.io/kube-scheduler
 k8s.gcr.io/metrics-server/metrics-server
 k8s.gcr.io/pause
-k8s.gcr.io/addon-resizer
+quay.io/calico/cni
+quay.io/calico/kube-controllers
+quay.io/calico/node
+quay.io/calico/typha
 quay.io/cilium/cilium
 quay.io/cilium/cilium-init
 quay.io/cilium/operator
+quay.io/containers/skopeo
 quay.io/coreos/etcd
 quay.io/coreos/flannel
 quay.io/datawire/ambassador-operator
diff --git a/not_sync.yaml b/not_sync.yaml
index 1ddf295..d6a9852 100644
--- a/not_sync.yaml
+++ b/not_sync.yaml
@@ -1,10 +1,10 @@
 not_sync:
 - image_pattern: quay.io/calico/.*
   tag_patterns:
-  - ".*[0-9a-f]{8,40}.*"
+  - ".*[0-9a-f]{7,40}.*"
 - image_pattern: quay.io/tigera/.*
   tag_patterns:
-  - ".*[0-9a-f]{8,40}.*"
+  - ".*[0-9a-f]{7,40}.*"
 - image_pattern: quay.io/jetstack/.*
   tag_patterns:
   - "[0-9a-f]{9,40}"
diff --git a/scripts/sync-to-jp.py b/scripts/sync-to-jp.py
index 38947ea..00cf111 100644
--- a/scripts/sync-to-jp.py
+++ b/scripts/sync-to-jp.py
@@ -104,17 +104,17 @@ def skepo_delta_sync(src_img):
     dest_tags = __parse_tag(result.stdout)
     delta_tags = set(src_tags) - set(dest_tags)
     need_to_sync = filter_tag(src_img,delta_tags)
+    
+
     filtered_num = len(delta_tags) - len(need_to_sync)
+    if 'latest' in src_tags:
+        need_to_sync.append('latest')
 
     # print(src_img)
     print("sync %s, src tag %s, dest tag %s, sync tag %s, filtered tag %s " % (src_img,len(src_tags),len(dest_tags),len(need_to_sync),filtered_num))
-    # print(need_to_sync)
-    if len(need_to_sync) == 0:
-        if 'latest' in src_tags:
-            skepo_sync_one_tag(src_img,'latest')
-    else:
-        for tag in need_to_sync:
-            skepo_sync_one_tag(src_img,tag)
+    
+    for tag in need_to_sync:
+        skepo_sync_one_tag(src_img,tag)
 
 def main():
     lines = []