Skip to content

Commit

Permalink
Merge branch 'main' into instances_per_sa_metric
Browse files Browse the repository at this point in the history
  • Loading branch information
piotrmiskiewicz authored Jan 2, 2025
2 parents 6d2acce + c1f6836 commit 00a2802
Show file tree
Hide file tree
Showing 27 changed files with 913 additions and 208 deletions.
8 changes: 5 additions & 3 deletions docs/contributor/07-10-runtime-reconciler.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ Runtime Reconciler is an application that performs reconciliation tasks on SAP B

## Details

Currently, there is one task for Runtime Reconciler. It reconciles BTP Manager Secrets on Kyma runtimes. It can do it in two ways:
Runtime Reconciler reconciles BTP Manager Secrets on Kyma runtimes with a job,
which periodically loops over all instances from the KEB database. Each instance has an existing assigned Runtime ID.
The job checks if the Secret on the Kyma runtime matches the credentials from the KEB database.

* By implementation with the usage of Runtime Watcher, which sends events about changes of the Secret from a Kyma runtime to Kyma Environment Broker (KEB) in real time.
* With a job, which periodically loops over all instances from the KEB database; each instance has an existing assigned Runtime ID; the job checks if the Secret on the Kyma runtime matches the credentials from the KEB database.
> [!NOTE]
> If you modify or delete the `sap-btp-manager` Secret, it is modified back to its previous settings or regenerated within up to 24 hours. However, if the Secret is labeled with `kyma-project.io/skip-reconciliation: "true"`, the job skips the reconciliation for this Secret.
## Prerequisites

Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ go 1.23.1

