Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused components from Pipeline #3575

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unused components from Pipeline #3575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9407b9
remove logging & monitoring integrated services
sancyx Sep 8, 2021
14e8583
disable logging & montoring service on UI
sancyx Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cmd/pipeline/BUILD.plz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ go_binary(
"//internal/cluster/distribution/eks/eksprovider/driver",
"//internal/cluster/distribution/pke",
"//internal/cluster/distribution/pke/pkeaws/pkeawsadapter",
"//internal/cluster/endpoints",
"//internal/cluster/infrastructure/aws/awsworkflow",
"//internal/cluster/metrics/adapters/prometheus",
"//internal/clustergroup",
Expand All @@ -68,8 +67,6 @@ go_binary(
"//internal/integratedservices/services/dns/dnsadapter",
"//internal/integratedservices/services/expiry",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/securityscan/securityscanadapter",
"//internal/integratedservices/services/vault",
Expand Down Expand Up @@ -210,7 +207,6 @@ go_test(
"//internal/cluster/distribution/eks/eksprovider/driver",
"//internal/cluster/distribution/pke",
"//internal/cluster/distribution/pke/pkeaws/pkeawsadapter",
"//internal/cluster/endpoints",
"//internal/cluster/infrastructure/aws/awsworkflow",
"//internal/cluster/metrics/adapters/prometheus",
"//internal/clustergroup",
Expand All @@ -236,8 +232,6 @@ go_test(
"//internal/integratedservices/services/dns/dnsadapter",
"//internal/integratedservices/services/expiry",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/securityscan/securityscanadapter",
"//internal/integratedservices/services/vault",
Expand Down
6 changes: 0 additions & 6 deletions cmd/pipeline/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ func mapCapabilities(config configuration) cap.Capabilities {
"enabled": config.Cluster.Vault.Enabled,
"managed": config.Cluster.Vault.Managed.Enabled,
},
"monitoring": cap.Cap{
"enabled": config.Cluster.Monitoring.Enabled,
},
"logging": cap.Cap{
"enabled": config.Cluster.Logging.Enabled,
},
"dns": cap.Cap{
"enabled": config.Cluster.DNS.Enabled,
"baseDomain": config.Cluster.DNS.BaseDomain,
Expand Down
25 changes: 0 additions & 25 deletions cmd/pipeline/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ import (
eksDriver "github.com/banzaicloud/pipeline/internal/cluster/distribution/eks/eksprovider/driver"
pkeDistribution "github.com/banzaicloud/pipeline/internal/cluster/distribution/pke"
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws/pkeawsadapter"
"github.com/banzaicloud/pipeline/internal/cluster/endpoints"
"github.com/banzaicloud/pipeline/internal/cluster/infrastructure/aws/awsworkflow"
prometheusMetrics "github.com/banzaicloud/pipeline/internal/cluster/metrics/adapters/prometheus"
"github.com/banzaicloud/pipeline/internal/clustergroup"
Expand All @@ -113,8 +112,6 @@ import (
"github.com/banzaicloud/pipeline/internal/integratedservices/services/dns/dnsadapter"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/expiry"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress"
integratedServiceLogging "github.com/banzaicloud/pipeline/internal/integratedservices/services/logging"
featureMonitoring "github.com/banzaicloud/pipeline/internal/integratedservices/services/monitoring"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan/securityscanadapter"
integratedServiceVault "github.com/banzaicloud/pipeline/internal/integratedservices/services/vault"
Expand Down Expand Up @@ -881,7 +878,6 @@ func main() {
// common setup (for both legacy and V2 IS)
clusterGetter := integratedserviceadapter.MakeClusterGetter(clusterManager)
clusterPropertyGetter := dnsadapter.NewClusterPropertyGetter(clusterManager)
endpointManager := endpoints.NewEndpointManager(commonLogger)
integratedServiceManagers := make([]integratedservices.IntegratedServiceManager, 0)

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

if config.Cluster.Monitoring.Enabled {
integratedServiceManagers = append(integratedServiceManagers, featureMonitoring.MakeIntegratedServiceManager(
clusterGetter,
commonSecretStore,
endpointManager,
unifiedHelmReleaser,
config.Cluster.Monitoring.Config,
commonLogger,
))
}

if config.Cluster.Logging.Enabled {
integratedServiceManagers = append(integratedServiceManagers, integratedServiceLogging.MakeIntegratedServiceManager(
clusterGetter,
commonSecretStore,
endpointManager,
config.Cluster.Logging.Config,
commonLogger,
))
}

if config.Cluster.SecurityScan.Enabled {
customAnchoreConfigProvider := securityscan.NewCustomAnchoreConfigProvider(
featureRepository,
Expand Down
6 changes: 0 additions & 6 deletions cmd/worker/BUILD.plz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ go_binary(
"//internal/cluster/distribution/pke/pkeaws/pkeawsprovider/workflow",
"//internal/cluster/distribution/pke/pkeaws/pkeawsworkflow",
"//internal/cluster/dns",
"//internal/cluster/endpoints",
"//internal/cluster/infrastructure/aws/awsworkflow",
"//internal/cluster/kubernetes",
"//internal/cluster/workflow",
Expand All @@ -56,8 +55,6 @@ go_binary(
"//internal/integratedservices/services/expiry/adapter/workflow",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/ingress/ingressadapter",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/securityscan/securityscanadapter",
"//internal/integratedservices/services/vault",
Expand Down Expand Up @@ -155,7 +152,6 @@ go_test(
"//internal/cluster/distribution/pke/pkeaws/pkeawsprovider/workflow",
"//internal/cluster/distribution/pke/pkeaws/pkeawsworkflow",
"//internal/cluster/dns",
"//internal/cluster/endpoints",
"//internal/cluster/infrastructure/aws/awsworkflow",
"//internal/cluster/kubernetes",
"//internal/cluster/workflow",
Expand All @@ -180,8 +176,6 @@ go_test(
"//internal/integratedservices/services/expiry/adapter/workflow",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/ingress/ingressadapter",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/securityscan/securityscanadapter",
"//internal/integratedservices/services/vault",
Expand Down
24 changes: 0 additions & 24 deletions cmd/worker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import (
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws"
"github.com/banzaicloud/pipeline/internal/cluster/distribution/pke/pkeaws/pkeawsadapter"
intClusterDNS "github.com/banzaicloud/pipeline/internal/cluster/dns"
"github.com/banzaicloud/pipeline/internal/cluster/endpoints"
intClusterK8s "github.com/banzaicloud/pipeline/internal/cluster/kubernetes"
intClusterWorkflow "github.com/banzaicloud/pipeline/internal/cluster/workflow"
"github.com/banzaicloud/pipeline/internal/clustergroup"
Expand All @@ -82,8 +81,6 @@ import (
expiryWorkflow "github.com/banzaicloud/pipeline/internal/integratedservices/services/expiry/adapter/workflow"
intsvcingress "github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress"
intsvcingressadapter "github.com/banzaicloud/pipeline/internal/integratedservices/services/ingress/ingressadapter"
integratedServiceLogging "github.com/banzaicloud/pipeline/internal/integratedservices/services/logging"
integratedServiceMonitoring "github.com/banzaicloud/pipeline/internal/integratedservices/services/monitoring"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan"
"github.com/banzaicloud/pipeline/internal/integratedservices/services/securityscan/securityscanadapter"
integratedServiceVault "github.com/banzaicloud/pipeline/internal/integratedservices/services/vault"
Expand Down Expand Up @@ -668,7 +665,6 @@ func main() {

clusterGetter := integratedserviceadapter.MakeClusterGetter(clusterManager)
clusterService := integratedserviceadapter.NewClusterService(clusterManager)
endpointManager := endpoints.NewEndpointManager(logger)
orgDomainService := dnsadapter.NewOrgDomainService(
config.Cluster.DNS.BaseDomain,
dnsSvc,
Expand Down Expand Up @@ -736,26 +732,6 @@ func main() {
config.Cluster.Vault.Config,
logger,
),
integratedServiceMonitoring.MakeIntegratedServiceOperator(
clusterGetter,
clusterService,
unifiedHelmReleaser,
kubernetesService,
config.Cluster.Monitoring.Config,
logger,
commonSecretStore,
integratedServiceMonitoring.Migrate,
),
integratedServiceLogging.MakeIntegratedServicesOperator(
clusterGetter,
clusterService,
unifiedHelmReleaser,
kubernetesService,
endpointManager,
config.Cluster.Logging.Config,
logger,
commonSecretStore,
),
expiry.NewExpiryServiceOperator(expirerService, services.BindIntegratedServiceSpec, logger),
intsvcingress.NewOperator(
intsvcingressadapter.NewOperatorClusterStore(clusterStore),
Expand Down
45 changes: 0 additions & 45 deletions config/config.yaml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,51 +184,6 @@ dex:
# # See https://github.com/banzaicloud/bank-vaults/tree/master/charts/vault-secrets-webhook for details
# values: {}
#
# monitoring:
# enabled: true
#
# # Inherited from cluster.namespace when empty
# namespace: ""
#
# grafana:
# adminUser: admin
#
# charts:
# operator:
# chart: "prometheus-community/kube-prometheus-stack"
# version: "12.11.3"
#
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack for details
# values: {}
#
# pushgateway:
# chart: "prometheus-community/prometheus-pushgateway"
# version: "1.5.1"
#
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-pushgateway for details
# values: {}
#
# logging:
# enabled: true
#
# # Inherited from cluster.namespace when empty
# namespace: ""
#
# charts:
# operator:
# chart: "banzaicloud-stable/logging-operator"
# version: "2.7.2"
#
# # See https://github.com/banzaicloud/logging-operator/tree/master/charts/logging-operator for details
# values: {}
#
# loki:
# chart: "banzaicloud-stable/loki"
# version: "0.17.4"
#
# # See https://github.com/banzaicloud/banzai-charts/tree/master/loki for details
# values: {}
#
# dns:
# enabled: true
#
Expand Down
8 changes: 4 additions & 4 deletions config/ui/feature-set.json.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
},
"features": {
"monitoring": {
"enabled": true,
"enabled": false,
"createClusterFlow": {
"enabled": true
"enabled": false
}
},
"securityScan": {
Expand All @@ -93,9 +93,9 @@
"enabled": true
},
"logging": {
"enabled": true,
"enabled": false,
"createClusterFlow": {
"enabled": true
"enabled": false
}
},
"backup": {
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ require (
github.com/lestrrat-go/backoff v1.0.0
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/microcosm-cc/bluemonday v1.0.3
github.com/mitchellh/copystructure v1.0.0
github.com/mitchellh/mapstructure v1.4.1
github.com/moogar0880/problems v0.1.1
github.com/oklog/run v1.1.0
Expand Down Expand Up @@ -93,7 +92,7 @@ require (
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.5.3
k8s.io/api v0.20.9
k8s.io/apiextensions-apiserver v0.20.9
k8s.io/apiextensions-apiserver v0.20.9 // indirect
k8s.io/apimachinery v0.20.9
k8s.io/cli-runtime v0.20.9
k8s.io/client-go v0.20.9
Expand Down
4 changes: 0 additions & 4 deletions internal/cmd/BUILD.plz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ go_library(
"//internal/integratedservices/operator",
"//internal/integratedservices/services/dns",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/vault",
"//internal/platform/cadence",
Expand Down Expand Up @@ -43,8 +41,6 @@ go_test(
"//internal/integratedservices/operator",
"//internal/integratedservices/services/dns",
"//internal/integratedservices/services/ingress",
"//internal/integratedservices/services/logging",
"//internal/integratedservices/services/monitoring",
"//internal/integratedservices/services/securityscan",
"//internal/integratedservices/services/vault",
"//internal/platform/cadence",
Expand Down
Loading