diff --git a/tigera-operator/custom-resources.yaml b/tigera-operator/custom-resources.yaml index 375d797..2548c7a 100644 --- a/tigera-operator/custom-resources.yaml +++ b/tigera-operator/custom-resources.yaml @@ -9,12 +9,19 @@ spec: calicoNetwork: # Note: The ipPools section cannot be modified post-install. ipPools: - - blockSize: 26 + - allowedUses: + - Workload + - Tunnel + blockSize: 26 cidr: 10.244.0.0/16 + disableBGPExport: false + disableNewAllocations: false + encapsulation: IPIP + name: default-ipv4-ippool natOutgoing: Disabled nodeSelector: all() --- -apiVersion: crd.projectcalico.org/v1 +apiVersion: projectcalico.org/v3 kind: IPPool metadata: name: default-ipv4-ippool @@ -27,7 +34,7 @@ spec: ipipMode: Always nodeSelector: all() vxlanMode: Never - natOutgoing: True + natOutgoing: true --- # This section configures the Calico API server. # For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.APIServer @@ -37,7 +44,7 @@ metadata: name: default spec: {} --- -apiVersion: crd.projectcalico.org/v1 +apiVersion: projectcalico.org/v3 kind: BGPPeer metadata: name: mikrotik-router @@ -50,25 +57,25 @@ spec: name: bgp-secrets key: password --- -apiVersion: crd.projectcalico.org/v1 +apiVersion: projectcalico.org/v3 kind: BGPConfiguration metadata: name: default spec: serviceLoadBalancerIPs: - - cidr: 172.21.51.4/32 - - cidr: 172.21.53.1/32 - - cidr: 172.21.53.2/32 - - cidr: 172.21.53.3/32 - - cidr: 193.40.103.36/32 - - cidr: 193.40.103.37/32 - - cidr: 193.40.103.38/32 - - cidr: 193.40.103.39/32 - - cidr: 62.65.250.36/32 - - cidr: 62.65.250.37/32 - - cidr: 62.65.250.38/32 - - cidr: 62.65.250.2/32 - - cidr: 193.40.103.25/32 + - cidr: 172.21.51.4/32 + - cidr: 172.21.53.1/32 + - cidr: 172.21.53.2/32 + - cidr: 172.21.53.3/32 + - cidr: 193.40.103.36/32 + - cidr: 193.40.103.37/32 + - cidr: 193.40.103.38/32 + - cidr: 193.40.103.39/32 + - cidr: 62.65.250.36/32 + - cidr: 62.65.250.37/32 + - cidr: 62.65.250.38/32 + - cidr: 62.65.250.2/32 + - cidr: 193.40.103.25/32 --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role