Merge remote-tracking branch 'upstream/main' into enable-another-batc…

…h-of-linters
kyma-project · Dec 14, 2023 · 00309fd · 00309fd
2 parents df6ebd1 + e7a0190
commit 00309fd
Show file tree

Hide file tree

Showing 45 changed files with 739 additions and 265 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       name:
-        description: 'Release name'
+        description: 'Release name ( e.g. "2.1.3" )'
         default: ""
         required: true
 
 jobs:
   verify-head-status:
-    name: Verify head
+    name: Verify head (image version and prow job)
     runs-on: ubuntu-latest
 
     steps:
@@ -19,18 +19,22 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Check tag
-        run: ./scripts/check_release_tag.sh ${{ github.event.inputs.name }}
-
-      - name: Check image
-        run: ./scripts/check_image.sh ${{ github.ref_name }}
-
-      - name: Verify
-        run: ./scripts/verify-status.sh ${{ github.ref_name }}
-
-          #  run-unit-tests:
-          #    name: Unit tests
-          #    needs: verify-head-status
+      - name: Verify that the current branch has a name that starts with 'release-'
+        run: |
+          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          if [[ "$CURRENT_BRANCH" == release-* ]]; then
+            echo "Branch name starts with 'release-'."
+          else
+            echo "Branch name does not start with 'release-'."
+            exit 1
+          fi
+
+      - name: Check image Tag
+        run: ./scripts/check_tag_info.sh ${{ github.event.inputs.name }}
+
+        #  run-unit-tests:
+        #    name: Unit tests
+        #    needs: verify-head-status
         #    uses: "./.github/workflows/run-unit-tests.yaml"
 
   create-draft:
@@ -62,6 +66,9 @@ jobs:
           git tag ${{ github.event.inputs.name }}
           git push origin ${{ github.event.inputs.name }}
 
+      - name: Verify job status
+        run: ./scripts/verify-status.sh ${{ github.ref_name }} 600 10 30
+
     outputs:
       release_id: ${{ steps.create-draft.outputs.release_id }}
 
@@ -84,4 +91,4 @@ jobs:
       - name: Publish release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./scripts/publish_release.sh ${{ needs.create-draft.outputs.release_id }}
