Merge branch 'main' into ken/ns-delete2

.circleci/config.yml

@@ -3,15 +3,6 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2.1
 jobs:
-  integration-test:
-    machine: true
-    steps:
-      - checkout
-      - run: echo 'export INTEGRATION_OUTPUT_JUNIT="true"' >> $BASH_ENV
-      - run: ./test/run_tests.sh integration-test
-      - store_test_results:
-          path: reports/
-
   e2e-test:
     machine: true
     steps:
@@ -23,31 +14,8 @@ jobs:
       - store_artifacts:
           path: kind-logs.tar.bz2
 
-  lint:
-    docker:
-      - image: kudobuilder/golang:1.18
-    working_directory: /go/src/github.com/kudobuilder/kuttl
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - go-mod-v1-{{ checksum "go.sum" }}
-      - run: make lint
-      - run: ./hack/verify-generate.sh
-      - run: ./hack/verify-go-clean.sh
-      - save_cache:
-          key: go-mod-v1-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg/mod"
-            - "/go/bin"
 workflows:
   version: 2
-  lint:
-    jobs:
-      - lint
-  integration-test:
-    jobs:
-      - integration-test
   e2e-test:
     jobs:
       - e2e-test

.github/workflows/integration-test.yml

@@ -2,9 +2,13 @@ name: "Integration tests"
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
 
 jobs:
   integration-tests:

.github/workflows/lint.yml

@@ -2,9 +2,13 @@ name: "Lint code"
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
 
 jobs:
   lint:

.github/workflows/unittest.yml

@@ -2,9 +2,13 @@ name: "Unit tests"
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - releases/*
 
 jobs:
   unit-tests:

README.md

@@ -2,7 +2,10 @@
 
 <img src="https://kuttl.dev/images/kuttl-horizontal-logo.png" width="256">
 
-[![CircleCI](https://circleci.com/gh/kudobuilder/kuttl.svg?style=svg)](https://circleci.com/gh/kudobuilder/kuttl)
+[![lint](https://github.com/kudobuilder/kuttl/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/kudobuilder/kuttl/actions)
+[![unit test](https://github.com/kudobuilder/kuttl/actions/workflows/unittest.yml/badge.svg?branch=main)](https://github.com/kudobuilder/kuttl/actions)
+[![integration-test](https://github.com/kudobuilder/kuttl/actions/workflows/integration-test.yml/badge.svg?branch=main)](https://github.com/kudobuilder/kuttl/actions)
+[![e2e](https://github.com/kudobuilder/kuttl/actions/workflows/e2e.yml/badge.svg?branch=main)](https://github.com/kudobuilder/kuttl/actions)
 
 KUbernetes Test TooL (KUTTL) provides a declarative approach to test Kubernetes Operators.
 

RELEASE.md

@@ -75,9 +75,6 @@ This process will create a `dist` folder with all the build artifacts. The chang
 
 The docker release is accomplished by `make docker-release`.  Details on what is required are provided in [Docker.md](DOCKER.md).
 
-### Cutting a Release Branch
-
-As outlined above, when it is necessary to create a new release branch, it is necessary to update the [circle-ci config](https://github.com/kudobuilder/kuttl/blob/main/.circle-ci/config.yml#L13) to test merges against the correct branch. It is necessary replace all references to `main` with the appropriate release branch.
 
 ### Cutting a Patch Release