bump calico to v3.20 and move away from v1beta apis

deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: ambassadorinstallations.getambassador.io

deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl

@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/part-of: kube-system
     addonmanager.kubernetes.io/mode: Reconcile
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: minikube-ingress-dns
@@ -47,7 +47,7 @@ rules:
       - list
       - watch
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: minikube-ingress-dns

deploy/addons/istio-provisioner/istio-operator.yaml.tmpl

@@ -8,7 +8,7 @@ metadata:
     addonmanager.kubernetes.io/mode: EnsureExists 
 ...
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: istiooperators.install.istio.io

pkg/minikube/bootstrapper/images/images.go

@@ -163,18 +163,37 @@ func KindNet(repo string) string {
 	return path.Join(repo, "kindnetd:v20210326-1e038dc5")
 }
 
+// all calico images are from https://docs.projectcalico.org/manifests/calico.yaml
+const calicoVersion = "v3.20.0"
+
 // CalicoDaemonSet returns the image used for calicoDaemonSet
 func CalicoDaemonSet(repo string) string {
 	if repo == "" {
-		repo = "calico"
+		repo = "docker.io/calico"
 	}
-	return path.Join(repo, "node:v3.14.1")
+	return path.Join(repo, "node:"+calicoVersion)
 }
 
 // CalicoDeployment returns the image used for calicoDeployment
 func CalicoDeployment(repo string) string {
 	if repo == "" {
-		repo = "calico"
+		repo = "docker.io/calico"
+	}
+	return path.Join(repo, "kube-controllers:"+calicoVersion)
+}
+
+// CalicoFelixDriver returns image used for felix driver
+func CalicoFelixDriver(repo string) string {
+	if repo == "" {
+		repo = "docker.io/calico"
+	}
+	return path.Join(repo, "pod2daemon-flexvol:"+calicoVersion)
+}
+
+// CalicoBin returns image used for calico binary image
+func CalicoBin(repo string) string {
+	if repo == "" {
+		repo = "docker.io/calico"
 	}
-	return path.Join(repo, "kube-controllers:v3.14.1")
+	return path.Join(repo, "cni:"+calicoVersion)
 }