Skip to content

Commit

Permalink
fix(service-mesh): reverts disabling network policy management (opend…
Browse files Browse the repository at this point in the history
…atahub-io#809)

* fix(service-mesh): reverts disabling network policy management

* fix(lint): removes unused test code

(cherry picked from commit 515328c)
  • Loading branch information
bartoszmajsak authored and VaishnaviHire committed Feb 2, 2024
1 parent f6774c8 commit bed050a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
15 changes: 0 additions & 15 deletions controllers/dscinitialization/servicemesh_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,6 @@ func configureServiceMeshFeatures(s *feature.FeaturesInitializer) error {
}
s.Features = append(s.Features, smcpCreation)

noDefaultNetworkPolicies, errNp := feature.CreateFeature("mesh-control-plane-no-default-network-policies").
For(s.DSCInitializationSpec).
PreConditions(
servicemesh.EnsureServiceMeshInstalled,
).
Manifests(
path.Join(rootDir, templatesDir, "base", "control-plane-disable-networkpolicies.patch.tmpl"),
).
Load()

if errNp != nil {
return errNp
}
s.Features = append(s.Features, noDefaultNetworkPolicies)

if serviceMeshSpec.ControlPlane.MetricsCollection == "Istio" {
metricsCollection, errMetrics := feature.CreateFeature("mesh-metrics-collection").
For(s.DSCInitializationSpec).
Expand Down
1 change: 1 addition & 0 deletions tests/integration/features/servicemesh_feature_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ var _ = Describe("Service Mesh feature", func() {
})
})
})

})

func installServiceMeshControlPlaneCRD() *apiextensionsv1.CustomResourceDefinition {
Expand Down

0 comments on commit bed050a

Please sign in to comment.