Skip to content

Cleanup additional properties monitoring #2097

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions cmd/broker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/kyma-project/kyma-environment-broker/common/hyperscaler/rules"
pkg "github.com/kyma-project/kyma-environment-broker/common/runtime"
"github.com/kyma-project/kyma-environment-broker/internal"
"github.com/kyma-project/kyma-environment-broker/internal/additionalproperties"
"github.com/kyma-project/kyma-environment-broker/internal/appinfo"
"github.com/kyma-project/kyma-environment-broker/internal/broker"
brokerBindings "github.com/kyma-project/kyma-environment-broker/internal/broker/bindings"
Expand Down Expand Up @@ -240,11 +239,6 @@ func main() {
fatalOnError(err, log)
skrK8sClientProvider := kubeconfig.NewK8sClientFromSecretProvider(kcpK8sClient)

if cfg.Broker.MonitorAdditionalProperties {
err := os.MkdirAll(cfg.Broker.AdditionalPropertiesPath, os.ModePerm)
fatalOnError(err, log)
}

// create storage
cipher := storage.NewEncrypter(cfg.Database.SecretKey)
var db storage.BrokerStorage
Expand Down Expand Up @@ -374,10 +368,6 @@ func main() {
log)
runtimeHandler.AttachRoutes(router)

// create list requests with additional properties endpoint
additionalPropertiesHandler := additionalproperties.NewHandler(log, cfg.Broker.AdditionalPropertiesPath)
additionalPropertiesHandler.AttachRoutes(router)

// create expiration endpoint
expirationHandler := expiration.NewHandler(db.Instances(), db.Operations(), deprovisionQueue, log)
expirationHandler.AttachRoutes(router)
Expand Down
1 change: 0 additions & 1 deletion docs/contributor/02-30-keb-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Kyma Environment Broker (KEB) binary allows you to override some configuration p
| **APP_BROKER_FREE_&#x200b;EXPIRATION_PERIOD** | <code>720h</code> | Determines when to show expiration info to users |
| **APP_BROKER_GARDENER_&#x200b;SEEDS_CACHE_CONFIG_&#x200b;MAP_NAME** | None | - |
| **APP_BROKER_INCLUDE_&#x200b;ADDITIONAL_PARAMS_&#x200b;IN_SCHEMA** | <code>false</code> | If true, additional (advanced or less common) parameters are included in the provisioning schema for service plans |
| **APP_BROKER_MONITOR_&#x200b;ADDITIONAL_&#x200b;PROPERTIES** | <code>false</code> | If true, collects properties from the provisioning request that are not explicitly defined in the schema and stores them in persistent storage |
| **APP_BROKER_ONLY_ONE_&#x200b;FREE_PER_GA** | <code>false</code> | If true, restricts each global account to only one free (freemium) Kyma runtime. When enabled, provisioning another free environment for the same global account is blocked even if the previous one is deprovisioned |
| **APP_BROKER_ONLY_&#x200b;SINGLE_TRIAL_PER_GA** | <code>true</code> | If true, restricts each global account to only one active trial Kyma runtime at a time When enabled, provisioning another trial environment for the same global account is blocked until the previous one is deprovisioned |
| **APP_BROKER_&#x200b;OPERATION_TIMEOUT** | <code>7h</code> | Maximum allowed duration for processing a single operation (provisioning, deprovisioning, etc.) If the operation exceeds this timeout, it is marked as failed. Example: "7h" for 7 hours |
Expand Down
114 changes: 0 additions & 114 deletions internal/additionalproperties/handler.go

This file was deleted.

212 changes: 0 additions & 212 deletions internal/additionalproperties/handler_test.go

This file was deleted.

2 changes: 0 additions & 2 deletions internal/broker/broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ type Config struct {

UseAdditionalOIDCSchema bool `envconfig:"default=false"`

MonitorAdditionalProperties bool `envconfig:"default=false"`
AdditionalPropertiesPath string `envconfig:"default=/additional-properties"`
GardenerSeedsCacheConfigMapName string `envconfig:"default=gardener-seeds-cache"`
}

Expand Down
Loading
Loading