require (
code.cloudfoundry.org/lager v2.0.0+incompatible
github.com/99designs/gqlgen v0.17.60
github.com/99designs/gqlgen v0.17.62
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/adal v0.9.24
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/dlmiddlecote/sqlstats v1.0.2
github.com/docker/docker v27.4.0+incompatible
github.com/docker/docker v27.4.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/gardener/gardener v1.110.0
github.com/gardener/gardener v1.110.1
github.com/go-co-op/gocron v1.37.0
github.com/gocraft/dbr v0.0.0-20190714181702-8114670a83bd
github.com/golang-jwt/jwt/v4 v4.5.1
Expand All @@ -31,7 +31,6 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.20.5
github.com/sebdah/goldie/v2 v2.5.5
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
github.com/vrischmann/envconfig v1.3.0
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
Expand Down Expand Up @@ -104,12 +103,13 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sosodev/duration v1.3.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tidwall/gjson v1.17.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/vektah/gqlparser/v2 v2.5.20 // indirect
github.com/vektah/gqlparser/v2 v2.5.21 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
Expand All @@ -119,11 +119,11 @@ require (
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
Expand Down
24 changes: 12 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIe
code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/99designs/gqlgen v0.17.60 h1:xxl7kQDCNw79itzWQtCUSXgkovCyq9r+ogSXfZpKPYM=
github.com/99designs/gqlgen v0.17.60/go.mod h1:vQJzWXyGya2TYL7cig1G4OaCQzyck031MgYBlUwaI9I=
github.com/99designs/gqlgen v0.17.62 h1:Wovt1+XJN9dTWYh92537Y9a5FuMVSkrQL4bn0a8v5Rg=
github.com/99designs/gqlgen v0.17.62/go.mod h1:sVCM2iwIZisJjTI/DEC3fpH+HFgxY1496ZJ+jbT9IjA=
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
Expand Down Expand Up @@ -87,8 +87,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
github.com/dlmiddlecote/sqlstats v1.0.2/go.mod h1:0CWaIh/Th+z2aI6Q9Jpfg/o21zmGxWhbByHgQSCUQvY=
github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A=
github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand All @@ -109,8 +109,8 @@ github.com/gardener/cert-management v0.17.1 h1:vawZGN+rsCRMviacnnMSWELbuIJsNXHaq
github.com/gardener/cert-management v0.17.1/go.mod h1:cwSsyN935017HojKVuWqw2TBhiaxSisX132D9Tn+n9I=
github.com/gardener/etcd-druid v0.25.0 h1:mR9/x5r27pO+I+XzpNcN2DDenam+7ITrhc7qKt9rbsI=
github.com/gardener/etcd-druid v0.25.0/go.mod h1:6C0eyfdlw6CowLm/l4ZiKwrvkc+5NHrnc/rY2wCUwys=
github.com/gardener/gardener v1.110.0 h1:Ix/NeYJyYIIDRHqO0126JYPGNVKy2kDEco7RyXuCYwo=
github.com/gardener/gardener v1.110.0/go.mod h1:Ge2wQMWm0NmQZP3L/WMejpfXsnGbfTFBEZud819P3vU=
github.com/gardener/gardener v1.110.1 h1:KJFiVMlzeuJR6aToUUTlXJN6v88ACH/cWOsvX/ftX5s=
github.com/gardener/gardener v1.110.1/go.mod h1:Ge2wQMWm0NmQZP3L/WMejpfXsnGbfTFBEZud819P3vU=
github.com/gardener/machine-controller-manager v0.55.1 h1:d6mTnuYko+jWeIi7tAFWgWnL1nR5hGcI6pRCDcH0TGY=
github.com/gardener/machine-controller-manager v0.55.1/go.mod h1:eCng7De6OE15rndmMm6Q1fwMQI39esASCd3WKZ/lLmY=
github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
Expand Down Expand Up @@ -368,8 +368,8 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/vektah/gqlparser/v2 v2.5.20 h1:kPaWbhBntxoZPaNdBaIPT1Kh0i1b/onb5kXgEdP5JCo=
github.com/vektah/gqlparser/v2 v2.5.20/go.mod h1:xMl+ta8a5M1Yo1A1Iwt/k7gSpscwSnHZdw7tfhEGfTM=
github.com/vektah/gqlparser/v2 v2.5.21 h1:Zw1rG2dr1pRR4wqwbVq4d6+xk2f4ut/yo+hwr4QjE08=
github.com/vektah/gqlparser/v2 v2.5.21/go.mod h1:xMl+ta8a5M1Yo1A1Iwt/k7gSpscwSnHZdw7tfhEGfTM=
github.com/vrischmann/envconfig v1.3.0 h1:4XIvQTXznxmWMnjouj0ST5lFo/WAYf5Exgl3x82crEk=
github.com/vrischmann/envconfig v1.3.0/go.mod h1:bbvxFYJdRSpXrhS63mBFtKJzkDiNkyArOLXtY6q0kuI=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
Expand Down Expand Up @@ -432,8 +432,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -500,8 +500,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
6 changes: 0 additions & 6 deletions internal/broker/bind_envtest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/kyma-project/kyma-environment-broker/internal/kubeconfig"
"github.com/kyma-project/kyma-environment-broker/internal/storage"
"github.com/pivotal-cf/brokerapi/v8/domain"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
Expand Down Expand Up @@ -51,11 +50,6 @@ func TestCreateBinding(t *testing.T) {
err := corev1.AddToScheme(sch)
assert.NoError(t, err)

logs := logrus.New()
logs.SetLevel(logrus.DebugLevel)
logs.SetFormatter(&logrus.JSONFormatter{
TimestampFormat: time.RFC3339Nano,
})
// prepare envtest to provide valid kubeconfig
envFirst, configFirst, clientFirst := createEnvTest(t)
defer func(env *envtest.Environment) {
Expand Down
12 changes: 6 additions & 6 deletions internal/process/operation_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ func (om *OperationManager) OperationSucceeded(operation internal.Operation, des

// OperationFailed marks the operation as failed and returns status of the operation's update
func (om *OperationManager) OperationFailed(operation internal.Operation, description string, err error, log *slog.Logger) (internal.Operation, time.Duration, error) {
operation.LastError = kebErr.LastError{
Reason: kebErr.Reason(description),
Component: om.component,
Step: om.step,
}
if err != nil {
operation.LastError = kebErr.LastError{
Message: err.Error(),
Reason: kebErr.Reason(description),
Component: om.component,
Step: om.step,
}
operation.LastError.Message = err.Error()
}

op, t, _ := om.update(operation, domain.Failed, description, log)
Expand Down
10 changes: 5 additions & 5 deletions internal/process/operation_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ func Test_OperationManager_LastError(t *testing.T) {
err := operations.InsertOperation(op)
require.NoError(t, err)
op, _, err = opManager.OperationFailed(op, "friendly message", nil, fixLogger())
assert.EqualValues(t, "", op.LastError.GetComponent())
assert.EqualValues(t, "provisioner", op.LastError.GetComponent())
assert.EqualValues(t, "", op.LastError.Error())
assert.EqualValues(t, "", op.LastError.GetReason())
assert.EqualValues(t, "", op.LastError.GetStep())
assert.EqualValues(t, "friendly message", op.LastError.GetReason())
assert.EqualValues(t, "some_step", op.LastError.GetStep())
})

t.Run("when no description passed", func(t *testing.T) {
Expand All @@ -146,10 +146,10 @@ func Test_OperationManager_LastError(t *testing.T) {
err := operations.InsertOperation(op)
require.NoError(t, err)
op, _, err = opManager.OperationFailed(op, "", nil, fixLogger())
assert.EqualValues(t, "", op.LastError.GetComponent())
assert.EqualValues(t, "reconciler", op.LastError.GetComponent())
assert.EqualValues(t, "", op.LastError.Error())
assert.EqualValues(t, "", op.LastError.GetReason())
assert.EqualValues(t, "", op.LastError.GetStep())
assert.EqualValues(t, "some_step", op.LastError.GetStep())
})
}

Expand Down
1 change: 0 additions & 1 deletion internal/process/staged_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ func (m *StagedManager) runStep(step Step, operation internal.Operation, logger
stepLogger := logger.With("step", step.Name(), "operation", processedOperation.ID)
processedOperation, backoff, err = step.Run(processedOperation, stepLogger)
if err != nil {
processedOperation.LastError = kebError.ReasonForError(err, step.Name())
logOperation := stepLogger.With("error_component", processedOperation.LastError.GetComponent(), "error_reason", processedOperation.LastError.GetReason())
logOperation.Warn(fmt.Sprintf("Last error from step: %s", processedOperation.LastError.Error()))
// only save to storage, skip for alerting if error
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ func (p *AzureLiteInputProvider) Provide() Values {
DefaultMachineType: machineType,
Region: region,
Purpose: p.Purpose,
DiskType: "Standard_LRS",
VolumeSizeGb: 50,
DiskType: "StandardSSD_LRS",
VolumeSizeGb: 80,
}
}

Expand Down
4 changes: 2 additions & 2 deletions internal/provider/azure_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ func (p *AzureLiteInput) Defaults() *gqlschema.ClusterConfigInput {
}
return &gqlschema.ClusterConfigInput{
GardenerConfig: &gqlschema.GardenerConfigInput{
DiskType: ptr.String("Standard_LRS"),
VolumeSizeGb: ptr.Integer(50),
DiskType: ptr.String("StandardSSD_LRS"),
VolumeSizeGb: ptr.Integer(80),
MachineType: machineType,
Region: DefaultAzureRegion,
Provider: "azure",
Expand Down
8 changes: 4 additions & 4 deletions internal/provider/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ func TestAzureLiteDefaults(t *testing.T) {
DefaultMachineType: "Standard_D4s_v5",
Region: "eastus",
Purpose: "evaluation",
DiskType: "Standard_LRS",
VolumeSizeGb: 50,
DiskType: "StandardSSD_LRS",
VolumeSizeGb: 80,
}, values)
}

Expand Down Expand Up @@ -203,7 +203,7 @@ func TestAzureLiteSpecific(t *testing.T) {
DefaultMachineType: "Standard_D4s_v5",
Region: "uksouth",
Purpose: "evaluation",
DiskType: "Standard_LRS",
VolumeSizeGb: 50,
DiskType: "StandardSSD_LRS",
VolumeSizeGb: 80,
}, values)
}
4 changes: 2 additions & 2 deletions resources/keb/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: "1.11.0"
appVersion: "1.11.5"
name: keb
description:
description: Kyma Environment Broker Helm chart for Kubernetes
version: 1.11.0
version: 1.11.5
type: application
6 changes: 3 additions & 3 deletions resources/keb/templates/runtime-reconciler-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ metadata:
name: runtime-reconciler
namespace: kcp-system
labels:
app: runtime-reconciler
app.kubernetes.io/name: runtime-reconciler
spec:
replicas: 1
selector:
matchLabels:
app: runtime-reconciler
app.kubernetes.io/name: runtime-reconciler
template:
metadata:
labels:
app: runtime-reconciler
app.kubernetes.io/name: runtime-reconciler
spec:
serviceAccountName: {{ .Values.global.kyma_environment_broker.serviceAccountName }}
{{- with .Values.deployment.securityContext }}
Expand Down
20 changes: 10 additions & 10 deletions resources/keb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ global:
path: europe-docker.pkg.dev/kyma-project/prod
kyma_environment_broker:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_broker_schema_migrator:
dir:
version: 1.11.0
version: 1.11.5
kyma_environments_subaccount_cleanup_job:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_trial_cleanup_job:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_expirator_job:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_deprovision_retrigger_job:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_runtime_reconciler:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_subaccount_sync:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_globalaccounts:
dir:
version: "1.11.0"
version: "1.11.5"
kyma_environment_service_binding_cleanup_job:
dir:
version: 1.11.0
version: 1.11.5

kyma_environment_broker:
serviceAccountName: "kcp-kyma-environment-broker"
Expand Down
24 changes: 12 additions & 12 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module-name: kyma-environment-broker
rc-tag: 1.11.0
rc-tag: 1.11.5
protecode:
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-deprovision-retrigger-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environments-cleanup-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-runtime-reconciler:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-archiver-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-expirator-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-cleanup-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-sync:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker-globalaccounts:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker-schema-migrator:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-service-binding-cleanup-job:1.11.0
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-deprovision-retrigger-job:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environments-cleanup-job:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-runtime-reconciler:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-archiver-job:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-expirator-job:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-cleanup-job:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-subaccount-sync:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker-globalaccounts:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-broker-schema-migrator:1.11.5
- europe-docker.pkg.dev/kyma-project/prod/kyma-environment-service-binding-cleanup-job:1.11.5
whitesource:
language: golang-mod
subprojects: false
Expand Down
18 changes: 18 additions & 0 deletions testing/e2e/skr-tester/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Make targets to build skr-tester artifacts
#

ifndef ARTIFACTS
ARTIFACTS = .
endif

build: $(foreach TOOL,skr-tester,$(foreach OS,linux windows darwin,build-$(OS)-$(TOOL)))

build-windows-%:
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o $(ARTIFACTS)/$*.exe $(CLI_FLAGS) cmd/main.go

build-linux-%:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $(ARTIFACTS)/$*-linux $(CLI_FLAGS) cmd/main.go

build-darwin-%:
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o $(ARTIFACTS)/$*-darwin $(CLI_FLAGS) cmd/main.go
Loading

0 comments on commit 00a2802

Please sign in to comment.