Merge remote-tracking branch 'origin/improve-cache-interface' into improve-cache-interface

# Conflicts:
#	operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ControllerResourceEventSource.java
#	sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

Author: csviri

.github/workflows/end-to-end-tests.yml

@@ -24,7 +24,7 @@ jobs:
             sleep 1
 
         - name: Create Kubernetes KinD Cluster
-          uses: container-tools/kind-action@v1.5.0
+          uses: container-tools/kind-action@v1.7.0
           with:
             cluster_name: e2e-test
             registry: false

.github/workflows/master-snapshot-release.yml

@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: true
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 jobs:
   test:

.github/workflows/pr.yml

@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: true
 on:
   pull_request:
-    branches: [ master, v2 ]
+    branches: [ main, v1 ]
   workflow_dispatch:
 jobs:
   build:

.github/workflows/release.yml

@@ -9,6 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }}
+        with:
+          ref: "v1"
+      - uses: actions/checkout@v2
+        if: ${{ startsWith(github.event.release.tag_name, 'v2.') }}
       - name: Set up Java and Maven
         uses: actions/setup-java@v2
         with:
@@ -34,6 +39,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }}
+        with:
+          ref: "v1"
+      - uses: actions/checkout@v2
+        if: ${{ startsWith(github.event.release.tag_name, 'v2.') }}
       - name: Set up Java and Maven
         uses: actions/setup-java@v2
         with:
@@ -49,7 +59,14 @@ jobs:
           git commit -m "Set new SNAPSHOT version into pom files." -a
         env:
           RELEASE_VERSION: ${{ github.event.release.tag_name }}
-      - name: Push changes
+      - name: Push changes v1
+        uses: ad-m/github-push-action@master
+        if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: "v1"
+      - name: Push changes v2
         uses: ad-m/github-push-action@master
+        if: ${{ startsWith(github.event.release.tag_name, 'v2.' ) }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}