Skip to content

Commit 636b3d2

Browse files
committed
Don't use images from MCR
Signed-off-by: James Sturtevant <jsturtevant@gmail.com>
1 parent 6cfd95c commit 636b3d2

File tree

37 files changed

+64
-542
lines changed

37 files changed

+64
-542
lines changed

templates/addons/cluster-api-helm/calico-dual-stack.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,3 @@ spec:
3131
encapsulation: None
3232
natOutgoing: Enabled
3333
nodeSelector: all()
34-
registry: mcr.microsoft.com/oss
35-
# Image and registry configuration for the tigera/operator pod.
36-
tigeraOperator:
37-
image: tigera/operator
38-
registry: mcr.microsoft.com/oss
39-
calicoctl:
40-
image: mcr.microsoft.com/oss/calico/ctl

templates/addons/cluster-api-helm/calico-ipv6.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,3 @@ spec:
2626
encapsulation: None
2727
natOutgoing: Enabled
2828
nodeSelector: all(){{end}}
29-
registry: mcr.microsoft.com/oss
30-
# Image and registry configuration for the tigera/operator pod.
31-
tigeraOperator:
32-
image: tigera/operator
33-
registry: mcr.microsoft.com/oss
34-
calicoctl:
35-
image: mcr.microsoft.com/oss/calico/ctl

templates/addons/cluster-api-helm/calico.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
version: ${CALICO_VERSION}
1212
releaseName: projectcalico
1313
namespace: tigera-operator
14-
valuesTemplate: |-
14+
valuesTemplate: |
1515
installation:
1616
cni:
1717
type: Calico

templates/addons/windows/calico/calico.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ data:
3737
}
3838
]
3939
}
40-
---
40+
---

templates/test/ci/cluster-template-prow-apiserver-ilb.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-dra.yaml

Lines changed: 2 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml

Lines changed: 1 addition & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)