Merge pull request #3340 from giantswarm/more-peering-properties-clean

Enable setting VNet peering properties

Author: k8s-ci-robot

api/v1beta1/types.go

@@ -124,6 +124,41 @@ type VnetPeeringClassSpec struct {
 
 	// RemoteVnetName defines name of the remote virtual network.
 	RemoteVnetName string `json:"remoteVnetName"`
+
+	// ForwardPeeringProperties specifies VnetPeeringProperties for peering from the cluster's virtual network to the
+	// remote virtual network.
+	// +optional
+	ForwardPeeringProperties VnetPeeringProperties `json:"forwardPeeringProperties,omitempty"`
+
+	// ReversePeeringProperties specifies VnetPeeringProperties for peering from the remote virtual network to the
+	// cluster's virtual network.
+	// +optional
+	ReversePeeringProperties VnetPeeringProperties `json:"reversePeeringProperties,omitempty"`
+}
+
+// VnetPeeringProperties specifies virtual network peering properties.
+type VnetPeeringProperties struct {
+	// AllowForwardedTraffic specifies whether the forwarded traffic from the VMs in the local virtual network will be
+	// allowed/disallowed in remote virtual network.
+	// +optional
+	AllowForwardedTraffic *bool `json:"allowForwardedTraffic,omitempty"`
+
+	// AllowGatewayTransit specifies if gateway links can be used in remote virtual networking to link to this virtual
+	// network.
+	// +optional
+	AllowGatewayTransit *bool `json:"allowGatewayTransit,omitempty"`
+
+	// AllowVirtualNetworkAccess specifies whether the VMs in the local virtual network space would be able to access
+	// the VMs in remote virtual network space.
+	// +optional
+	AllowVirtualNetworkAccess *bool `json:"allowVirtualNetworkAccess,omitempty"`
+
+	// UseRemoteGateways specifies if remote gateways can be used on this virtual network.
+	// If the flag is set to true, and allowGatewayTransit on remote peering is also set to true, the virtual network
+	// will use the gateways of the remote virtual network for transit. Only one peering can have this flag set to true.
+	// This flag cannot be set if virtual network already has a gateway.
+	// +optional
+	UseRemoteGateways *bool `json:"useRemoteGateways,omitempty"`
 }
 
 // VnetPeerings is a slice of VnetPeering.

api/v1beta1/zz_generated.deepcopy.go

@@ -425,20 +425,28 @@ func (s *ClusterScope) VnetPeeringSpecs() []azure.ResourceSpecGetter {
 	peeringSpecs := make([]azure.ResourceSpecGetter, 2*len(s.Vnet().Peerings))
 	for i, peering := range s.Vnet().Peerings {
 		forwardPeering := &vnetpeerings.VnetPeeringSpec{
-			PeeringName:         azure.GenerateVnetPeeringName(s.Vnet().Name, peering.RemoteVnetName),
-			SourceVnetName:      s.Vnet().Name,
-			SourceResourceGroup: s.Vnet().ResourceGroup,
-			RemoteVnetName:      peering.RemoteVnetName,
-			RemoteResourceGroup: peering.ResourceGroup,
-			SubscriptionID:      s.SubscriptionID(),
+			PeeringName:               azure.GenerateVnetPeeringName(s.Vnet().Name, peering.RemoteVnetName),
+			SourceVnetName:            s.Vnet().Name,
+			SourceResourceGroup:       s.Vnet().ResourceGroup,
+			RemoteVnetName:            peering.RemoteVnetName,
+			RemoteResourceGroup:       peering.ResourceGroup,
+			SubscriptionID:            s.SubscriptionID(),
+			AllowForwardedTraffic:     peering.ForwardPeeringProperties.AllowForwardedTraffic,
+			AllowGatewayTransit:       peering.ForwardPeeringProperties.AllowGatewayTransit,
+			AllowVirtualNetworkAccess: peering.ForwardPeeringProperties.AllowVirtualNetworkAccess,
+			UseRemoteGateways:         peering.ForwardPeeringProperties.UseRemoteGateways,
 		}
 		reversePeering := &vnetpeerings.VnetPeeringSpec{
-			PeeringName:         azure.GenerateVnetPeeringName(peering.RemoteVnetName, s.Vnet().Name),
-			SourceVnetName:      peering.RemoteVnetName,
-			SourceResourceGroup: peering.ResourceGroup,
-			RemoteVnetName:      s.Vnet().Name,
-			RemoteResourceGroup: s.Vnet().ResourceGroup,
-			SubscriptionID:      s.SubscriptionID(),
+			PeeringName:               azure.GenerateVnetPeeringName(peering.RemoteVnetName, s.Vnet().Name),
+			SourceVnetName:            peering.RemoteVnetName,
+			SourceResourceGroup:       peering.ResourceGroup,
+			RemoteVnetName:            s.Vnet().Name,
+			RemoteResourceGroup:       s.Vnet().ResourceGroup,
+			SubscriptionID:            s.SubscriptionID(),
+			AllowForwardedTraffic:     peering.ReversePeeringProperties.AllowForwardedTraffic,
+			AllowGatewayTransit:       peering.ReversePeeringProperties.AllowGatewayTransit,
+			AllowVirtualNetworkAccess: peering.ReversePeeringProperties.AllowVirtualNetworkAccess,
+			UseRemoteGateways:         peering.ReversePeeringProperties.UseRemoteGateways,
 		}
 		peeringSpecs[i*2] = forwardPeering
 		peeringSpecs[i*2+1] = reversePeering