Merge branch 'main' into speed-up-keb-install

cmd/runtimereconciler/main.go

@@ -6,7 +6,6 @@ import (
 
 	btpmanager "github.com/kyma-project/kyma-environment-broker/internal/btpmanager/credentials"
 	"github.com/kyma-project/kyma-environment-broker/internal/events"
-	"github.com/kyma-project/kyma-environment-broker/internal/process/input"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/sirupsen/logrus"
 	"github.com/vrischmann/envconfig"
@@ -17,7 +16,6 @@ import (
 type Config struct {
 	Database               storage.Config
 	Events                 events.Config
-	Provisioner            input.Config
 	DryRun                 bool   `envconfig:"default=true"`
 	JobEnabled             bool   `envconfig:"default=false"`
 	JobInterval            int    `envconfig:"default=24"`

resources/keb/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
-appVersion: "1.8.46"
+appVersion: "1.8.48"
 name: keb
 description:
 description: Kyma Environment Broker Helm chart for Kubernetes
-version: 1.8.46
+version: 1.8.48
 type: application

resources/keb/values.yaml

@@ -13,25 +13,25 @@ global:
       version: "v20240612-83a7c0eb" # do not update along with the other images
     kyma_environment_broker:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environments_subaccount_cleanup_job:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environment_trial_cleanup_job:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environment_expirator_job:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environment_deprovision_retrigger_job:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environment_runtime_reconciler:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
     kyma_environment_subaccount_sync:
       dir:
-      version: "1.8.46"
+      version: "1.8.48"
   kyma_environment_broker:
     enabled: false
     serviceAccountName: "kcp-kyma-environment-broker"

sec-scanners-config.yaml

@@ -1,14 +1,14 @@
 module-name: kyma-environment-broker
-rc-tag: 1.8.46
+rc-tag: 1.8.48
 protecode:
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-deprovision-retrigger-job:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environments-cleanup-job:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-runtime-reconciler:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-archiver-job:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-expirator-job:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-cleanup-job:1.8.46
-  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-sync:1.8.46
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-deprovision-retrigger-job:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environments-cleanup-job:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-runtime-reconciler:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-archiver-job:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-expirator-job:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-cleanup-job:1.8.48
+  - europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-sync:1.8.48
 whitesource:
   language: golang-mod
   subprojects: false

testing/e2e/provisioning/go.mod

@@ -4,7 +4,6 @@ go 1.22.5
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/kyma-project/control-plane/components/provisioner v0.0.0-20240529135026-c4ef757de24f
 	github.com/kyma-project/kyma-environment-broker v0.0.0-20240912070114-8408e124860d
 	github.com/ory/hydra-maester v0.0.27
 	github.com/pivotal-cf/brokerapi/v7 v7.5.0
@@ -14,57 +13,52 @@ require (
 	github.com/thanhpk/randstr v1.0.5
 	github.com/vrischmann/envconfig v1.3.0
 	golang.org/x/oauth2 v0.23.0
-	k8s.io/api v0.30.3
-	k8s.io/apimachinery v0.30.3
+	k8s.io/api v0.31.1
+	k8s.io/apimachinery v0.31.1
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	sigs.k8s.io/controller-runtime v0.18.4
 )
 
 require (
-	github.com/99designs/gqlgen v0.17.49 // indirect
-	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.2 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.4 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kyma-incubator/compass/components/director v0.0.0-20240329103248-7710e72be80a // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onrik/logrus v0.11.0 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.0 // indirect
 	github.com/onsi/gomega v1.34.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/sosodev/duration v1.3.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.16 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.23.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.30.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -73,8 +67,8 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.26.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.26.2
-	k8s.io/apiserver => k8s.io/apiserver v0.26.2
-	k8s.io/client-go => k8s.io/client-go v0.26.2
+	k8s.io/api => k8s.io/api v0.31.1
+	k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
+	k8s.io/apiserver => k8s.io/apiserver v0.31.1
+	k8s.io/client-go => k8s.io/client-go v0.31.1
 )