Skip to content

Commit a1c5c51

Browse files
zohar7chzohar7ch
committed
Rename metricsScrapingServiceConfigs to prometheusServerConfigs
1 parent 9001174 commit a1c5c51

File tree

10 files changed

+99
-83
lines changed

10 files changed

+99
-83
lines changed

‎.github/workflows/netpol-e2e-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ jobs:
576576
OPERATOR_FLAGS="--set-string intentsOperator.operator.repository=${{ env.REGISTRY }} --set-string intentsOperator.webhookServer.repository=${{ env.REGISTRY }} --set-string intentsOperator.webhookServer.image=${{ inputs.webhook-server-image }} --set-string intentsOperator.webhookServer.tag=${{ inputs.webhook-server-tag }} --set-string intentsOperator.webhookServer.pullPolicy=Never --set-string intentsOperator.operator.image=${{ inputs.operator-image }} --set-string intentsOperator.operator.tag=${{ inputs.operator-tag }} --set-string intentsOperator.operator.pullPolicy=Never"
577577
TELEMETRY_FLAG="--set global.telemetry.enabled=false"
578578
EGRESS_FLAG="--set intentsOperator.operator.enableEgressNetworkPolicyCreation=true"
579-
THIRD_PARTY_TRAFFIC_FLAG=`echo --set-string intentsOperator.operator.automateThirdPartyNetworkPolicies=ifBlockedByOtterize --set "intentsOperator.operator.metricsScrapingServiceConfigs[0].name=prometheus-server" --set "intentsOperator.operator.metricsScrapingServiceConfigs[0].namespace=prometheus" --set "intentsOperator.operator.metricsScrapingServiceConfigs[0].kind=Deployment"`
579+
THIRD_PARTY_TRAFFIC_FLAG=`echo --set-string intentsOperator.operator.automateThirdPartyNetworkPolicies=ifBlockedByOtterize --set "intentsOperator.operator.prometheusServerConfigs[0].name=prometheus-server" --set "intentsOperator.operator.prometheusServerConfigs[0].namespace=prometheus" --set "intentsOperator.operator.prometheusServerConfigs[0].kind=Deployment"`
580580
helm dep up ./helm-charts/otterize-kubernetes
581581
helm install otterize ./helm-charts/otterize-kubernetes -n otterize-system --create-namespace $OPERATOR_FLAGS $TELEMETRY_FLAG $EGRESS_FLAG $THIRD_PARTY_TRAFFIC_FLAG
582582

‎helm-charts‎

‎src/operator/controllers/metrics_collection_traffic/network_policy_handler.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,27 @@ type NetworkPolicyHandler struct {
5959
client client.Client
6060
scheme *runtime.Scheme
6161
injectablerecorder.InjectableRecorder
62-
allowMetricsCollector automate_third_party_network_policy.Enum
63-
metricsScrapingServiceIdentities []serviceidentity.ServiceIdentity
62+
allowMetricsCollector automate_third_party_network_policy.Enum
63+
prometheusServiceIdentities []serviceidentity.ServiceIdentity
6464
}
6565