+        run: ./scripts/publish_release.sh ${{ needs.create-draft.outputs.release_id }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -7,11 +7,13 @@ env:
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - 'sec-scanners-config.yaml'
+      - "docs/**"
+      - "**.md"
+      - "sec-scanners-config.yaml"
 
 jobs:
   nats:
@@ -59,7 +61,7 @@ jobs:
 
       - name: Setup and test the eventing-manager
         run: |
-          make e2e-setup 
+          make e2e-setup
 
       - name: Setup eventing
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,11 +2,13 @@ name: golangci-lint
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - 'sec-scanners-config.yaml'
+      - "docs/**"
+      - "**.md"
+      - "sec-scanners-config.yaml"
 
 permissions:
   contents: read
@@ -17,9 +19,9 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: "1.21"
           cache: false
       - uses: actions/checkout@v4
       - name: golangci-lint

diff --git a/.github/workflows/sink.yml b/.github/workflows/sink.yml
@@ -10,17 +10,19 @@ env:
 on:
   push:
     branches:
-    - main
-    tags: [ '*.*.*' ]
+      - main
+      - "release-*"
+    tags: ["*.*.*"]
     paths:
-      - 'hack/e2e/sink/**'
-      - '.github/workflows/sink.yml'
+      - "hack/e2e/sink/**"
+      - ".github/workflows/sink.yml"
   pull_request:
     branches:
-    - main
+      - main
+      - "release-*"
     paths:
-      - 'hack/e2e/sink/**'
-      - '.github/workflows/sink.yml'
+      - "hack/e2e/sink/**"
+      - ".github/workflows/sink.yml"
 
 jobs:
   build:
@@ -32,51 +34,51 @@ jobs:
         working-directory: ${{ env.E2E_SINK_DIR }}
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: 1.19
-        cache: true
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.19
+          cache: true
 
-    - name: Build
-      run: go build -v ./...
+      - name: Build
+        run: go build -v ./...
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-    # Login against a Docker registry except on PR
-    # https://github.com/docker/login-action
-    - name: Log into registry ${{ env.REGISTRY }}
-      # if: github.event_name != 'pull_request'
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        # if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Extract Docker metadata
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        tags: |
-          type=sha
-          type=semver,pattern={{version}},event=tag
-        labels: |
-          org.opencontainers.image.title=E2E Tests Sink
-          org.opencontainers.image.description=A webserver imitating an eventing sink that receives events and stores in memory
-          org.opencontainers.image.url=https://github.com/kyma-project/eventing-manager/${{ env.E2E_SINK_DIR }}
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha
+            type=semver,pattern={{version}},event=tag
+          labels: |
+            org.opencontainers.image.title=E2E Tests Sink
+            org.opencontainers.image.description=A webserver imitating an eventing sink that receives events and stores in memory
+            org.opencontainers.image.url=https://github.com/kyma-project/eventing-manager/${{ env.E2E_SINK_DIR }}
 
-    - name: Build Docker image
-      id: build-and-push
-      uses: docker/build-push-action@v5
-      with:
-        context: ${{ env.E2E_SINK_DIR }}
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        load: ${{ github.event_name == 'pull_request' }}
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
+      - name: Build Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ env.E2E_SINK_DIR }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          load: ${{ github.event_name == 'pull_request' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,27 +6,31 @@ env:
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - 'sec-scanners-config.yaml'
+      - "docs/**"
+      - "**.md"
+      - "sec-scanners-config.yaml"
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - 'sec-scanners-config.yaml'
+      - "docs/**"
+      - "**.md"
+      - "sec-scanners-config.yaml"
 
 jobs:
   unit:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: "1.21"
           cache: false
       - name: Sync GO dependencies
         run: |

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -6,15 +6,19 @@ env:
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths:
-      - 'api/**'
-      - 'config/crd/**'
+      - "api/**"
+      - "config/crd/**"
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - "release-*"
     paths:
-      - 'api/**'
-      - 'config/crd/**'
+      - "api/**"
+      - "config/crd/**"
 
 jobs:
   crd:

diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,5 @@ module-template.yaml
 eventing-manager.yaml
 module-config.yaml
 
-.env.dev
+**/.env
+**/.env.dev
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -131,6 +131,8 @@ linters-settings:
         alias: kctrl
       - pkg: sigs.k8s.io/controller-runtime/pkg/log
         alias: kctrllog
+      - pkg: sigs.k8s.io/controller-runtime/pkg/client
+        alias: kctrlclient
       - pkg: k8s.io/api/autoscaling/v1
         alias: kautoscalingv1
       - pkg: k8s.io/api/autoscaling/v2

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -8,3 +8,11 @@
 * @kyma-project/eventing
 
 *.md @kyma-project/technical-writers
+
+*.sh @kyma-project/eventing @the1bit
+
+/.github/ @kyma-project/eventing @the1bit
+
+/.version @kyma-project/eventing @the1bit
+
+/.sec-scanners-config.yaml @kyma-project/eventing @the1bit
diff --git a/Makefile b/Makefile
@@ -331,3 +331,8 @@ $(TABLE_GEN): $(LOCALBIN)
 .PHONY: crd-docs-gen
 crd-docs-gen: tablegen ## Generates CRD spec into docs folder
 	${TABLE_GEN} --crd-filename ./config/crd/bases/operator.kyma-project.io_eventings.yaml --md-filename ./docs/user/02-configuration.md
+
+# clean-testcache cleans the go test cache.
+.PHONY: clean-testcache
+clean-testcache:
+	go clean -testcache