diff --git a/README.md b/README.md index 6ba392942..d399e137a 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,4 @@ See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md). See the [LICENSE file](./LICENSE). + diff --git a/pkg/feature/log.go b/pkg/feature/log.go index 81326b314..0351a2115 100644 --- a/pkg/feature/log.go +++ b/pkg/feature/log.go @@ -28,6 +28,7 @@ var loggerKeys = []types.Key{ types.KeyObjKindGroup, types.KeyCrdKindGroup, types.KeyBusolaKindGroup, + types.KeyLandscape, } func attributesToLogger(attributes map[string]interface{}, logger logr.Logger) logr.Logger { diff --git a/pkg/feature/testdata/apiDisabled.yaml b/pkg/feature/testdata/apiDisabled.yaml index b1d3a35c5..7eb621b7f 100644 --- a/pkg/feature/testdata/apiDisabled.yaml +++ b/pkg/feature/testdata/apiDisabled.yaml @@ -7,6 +7,9 @@ apiDisabled: - name: All APIs are disabled for trial SKR query: brokerPlan == "trial" variation: disabled + - name: Enabled on stage for global account 6034adc9-3441-494c-b438-a0eba4c5045a + query: landscape == "stage" and globalAccount == "6034adc9-3441-494c-b438-a0eba4c5045a" + variation: enabled - name: Disabled APIs on stage and prod query: feature in ["nfsBackup", "peering", "redis"] and landscape != "dev" variation: disabled diff --git a/pkg/skr/runtime/looper/runner.go b/pkg/skr/runtime/looper/runner.go index ae8e3c793..2c59f64c6 100644 --- a/pkg/skr/runtime/looper/runner.go +++ b/pkg/skr/runtime/looper/runner.go @@ -13,6 +13,7 @@ import ( "github.com/kyma-project/cloud-manager/pkg/skr/runtime/registry" "github.com/kyma-project/cloud-manager/pkg/util" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sync" @@ -129,6 +130,13 @@ func (r *skrRunner) Run(ctx context.Context, skrManager skrmanager.SkrManager, o err = fmt.Errorf("index filed error for %T: %w", indexer.Obj(), err) return } + logger. + WithValues( + "object", fmt.Sprintf("%T", indexer.Obj()), + "field", indexer.Field(), + "provider", ptr.Deref(options.provider, ""), + ). + Info("Starting indexer") } else { logger. WithValues( @@ -155,6 +163,12 @@ func (r *skrRunner) Run(ctx context.Context, skrManager skrmanager.SkrManager, o err = fmt.Errorf("setup with manager error for %T: %w", b.GetForObj(), err) return } + logger. + WithValues( + "object", fmt.Sprintf("%T", b.GetForObj()), + "provider", ptr.Deref(options.provider, ""), + ). + Info("Starting controller") } else { logger. WithValues(