Removed calico-related files (#636)

* "CalicoMTU" = var.calico_mtu * Remove calico-related files.
giantswarm · Aug 11, 2022 · 8c21dea · 8c21dea
1 parent a64ea07
commit 8c21dea
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 4,665 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - Remove k8s-addons code used to migrate to cilium.
+- Remove calico-related files.
 
 ## [12.0.0] - 2022-07-18
 

diff --git a/platforms/azure/giantnetes/main.tf b/platforms/azure/giantnetes/main.tf
@@ -144,7 +144,6 @@ locals {
     "APIDomainName"            = "${var.api_dns}.${var.base_domain}"
     "APIInternalDomainName"    = "${var.api_dns_internal}.${var.base_domain}"
     "BaseDomain"               = var.base_domain
-    "CalicoMTU"                = var.calico_mtu
     "ClusterDomain"            = var.cluster_domain
     "ClusterName"              = var.cluster_name
     "DisableAPIFairness"       = var.disable_api_fairness

diff --git a/platforms/azure/giantnetes/variables.tf b/platforms/azure/giantnetes/variables.tf
@@ -218,11 +218,6 @@ variable "root_dns_zone_rg" {
 
 ### Network ###
 
-variable "calico_mtu" {
-  description = "MTU used for Calico interfaces"
-  default     = "1500"
-}
-
 variable "vnet_cidr" {
   description = "CIDR for VMs internal virtual network."
   default     = "10.0.0.0/16"

diff --git a/templates/files/conf/calicoctl.cfg b/templates/files/conf/calicoctl.cfg
diff --git a/templates/files/conf/install-debug-tools b/templates/files/conf/install-debug-tools
@@ -1,10 +1,5 @@
 #!/bin/bash
 set -eu
-# download calicoctl
-CALICOCTL_VERSION=v3.5.0
-wget https://github.com/projectcalico/calicoctl/releases/download/${CALICOCTL_VERSION}/calicoctl-linux-amd64
-mv calicoctl-linux-amd64 /opt/bin/calicoctl
-chmod +x /opt/bin/calicoctl
 # download crictl
 CRICTL_VERSION=v1.13.0
 wget https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz