Skip to content

Commit

Permalink
Cilium nps azure (#1612)
Browse files Browse the repository at this point in the history
* Don't enable Cilium network policies on Azure.

* Don't enable Cilium network policies on Azure.
  • Loading branch information
whites11 committed May 3, 2023
1 parent ff22ddb commit 5a76ace
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Don't enable Cilium network policies on Azure.

## [5.6.0] - 2023-04-03

### Added
Expand Down
7 changes: 5 additions & 2 deletions service/controller/resource/clusterconfigmap/desired.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
yaml "gopkg.in/yaml.v2"
"gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -55,9 +55,12 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) ([]*cor

// useProxyProtocol is only enabled by default for AWS clusters.
var useProxyProtocol bool
// enableCiliumNetworkPolicy is only enabled by default for AWS clusters.
var enableCiliumNetworkPolicy bool
{
if r.provider == "aws" {
useProxyProtocol = true
enableCiliumNetworkPolicy = true
}
}

Expand All @@ -83,7 +86,7 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) ([]*cor
"clusterDNSIP": r.dnsIP,
"clusterID": key.ClusterID(&cr),
"ciliumNetworkPolicy": map[string]interface{}{
"enabled": true,
"enabled": enableCiliumNetworkPolicy,
},
}

Expand Down

0 comments on commit 5a76ace

Please sign in to comment.