Skip to content

Commit c9407b9

Browse files
sancyxsancyx
committed
remove logging & monitoring integrated services
1 parent c4d426c commit c9407b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+0
-6125
lines changed

‎cmd/pipeline/BUILD.plz

-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ go_binary(
4242
"//internal/cluster/distribution/eks/eksprovider/driver",
4343
"//internal/cluster/distribution/pke",
4444
"//internal/cluster/distribution/pke/pkeaws/pkeawsadapter",
45-
"//internal/cluster/endpoints",
4645
"//internal/cluster/infrastructure/aws/awsworkflow",
4746
"//internal/cluster/metrics/adapters/prometheus",
4847
"//internal/clustergroup",
@@ -68,8 +67,6 @@ go_binary(
6867
"//internal/integratedservices/services/dns/dnsadapter",
6968
"//internal/integratedservices/services/expiry",
7069
"//internal/integratedservices/services/ingress",
71-
"//internal/integratedservices/services/logging",
72-
"//internal/integratedservices/services/monitoring",
7370
"//internal/integratedservices/services/securityscan",
7471
"//internal/integratedservices/services/securityscan/securityscanadapter",
7572
"//internal/integratedservices/services/vault",
@@ -210,7 +207,6 @@ go_test(
210207
"//internal/cluster/distribution/eks/eksprovider/driver",
211208
"//internal/cluster/distribution/pke",
212209
"//internal/cluster/distribution/pke/pkeaws/pkeawsadapter",
213-
"//internal/cluster/endpoints",
214210
"//internal/cluster/infrastructure/aws/awsworkflow",
215211
"//internal/cluster/metrics/adapters/prometheus",
216212
"//internal/clustergroup",
@@ -236,8 +232,6 @@ go_test(
236232
"//internal/integratedservices/services/dns/dnsadapter",
237233
"//internal/integratedservices/services/expiry",
238234
"//internal/integratedservices/services/ingress",
239-
"//internal/integratedservices/services/logging",
240-
"//internal/integratedservices/services/monitoring",
241235
"//internal/integratedservices/services/securityscan",
242236
"//internal/integratedservices/services/securityscan/securityscanadapter",
243237
"//internal/integratedservices/services/vault",

‎cmd/pipeline/capabilities.go

-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ func mapCapabilities(config configuration) cap.Capabilities {
2626
"enabled": config.Cluster.Vault.Enabled,
2727
"managed": config.Cluster.Vault.Managed.Enabled,
2828
},
29-
"monitoring": cap.Cap{
30-
"enabled": config.Cluster.Monitoring.Enabled,
31-
},
32-
"logging": cap.Cap{
33-
"enabled": config.Cluster.Logging.Enabled,
34-
},
3529
"dns": cap.Cap{
3630
"enabled": config.Cluster.DNS.Enabled,
3731
"baseDomain": config.Cluster.DNS.BaseDomain,

‎cmd/pipeline/main.go

-25
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ import (
8888
eksDriver "github.com/banzaicloud/pipeline/internal/cluster/distribution/eks/eksprovider/driver"
8989
pkeDistribution "github.com/banzaicloud/pipeline/internal/cluster/distribution/pke"
9090
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws/pkeawsadapter"
91-
"github.com/banzaicloud/pipeline/internal/cluster/endpoints"
9291
"github.com/banzaicloud/pipeline/internal/cluster/infrastructure/aws/awsworkflow"
9392
prometheusMetrics "github.com/banzaicloud/pipeline/internal/cluster/metrics/adapters/prometheus"
9493
"github.com/banzaicloud/pipeline/internal/clustergroup"
@@ -113,8 +112,6 @@ import (
113112
"github.com/banzaicloud/pipeline/internal/integratedservices/services/dns/dnsadapter"
114113
"github.com/banzaicloud/pipeline/internal/integratedservices/services/expiry"
115114
"github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress"
116-
integratedServiceLogging "github.com/banzaicloud/pipeline/internal/integratedservices/services/logging"
117-
featureMonitoring "github.com/banzaicloud/pipeline/internal/integratedservices/services/monitoring"
118115
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan"
119116
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan/securityscanadapter"
120117
integratedServiceVault "github.com/banzaicloud/pipeline/internal/integratedservices/services/vault"
@@ -881,7 +878,6 @@ func main() {
881878
// common setup (for both legacy and V2 IS)
882879
clusterGetter := integratedserviceadapter.MakeClusterGetter(clusterManager)
883880
clusterPropertyGetter := dnsadapter.NewClusterPropertyGetter(clusterManager)
884-
endpointManager := endpoints.NewEndpointManager(commonLogger)
885881
integratedServiceManagers := make([]integratedservices.IntegratedServiceManager, 0)
886882

887883
// integrated service service V2 setup
@@ -924,27 +920,6 @@ func main() {
924920
integratedServiceManagers = append(integratedServiceManagers, integratedServiceVault.MakeIntegratedServiceManager(clusterGetter, commonSecretStore, config.Cluster.Vault.Config, commonLogger))
925921
}
926922

927-
if config.Cluster.Monitoring.Enabled {
928-
integratedServiceManagers = append(integratedServiceManagers, featureMonitoring.MakeIntegratedServiceManager(
929-
clusterGetter,
930-
commonSecretStore,
931-
endpointManager,
932-
unifiedHelmReleaser,
933-
config.Cluster.Monitoring.Config,
934-
commonLogger,
935-
))
936-
}
937-
938-
if config.Cluster.Logging.Enabled {
939-
integratedServiceManagers = append(integratedServiceManagers, integratedServiceLogging.MakeIntegratedServiceManager(
940-
clusterGetter,
941-
commonSecretStore,
942-
endpointManager,
943-
config.Cluster.Logging.Config,
944-
commonLogger,
945-
))
946-
}
947-
948923
if config.Cluster.SecurityScan.Enabled {
949924
customAnchoreConfigProvider := securityscan.NewCustomAnchoreConfigProvider(
950925
featureRepository,

‎cmd/worker/BUILD.plz

-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ go_binary(
3131
"//internal/cluster/distribution/pke/pkeaws/pkeawsprovider/workflow",
3232
"//internal/cluster/distribution/pke/pkeaws/pkeawsworkflow",
3333
"//internal/cluster/dns",
34-
"//internal/cluster/endpoints",
3534
"//internal/cluster/infrastructure/aws/awsworkflow",
3635
"//internal/cluster/kubernetes",
3736
"//internal/cluster/workflow",
@@ -56,8 +55,6 @@ go_binary(
5655
"//internal/integratedservices/services/expiry/adapter/workflow",
5756
"//internal/integratedservices/services/ingress",
5857
"//internal/integratedservices/services/ingress/ingressadapter",
59-
"//internal/integratedservices/services/logging",
60-
"//internal/integratedservices/services/monitoring",
6158
"//internal/integratedservices/services/securityscan",
6259
"//internal/integratedservices/services/securityscan/securityscanadapter",
6360
"//internal/integratedservices/services/vault",
@@ -155,7 +152,6 @@ go_test(
155152
"//internal/cluster/distribution/pke/pkeaws/pkeawsprovider/workflow",
156153
"//internal/cluster/distribution/pke/pkeaws/pkeawsworkflow",
157154
"//internal/cluster/dns",
158-
"//internal/cluster/endpoints",
159155
"//internal/cluster/infrastructure/aws/awsworkflow",
160156
"//internal/cluster/kubernetes",
161157
"//internal/cluster/workflow",
@@ -180,8 +176,6 @@ go_test(
180176
"//internal/integratedservices/services/expiry/adapter/workflow",
181177
"//internal/integratedservices/services/ingress",
182178
"//internal/integratedservices/services/ingress/ingressadapter",
183-
"//internal/integratedservices/services/logging",
184-
"//internal/integratedservices/services/monitoring",
185179
"//internal/integratedservices/services/securityscan",
186180
"//internal/integratedservices/services/securityscan/securityscanadapter",
187181
"//internal/integratedservices/services/vault",

‎cmd/worker/main.go

-24
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import (
5858
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws"
5959
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws/pkeawsadapter"
6060
intClusterDNS "github.com/banzaicloud/pipeline/internal/cluster/dns"
61-
"github.com/banzaicloud/pipeline/internal/cluster/endpoints"
6261
intClusterK8s "github.com/banzaicloud/pipeline/internal/cluster/kubernetes"
6362
intClusterWorkflow "github.com/banzaicloud/pipeline/internal/cluster/workflow"
6463
"github.com/banzaicloud/pipeline/internal/clustergroup"
@@ -82,8 +81,6 @@ import (
8281
expiryWorkflow "github.com/banzaicloud/pipeline/internal/integratedservices/services/expiry/adapter/workflow"
8382
intsvcingress "github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress"
8483
intsvcingressadapter "github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress/ingressadapter"
85-
integratedServiceLogging "github.com/banzaicloud/pipeline/internal/integratedservices/services/logging"
86-
integratedServiceMonitoring "github.com/banzaicloud/pipeline/internal/integratedservices/services/monitoring"
8784
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan"
8885
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan/securityscanadapter"
8986
integratedServiceVault "github.com/banzaicloud/pipeline/internal/integratedservices/services/vault"
@@ -668,7 +665,6 @@ func main() {
668665

669666
clusterGetter := integratedserviceadapter.MakeClusterGetter(clusterManager)
670667
clusterService := integratedserviceadapter.NewClusterService(clusterManager)
671-
endpointManager := endpoints.NewEndpointManager(logger)
672668
orgDomainService := dnsadapter.NewOrgDomainService(
673669
config.Cluster.DNS.BaseDomain,
674670
dnsSvc,
@@ -736,26 +732,6 @@ func main() {
736732
config.Cluster.Vault.Config,
737733
logger,
738734
),
739-
integratedServiceMonitoring.MakeIntegratedServiceOperator(
740-
clusterGetter,
741-
clusterService,
742-
unifiedHelmReleaser,
743-
kubernetesService,
744-
config.Cluster.Monitoring.Config,
745-
logger,
746-
commonSecretStore,
747-
integratedServiceMonitoring.Migrate,
748-
),
749-
integratedServiceLogging.MakeIntegratedServicesOperator(
750-
clusterGetter,
751-
clusterService,
752-
unifiedHelmReleaser,
753-
kubernetesService,
754-
endpointManager,
755-
config.Cluster.Logging.Config,
756-
logger,
757-
commonSecretStore,
758-
),
759735
expiry.NewExpiryServiceOperator(expirerService, services.BindIntegratedServiceSpec, logger),
760736
intsvcingress.NewOperator(
761737
intsvcingressadapter.NewOperatorClusterStore(clusterStore),

‎config/config.yaml.dist

-45
Original file line numberDiff line numberDiff line change
@@ -184,51 +184,6 @@ dex:
184184
# # See https://github.com/banzaicloud/bank-vaults/tree/master/charts/vault-secrets-webhook for details
185185
# values: {}
186186
#
187-
# monitoring:
188-
# enabled: true
189-
#
190-
# # Inherited from cluster.namespace when empty
191-
# namespace: ""
192-
#
193-
# grafana:
194-
# adminUser: admin
195-
#
196-
# charts:
197-
# operator:
198-
# chart: "prometheus-community/kube-prometheus-stack"
199-
# version: "12.11.3"
200-
#
201-
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack for details
202-
# values: {}
203-
#
204-
# pushgateway:
205-
# chart: "prometheus-community/prometheus-pushgateway"
206-
# version: "1.5.1"
207-
#
208-
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-pushgateway for details
209-
# values: {}
210-
#
211-
# logging:
212-
# enabled: true
213-
#
214-
# # Inherited from cluster.namespace when empty
215-
# namespace: ""
216-
#
217-
# charts:
218-
# operator:
219-
# chart: "banzaicloud-stable/logging-operator"
220-
# version: "2.7.2"
221-
#
222-
# # See https://github.com/banzaicloud/logging-operator/tree/master/charts/logging-operator for details
223-
# values: {}
224-
#
225-
# loki:
226-
# chart: "banzaicloud-stable/loki"
227-
# version: "0.17.4"
228-
#
229-
# # See https://github.com/banzaicloud/banzai-charts/tree/master/loki for details
230-
# values: {}
231-
#
232187
# dns:
233188
# enabled: true
234189
#

‎internal/cmd/BUILD.plz

-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ go_library(
1313
"//internal/integratedservices/operator",
1414
"//internal/integratedservices/services/dns",
1515
"//internal/integratedservices/services/ingress",
16-
"//internal/integratedservices/services/logging",
17-
"//internal/integratedservices/services/monitoring",
1816
"//internal/integratedservices/services/securityscan",
1917
"//internal/integratedservices/services/vault",
2018
"//internal/platform/cadence",
@@ -43,8 +41,6 @@ go_test(
4341
"//internal/integratedservices/operator",
4442
"//internal/integratedservices/services/dns",
4543
"//internal/integratedservices/services/ingress",
46-
"//internal/integratedservices/services/logging",
47-
"//internal/integratedservices/services/monitoring",
4844
"//internal/integratedservices/services/securityscan",
4945
"//internal/integratedservices/services/vault",
5046
"//internal/platform/cadence",

‎internal/cmd/config.go

-52
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727
"github.com/banzaicloud/pipeline/internal/integratedservices/operator"
2828
"github.com/banzaicloud/pipeline/internal/integratedservices/services/dns"
2929
"github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress"
30-
"github.com/banzaicloud/pipeline/internal/integratedservices/services/logging"
31-
"github.com/banzaicloud/pipeline/internal/integratedservices/services/monitoring"
3230
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan"
3331
"github.com/banzaicloud/pipeline/internal/integratedservices/services/vault"
3432
"github.com/banzaicloud/pipeline/internal/platform/cadence"
@@ -206,10 +204,6 @@ type ClusterConfig struct {
206204
// Initial manifest
207205
Manifest string
208206

209-
Monitoring ClusterMonitoringConfig
210-
211-
Logging ClusterLoggingConfig
212-
213207
// Namespace to install Pipeline components to
214208
Namespace string
215209

@@ -233,8 +227,6 @@ func (c ClusterConfig) Validate() error {
233227

234228
errs = errors.Append(errs, c.Labels.Validate())
235229

236-
errs = errors.Append(errs, c.Logging.Validate())
237-
238230
if c.Manifest != "" {
239231
file, err := os.OpenFile(c.Manifest, os.O_RDONLY, 0666)
240232
_ = file.Close()
@@ -243,8 +235,6 @@ func (c ClusterConfig) Validate() error {
243235
}
244236
}
245237

246-
errs = errors.Append(errs, c.Monitoring.Validate())
247-
248238
if c.Namespace == "" {
249239
errs = errors.Append(errs, errors.New("cluster namespace is required"))
250240
}
@@ -278,14 +268,6 @@ func (c *ClusterConfig) Process() error {
278268
c.Labels.Namespace = c.Namespace
279269
}
280270

281-
if c.Logging.Namespace == "" {
282-
c.Logging.Namespace = c.Namespace
283-
}
284-
285-
if c.Monitoring.Namespace == "" {
286-
c.Monitoring.Namespace = c.Namespace
287-
}
288-
289271
if c.SecurityScan.PipelineNamespace == "" {
290272
c.SecurityScan.PipelineNamespace = c.Namespace
291273
}
@@ -389,40 +371,6 @@ func (c ClusterIngressConfig) Validate() error {
389371
return errs
390372
}
391373

392-
// ClusterLoggingConfig contains cluster logging configuration.
393-
type ClusterLoggingConfig struct {
394-
Enabled bool
395-
396-
logging.Config `mapstructure:",squash"`
397-
}
398-
399-
func (c ClusterLoggingConfig) Validate() error {
400-
var errs error
401-
402-
if c.Enabled {
403-
errs = errors.Append(errs, c.Config.Validate())
404-
}
405-
406-
return errs
407-
}
408-
409-
// ClusterMonitoringConfig contains cluster monitoring configuration.
410-
type ClusterMonitoringConfig struct {
411-
Enabled bool
412-
413-
monitoring.Config `mapstructure:",squash"`
414-
}
415-
416-
func (c ClusterMonitoringConfig) Validate() error {
417-
var errs error
418-
419-
if c.Enabled {
420-
errs = errors.Append(errs, c.Config.Validate())
421-
}
422-
423-
return errs
424-
}
425-
426374
// ClusterSecurityScanConfig contains cluster security scan configuration.
427375
type ClusterSecurityScanConfig struct {
428376
Enabled bool

0 commit comments

Comments
 (0)