Merge "Add updated Tigera Operator and Project Calico"

manifests/composite/infra/kustomization.yaml

@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../function/cni/tigera-operator/v1.13.0
+  - ../../function/cni/tigera-operator/v1.15.0
   - ../../function/cert-manager/v1.1.0

manifests/function/cni/tigera-operator/README.rst

@@ -6,12 +6,12 @@ This function contains a Kubernetes operator which manages the lifecycle of a Ca
 * Tigera Calico operator and custom resource definitions are defined in `tigera-operator.yaml`_.
 * Calico is installed via tigera operator using `custom-resources.yaml`_ by specifying the default variant of product to be installed.
 * The `tigera-operator.yaml`_ is taken from `GitHub URL`_.
-* Included Operator version: v1.13.0
-* Included Calico version: v3.17.0
+* Included Operator version: v1.15.0
+* Included Calico version: v3.18.0
 
 To know more about tigera installation see the `installation reference`_.
 
-.. _tigera-operator.yaml: https://github.com/airshipit/airshipctl/tree/master/manifests/function/tigera-operator/v1.13.0/upstream/tigera-operator.yaml
-.. _custom-resources.yaml: https://github.com/airshipit/airshipctl/tree/master/manifests/function/tigera-operator/v1.13.0/custom-resources.yaml
+.. _tigera-operator.yaml: https://github.com/airshipit/airshipctl/tree/master/manifests/function/tigera-operator/v1.15.0/upstream/tigera-operator.yaml
+.. _custom-resources.yaml: https://github.com/airshipit/airshipctl/tree/master/manifests/function/tigera-operator/v1.15.0/custom-resources.yaml
 .. _GitHub URL: https://docs.projectcalico.org/manifests/tigera-operator.yaml
 .. _installation reference: https://docs.projectcalico.org/getting-started/kubernetes/quickstart

manifests/function/cni/tigera-operator/v1.15.0/custom-resources.yaml

@@ -0,0 +1,5 @@
+apiVersion: operator.tigera.io/v1
+kind: Installation
+metadata:
+  name: default
+spec: {}

manifests/function/cni/tigera-operator/v1.15.0/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+  - upstream
+resources:
+  - custom-resources.yaml

manifests/function/cni/tigera-operator/v1.15.0/upstream/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - tigera-operator.yaml