Merge pull request #12598 from hakman/automated-cherry-pick-of-#12593-#…

…12594-upstream-release-1.22 Automated cherry pick of #12593 #12594: Various Canal fixes
kubernetes · Oct 24, 2021 · 98ce514 · 98ce514
2 parents e6886e9 + 4371901
commit 98ce514
Show file tree

Hide file tree

Showing 3 changed files with 883 additions and 17 deletions.
diff --git a/.../privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content b/.../privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content
@@ -54,7 +54,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.22
     manifest: networking.projectcalico.org.canal/k8s-1.22.yaml
-    manifestHash: b026de0876284d3167c957c3eec392866900c5b0c81ce92ef458e7bac343644a
+    manifestHash: 49059daf38b0194987d7725c03191a37d11244a1694255b9c007d1e3d1d6883f
     name: networking.projectcalico.org.canal
     selector:
       role.kubernetes.io/networking: "1"