Skip to content

Commit

Permalink
Fetch calico manifests from release artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
Cecile Robert-Michon committed Mar 4, 2022
1 parent d0b9621 commit 35782aa
Show file tree
Hide file tree
Showing 21 changed files with 9,034 additions and 97 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,6 @@ hack/boilerplate/*.pyc

# release notes
_releasenotes

# calico manifests archive
release-*/manifests/calico-*.yaml
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,21 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates
$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-kcp-scale-in.yaml

.PHONY: generate-addons
generate-addons: ## Generate metric-server, calico calico-ipv6 addons.
generate-addons: fetch-calico-manifests ## Generate metric-server, calico calico-ipv6 addons.
$(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml
$(KUSTOMIZE) build $(ADDONS_DIR)/calico > $(ADDONS_DIR)/calico.yaml
$(KUSTOMIZE) build $(ADDONS_DIR)/calico-ipv6 > $(ADDONS_DIR)/calico-ipv6.yaml

# When updating this, make sure to also update the Windows image version in templates/addons/windows/calico.
CALICO_VERSION := v3.22.1

.PHONY: fetch-calico-manifests
fetch-calico-manifests: ## Get Calico release manifests and unzip them.
@echo "Fetching Calico release manifests from release artifacts, this might take a minute..."
wget -qO- https://github.com/projectcalico/calico/releases/download/$(CALICO_VERSION)/release-$(CALICO_VERSION).tgz | tar xz release-$(CALICO_VERSION)/manifests/calico-vxlan.yaml release-$(CALICO_VERSION)/manifests/calico-policy-only.yaml
mv release-$(CALICO_VERSION)/manifests/calico-vxlan.yaml $(ADDONS_DIR)/calico
mv release-$(CALICO_VERSION)/manifests/calico-policy-only.yaml $(ADDONS_DIR)/calico-ipv6

.PHONY: modules
modules: ## Runs go mod tidy to ensure proper vendoring.
go mod tidy
Expand Down
10 changes: 5 additions & 5 deletions templates/addons/calico-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4007,7 +4007,7 @@ spec:
value: node
- name: DATASTORE_TYPE
value: kubernetes
image: docker.io/calico/kube-controllers:v3.22.0
image: docker.io/calico/kube-controllers:v3.22.1
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -4076,7 +4076,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/typha:v3.22.0
image: docker.io/calico/typha:v3.22.1
livenessProbe:
httpGet:
host: localhost
Expand Down Expand Up @@ -4192,7 +4192,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/node:v3.22.0
image: docker.io/calico/node:v3.22.1
lifecycle:
preStop:
exec:
Expand Down Expand Up @@ -4267,7 +4267,7 @@ spec:
- configMapRef:
name: kubernetes-services-endpoint
optional: true
image: docker.io/calico/cni:v3.22.0
image: docker.io/calico/cni:v3.22.1
name: install-cni
securityContext:
privileged: true
Expand All @@ -4276,7 +4276,7 @@ spec:
name: cni-bin-dir
- mountPath: /host/etc/cni/net.d
name: cni-net-dir
- image: docker.io/calico/pod2daemon-flexvol:v3.22.0
- image: docker.io/calico/pod2daemon-flexvol:v3.22.1
name: flexvol-driver
securityContext:
privileged: true
Expand Down
Loading

0 comments on commit 35782aa

Please sign in to comment.