Merge remote-tracking branch 'upstream/main'

ukff · Oct 9, 2024 · 0c8f1e8 · 0c8f1e8
2 parents 531c497 + 368f4f2
commit 0c8f1e8
Show file tree

Hide file tree

Showing 35 changed files with 1,236 additions and 160 deletions.
diff --git a/.github/workflows/run-keb-chart-install-tests-reusable.yaml b/.github/workflows/run-keb-chart-install-tests-reusable.yaml
@@ -60,12 +60,14 @@ jobs:
           MATRIX_AS_JSON=$(echo ${VERSIONS[*]} | awk 'END {printf "{\"include\":[";for (i = 1; i < NF; i++) printf "{\"version\":%s},",$i;printf "{\"version\":%s}]}",$i }'|jq -c)
           echo "k3s_versions=${MATRIX_AS_JSON}" >> "${GITHUB_OUTPUT}"
       - name: Wait for images to be ready
+        uses: wechuli/allcheckspassed@2e5e8bbc775f5680ed5d02e3a22e2fc7219792ac
         if: ${{ inputs.release == 'false' }}
-        timeout-minutes: 7
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          ./scripts/wait_for_images.sh ${{ inputs.version }}
+        with:
+          delay: '1'
+          retries: '10'
+          polling_interval: '1'
+          checks_include: 'kyma-environment-broker-image / Build image, archiver-image / Build image, environments-cleanup-image / Build image, deprovision-retrigger-image / Build image, expirator-image / Build image, runtime-reconciler-image / Build image, subaccount-cleanup-image / Build image, subaccount-sync-image / Build image, globalaccounts-image / Build image'
+          verbose: true
 
   run-keb-chart-matrix:
     runs-on: ubuntu-latest

diff --git a/Dockerfile.globalaccounts b/Dockerfile.globalaccounts
@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.23.1-alpine3.20 AS build
+FROM golang:1.23.2-alpine3.20 AS build
 
 WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
 

diff --git a/Dockerfile.job b/Dockerfile.job
@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.23.1-alpine3.20 AS build
+FROM golang:1.23.2-alpine3.20 AS build
 
 WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
 

diff --git a/Dockerfile.keb b/Dockerfile.keb
@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.23.1-alpine3.20 AS build
+FROM golang:1.23.2-alpine3.20 AS build
 
 WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
 

diff --git a/Dockerfile.runtimereconciler b/Dockerfile.runtimereconciler
@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.23.1-alpine3.20 AS build
+FROM golang:1.23.2-alpine3.20 AS build
 
 WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
 

diff --git a/Dockerfile.schemamigrator b/Dockerfile.schemamigrator
@@ -0,0 +1,23 @@
+# Build image
+FROM golang:1.23.2-alpine3.20 AS build
+
+WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
+
+COPY cmd/schemamigrator cmd/schemamigrator
+COPY internal/schemamigrator internal/schemamigrator
+COPY go.mod go.mod
+COPY go.sum go.sum
+
+RUN go mod tidy && \
+CGO_ENABLED=0 go build -o /build/schema-migrator cmd/schemamigrator/main.go
+
+# Final image
+FROM scratch
+LABEL source=git@github.com:kyma-project/kyma-environment-broker.git
+
+WORKDIR /migrate
+
+COPY --from=build /build/schema-migrator /bin/schema-migrator
+COPY resources/keb/migrations ./migrations
+
+ENTRYPOINT ["/bin/schema-migrator"]
diff --git a/Dockerfile.subaccountsync b/Dockerfile.subaccountsync
@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.23.1-alpine3.20 AS build
+FROM golang:1.23.2-alpine3.20 AS build
 
 WORKDIR /go/src/github.com/kyma-project/kyma-environment-broker
 

diff --git a/cmd/accountcleanup/main.go b/cmd/accountcleanup/main.go
@@ -4,12 +4,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/kyma-project/control-plane/components/schema-migrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal/broker"
 	"github.com/kyma-project/kyma-environment-broker/internal/cis"
 	"github.com/kyma-project/kyma-environment-broker/internal/events"
+	"github.com/kyma-project/kyma-environment-broker/internal/schemamigrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
-
 	"github.com/sirupsen/logrus"
 	"github.com/vrischmann/envconfig"
 )

diff --git a/cmd/deprovisionretrigger/main.go b/cmd/deprovisionretrigger/main.go
@@ -7,10 +7,9 @@ import (
 	"os"
 
 	"github.com/kyma-project/kyma-environment-broker/internal"
-
-	"github.com/kyma-project/control-plane/components/schema-migrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal/broker"
 	"github.com/kyma-project/kyma-environment-broker/internal/events"
+	"github.com/kyma-project/kyma-environment-broker/internal/schemamigrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel"
 	log "github.com/sirupsen/logrus"

diff --git a/cmd/expirator/main.go b/cmd/expirator/main.go
@@ -7,10 +7,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/kyma-project/control-plane/components/schema-migrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal"
 	"github.com/kyma-project/kyma-environment-broker/internal/broker"
 	"github.com/kyma-project/kyma-environment-broker/internal/events"
+	"github.com/kyma-project/kyma-environment-broker/internal/schemamigrator/cleaner"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage/dbmodel"
 	log "github.com/sirupsen/logrus"