6666
func NewNetworkPolicyHandler(
6767
client client.Client,
6868
scheme *runtime.Scheme,
6969
allowMetricsCollector automate_third_party_network_policy.Enum,
70-
metricsScrapingServiceIdentities []serviceidentity.ServiceIdentity,
70+
prometheusServiceIdentities []serviceidentity.ServiceIdentity,
7171
) *NetworkPolicyHandler {
7272
// We want to make sure that the order of the metrics scraping server identity is deterministic, since it is parts of
7373
// the network policy that would be created, and before creating a new network policy we want compare it with the existing one.
7474
// We don't want the order of the metrics scraping server identity to create a difference in the network policy.
75-
slices.SortFunc(metricsScrapingServiceIdentities, func(serviceA, serviceB serviceidentity.ServiceIdentity) bool {
75+
slices.SortFunc(prometheusServiceIdentities, func(serviceA, serviceB serviceidentity.ServiceIdentity) bool {
7676
return serviceA.GetFormattedOtterizeIdentityWithoutKind() < serviceB.GetFormattedOtterizeIdentityWithKind()
7777
})
7878
return &NetworkPolicyHandler{
79-
client: client,
80-
scheme: scheme,
81-
allowMetricsCollector: allowMetricsCollector,
82-
metricsScrapingServiceIdentities: metricsScrapingServiceIdentities,
79+
client: client,
80+
scheme: scheme,
81+
allowMetricsCollector: allowMetricsCollector,
82+
prometheusServiceIdentities: prometheusServiceIdentities,
8383
}
8484
}
8585

@@ -340,7 +340,7 @@ func (r *NetworkPolicyHandler) buildNetworkPolicyIfNeeded(ctx context.Context, p
340340
policyName := r.formatPolicyName(pod.scrapeResourceType, serviceId)
341341

342342
// If the scraping metrics server is not defined - we handle this case as if the configuration was off
343-
if len(r.metricsScrapingServiceIdentities) == 0 {
343+
if len(r.prometheusServiceIdentities) == 0 {
344344
return v1.NetworkPolicy{}, false, nil
345345
}
346346

@@ -437,8 +437,8 @@ func (r *NetworkPolicyHandler) buildNetpolForPod(ctx context.Context, pod *Poten
437437
}
438438

439439
rule := v1.NetworkPolicyIngressRule{}
440-
441-
for _, serviceIdentity := range r.metricsScrapingServiceIdentities {
440+
441+
for _, serviceIdentity := range r.prometheusServiceIdentities {
442442
rule.From = append(rule.From, v1.NetworkPolicyPeer{
443443
PodSelector: &metav1.LabelSelector{
444444
MatchLabels: map[string]string{

‎src/operator/controllers/metrics_collection_traffic/network_policy_handler_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_Po
247247
}
248248

249249
func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_MetricsCollectionServerOrderDoesNoHaveAnImpact() {
250-
scrapingMetricsServer := []serviceidentity.ServiceIdentity{
250+
prometheusServer := []serviceidentity.ServiceIdentity{
251251
{
252252
Name: "bbb",
253253
Namespace: "default",
@@ -259,7 +259,7 @@ func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_Me
259259
Kind: "Deployment",
260260
},
261261
}
262-
s.handler = NewNetworkPolicyHandler(s.Client, &runtime.Scheme{}, automate_third_party_network_policy.Always, scrapingMetricsServer)
262+
s.handler = NewNetworkPolicyHandler(s.Client, &runtime.Scheme{}, automate_third_party_network_policy.Always, prometheusServer)
263263
s.handler.InjectRecorder(s.Recorder)
264264
s.mockForReturningScrapePodInListNamespace()
265265
s.mockForResolvingScrapingPodIdentity()
@@ -302,7 +302,7 @@ func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_Me
302302
s.ExpectEvent(ReasonCreatingMetricsCollectorPolicy)
303303
}
304304

305-
func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_NoScrapingMetricsServer_ShouldDoNothing() {
305+
func (s *NetworkPolicyHandlerTestSuite) TestNetworkPolicyHandler_HandleAlways_NoPrometheusServer_ShouldDoNothing() {
306306
s.handler = NewNetworkPolicyHandler(s.Client, &runtime.Scheme{}, automate_third_party_network_policy.Always, make([]serviceidentity.ServiceIdentity, 0))
307307
s.handler.InjectRecorder(s.Recorder)
308308
s.mockForReturningScrapePodInListNamespace()

‎src/operator/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func main() {
212212

213213
kafkaServersStore := kafkaacls.NewServersStore(tlsSource, enforcementConfig.EnableKafkaACL, kafkaacls.NewKafkaIntentsAdmin, enforcementConfig.EnforcementDefaultState)
214214

215-
metricsCollectorNetpolHandler := metrics_collection_traffic.NewNetworkPolicyHandler(mgr.GetClient(), mgr.GetScheme(), enforcementConfig.GetAutomateThirdPartyNetworkPolicy(), enforcementConfig.MetricsScrapingServiceIdentities)
215+
metricsCollectorNetpolHandler := metrics_collection_traffic.NewNetworkPolicyHandler(mgr.GetClient(), mgr.GetScheme(), enforcementConfig.GetAutomateThirdPartyNetworkPolicy(), enforcementConfig.PrometheusServiceIdentities)
216216
metricsCollectorPodReconciler := metrics_collection_traffic.NewPodReconciler(mgr.GetClient(), metricsCollectorNetpolHandler)
217217
metricsCollectorEndpointsReconciler := metrics_collection_traffic.NewEndpointsReconciler(mgr.GetClient(), metricsCollectorNetpolHandler)
218218
metricsCollectorServiceReconciler := metrics_collection_traffic.NewServiceReconciler(mgr.GetClient(), metricsCollectorNetpolHandler)

‎src/shared/operator_cloud_client/status_report.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ func getAutomateThirdPartyNetworkPoliciesConfig() graphqlclient.AutomateThirdPar
7171
}
7272
}
7373

74-
func getMetricsScrapingServiceIdentities() []graphqlclient.MetricsScrapingServerConfigInput {
75-
return lo.Map(enforcement.GetConfig().MetricsScrapingServiceIdentities, func(item serviceidentity.ServiceIdentity, _ int) graphqlclient.MetricsScrapingServerConfigInput {
76-
return graphqlclient.MetricsScrapingServerConfigInput{
74+
func getPrometheusServiceIdentities() []graphqlclient.PrometheusServerConfigInput {
75+
return lo.Map(enforcement.GetConfig().PrometheusServiceIdentities, func(item serviceidentity.ServiceIdentity, _ int) graphqlclient.PrometheusServerConfigInput {
76+
return graphqlclient.PrometheusServerConfigInput{
7777
Name: item.Name,
7878
Namespace: item.Namespace,
7979
Kind: item.Kind,
@@ -140,7 +140,7 @@ func uploadConfiguration(ctx context.Context, client CloudClient, mgr manager.Ma
140140
EnforcedNamespaces: enforcementConfig.EnforcedNamespaces.Items(),
141141
AllowExternalTrafficPolicy: getAllowExternalTrafficConfig(), // The server expect for AllowExternalTrafficPolicy because of backwards compatibility
142142
AutomateThirdPartyNetworkPolicies: getAutomateThirdPartyNetworkPoliciesConfig(),
143-
MetricsScrapingServerConfig: getMetricsScrapingServiceIdentities(),
143+
PrometheusServerConfigs: getPrometheusServiceIdentities(),
144144
}
145145

146146
configInput.IngressControllerConfig = lo.Map(ingressConfigIdentities, func(identity serviceidentity.ServiceIdentity, _ int) graphqlclient.IngressControllerConfigInput {

‎src/shared/operatorconfig/enforcement/config.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type Config struct {
2323
EnableLinkerdPolicies bool
2424
EnforcedNamespaces *goset.Set[string]
2525
AutomateThirdPartyNetworkPolicies automate_third_party_network_policy.Enum
26-
MetricsScrapingServiceIdentities []serviceidentity.ServiceIdentity
26+
PrometheusServiceIdentities []serviceidentity.ServiceIdentity
2727
}
2828

2929
func (c Config) GetAutomateThirdPartyNetworkPolicy() automate_third_party_network_policy.Enum {
@@ -68,7 +68,7 @@ const (
6868
EnableGCPPolicyDefault = false
6969
EnableAzurePolicyKey = "enable-azure-iam-policy"
7070
EnableAzurePolicyDefault = false
71-
MetricsCollectionServiceConfigKey = "metricsScrapingService"
71+
PrometheusServiceConfigKey = "prometheusServerConfigs"
7272
)
7373

7474
func init() {
@@ -113,7 +113,7 @@ func GetConfig() Config {
113113
EnableAzurePolicy: viper.GetBool(EnableAzurePolicyKey),
114114
EnforcedNamespaces: goset.FromSlice(viper.GetStringSlice(ActiveEnforcementNamespacesKey)),
115115
AutomateThirdPartyNetworkPolicies: automate_third_party_network_policy.Enum(viper.GetString(AutomateThirdPartyNetworkPoliciesKey)),
116-
MetricsScrapingServiceIdentities: GetMetricsScrapingServiceIdentities(),
116+
PrometheusServiceIdentities: GetPrometheusServiceIdentities(),
117117
}
118118
}
119119

@@ -123,11 +123,11 @@ type ServiceIdentityConfig struct {
123123
Kind string
124124
}
125125

126-
func GetMetricsScrapingServiceIdentities() []serviceidentity.ServiceIdentity {
126+
func GetPrometheusServiceIdentities() []serviceidentity.ServiceIdentity {
127127
controllers := make([]ServiceIdentityConfig, 0)
128-
err := viper.UnmarshalKey(MetricsCollectionServiceConfigKey, &controllers)
128+
err := viper.UnmarshalKey(PrometheusServiceConfigKey, &controllers)
129129
if err != nil {
130-
logrus.WithError(err).Panic("Failed to unmarshal metrics scraping server config")
130+
logrus.WithError(err).Panic("Failed to unmarshal Prometheus server config")
131131
}
132132

133133
return lo.Map(controllers, func(controller ServiceIdentityConfig, _ int) serviceidentity.ServiceIdentity {

‎src/shared/otterizecloud/graphqlclient/generated.go‎

Lines changed: 54 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)