From c47c6dbde2d59069fd2256513eb45d7895673fdc Mon Sep 17 00:00:00 2001 From: hagay3 Date: Sun, 29 May 2022 10:11:27 +0300 Subject: [PATCH 1/5] ci: add v1.21 v1.22 v1.23 v1.24 --- build.sbt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8ab866b8..1d70dffd 100644 --- a/build.sbt +++ b/build.sbt @@ -107,7 +107,11 @@ inThisBuild(List( githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "It/compile"))), githubWorkflowAddedJobs := Seq( workflowJobMinikube(jobName = "integration-kubernetes-v1-19", k8sServerVersion = "v1.19.6"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11") + workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11"), + workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5"), + workflowJobMinikube(jobName = "integration-kubernetes-v1-22", k8sServerVersion = "v1.22.1"), + workflowJobMinikube(jobName = "integration-kubernetes-v1-23", k8sServerVersion = "v1.23.6"), + workflowJobMinikube(jobName = "integration-kubernetes-v1-24", k8sServerVersion = "v1.24.1") ), githubWorkflowPublish := Seq( WorkflowStep.Sbt( From 3c1516bbfb8288129d1095d4eb4974b110b5a80d Mon Sep 17 00:00:00 2001 From: hagay3 Date: Sun, 29 May 2022 10:19:56 +0300 Subject: [PATCH 2/5] ci: add v1.21 v1.22 v1.23 v1.24 --- .github/workflows/ci.yml | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c912904..4baf8016 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,3 +162,83 @@ jobs: github token: ${{ secrets.GITHUB_TOKEN }} - run: sbt ++${{ matrix.scala }} It/test + + integration-kubernetes-v1-21: + name: integration-kubernetes-v1-21 + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.4] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v2 + + - uses: manusa/actions-setup-minikube@v2.5.0 + with: + minikube version: v1.23.2 + kubernetes version: v1.21.5 + github token: ${{ secrets.GITHUB_TOKEN }} + + - run: sbt ++${{ matrix.scala }} It/test + + integration-kubernetes-v1-22: + name: integration-kubernetes-v1-22 + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.4] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v2 + + - uses: manusa/actions-setup-minikube@v2.5.0 + with: + minikube version: v1.23.2 + kubernetes version: v1.22.1 + github token: ${{ secrets.GITHUB_TOKEN }} + + - run: sbt ++${{ matrix.scala }} It/test + + integration-kubernetes-v1-23: + name: integration-kubernetes-v1-23 + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.4] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v2 + + - uses: manusa/actions-setup-minikube@v2.5.0 + with: + minikube version: v1.23.2 + kubernetes version: v1.23.6 + github token: ${{ secrets.GITHUB_TOKEN }} + + - run: sbt ++${{ matrix.scala }} It/test + + integration-kubernetes-v1-24: + name: integration-kubernetes-v1-24 + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.4] + java: [adopt@1.8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v2 + + - uses: manusa/actions-setup-minikube@v2.5.0 + with: + minikube version: v1.23.2 + kubernetes version: v1.24.1 + github token: ${{ secrets.GITHUB_TOKEN }} + + - run: sbt ++${{ matrix.scala }} It/test From 5e8f575e5fd54db654adf056fd5d60b9c65638ed Mon Sep 17 00:00:00 2001 From: hagay3 Date: Sun, 29 May 2022 10:24:25 +0300 Subject: [PATCH 3/5] 1.24.1 -> 1.24.0 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4baf8016..cd544e8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,7 +238,7 @@ jobs: - uses: manusa/actions-setup-minikube@v2.5.0 with: minikube version: v1.23.2 - kubernetes version: v1.24.1 + kubernetes version: v1.24.0 github token: ${{ secrets.GITHUB_TOKEN }} - run: sbt ++${{ matrix.scala }} It/test diff --git a/build.sbt b/build.sbt index 1d70dffd..a5604960 100644 --- a/build.sbt +++ b/build.sbt @@ -111,7 +111,7 @@ inThisBuild(List( workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5"), workflowJobMinikube(jobName = "integration-kubernetes-v1-22", k8sServerVersion = "v1.22.1"), workflowJobMinikube(jobName = "integration-kubernetes-v1-23", k8sServerVersion = "v1.23.6"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-24", k8sServerVersion = "v1.24.1") + workflowJobMinikube(jobName = "integration-kubernetes-v1-24", k8sServerVersion = "v1.24.0") ), githubWorkflowPublish := Seq( WorkflowStep.Sbt( From 2cde83ffa9cea57d8187b3df040e38d7312aae3b Mon Sep 17 00:00:00 2001 From: hagay3 Date: Sun, 29 May 2022 10:41:08 +0300 Subject: [PATCH 4/5] removed support for k8s minikube v1.22..v1.24 due to custom resource failures --- build.sbt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index a5604960..a78d6cc4 100644 --- a/build.sbt +++ b/build.sbt @@ -88,7 +88,7 @@ def workflowJobMinikube(jobName: String, k8sServerVersion: String) = { steps = List( WorkflowStep.Checkout, WorkflowStep.Use( - ref = UseRef.Public(owner = "manusa", repo = "actions-setup-minikube", ref = "v2.5.0"), + ref = UseRef.Public(owner = "manusa", repo = "actions-setup-minikube", ref = "v2.6.0"), params = Map( "minikubeversion" -> "v1.23.2", "kubernetesversion" -> k8sServerVersion, @@ -108,10 +108,7 @@ inThisBuild(List( githubWorkflowAddedJobs := Seq( workflowJobMinikube(jobName = "integration-kubernetes-v1-19", k8sServerVersion = "v1.19.6"), workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-22", k8sServerVersion = "v1.22.1"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-23", k8sServerVersion = "v1.23.6"), - workflowJobMinikube(jobName = "integration-kubernetes-v1-24", k8sServerVersion = "v1.24.0") + workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5") ), githubWorkflowPublish := Seq( WorkflowStep.Sbt( From fd61ebbb2892dce9141e705b11b68c1c42bdef3b Mon Sep 17 00:00:00 2001 From: hagay3 Date: Sun, 29 May 2022 10:56:15 +0300 Subject: [PATCH 5/5] removed support for k8s minikube v1.22..v1.24 due to custom resource failures --- .github/workflows/ci.yml | 66 ++-------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd544e8a..eb757f83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,7 +135,7 @@ jobs: - name: Checkout current branch (fast) uses: actions/checkout@v2 - - uses: manusa/actions-setup-minikube@v2.5.0 + - uses: manusa/actions-setup-minikube@v2.6.0 with: minikube version: v1.23.2 kubernetes version: v1.19.6 @@ -155,7 +155,7 @@ jobs: - name: Checkout current branch (fast) uses: actions/checkout@v2 - - uses: manusa/actions-setup-minikube@v2.5.0 + - uses: manusa/actions-setup-minikube@v2.6.0 with: minikube version: v1.23.2 kubernetes version: v1.20.11 @@ -175,70 +175,10 @@ jobs: - name: Checkout current branch (fast) uses: actions/checkout@v2 - - uses: manusa/actions-setup-minikube@v2.5.0 + - uses: manusa/actions-setup-minikube@v2.6.0 with: minikube version: v1.23.2 kubernetes version: v1.21.5 github token: ${{ secrets.GITHUB_TOKEN }} - run: sbt ++${{ matrix.scala }} It/test - - integration-kubernetes-v1-22: - name: integration-kubernetes-v1-22 - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.13.4] - java: [adopt@1.8] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (fast) - uses: actions/checkout@v2 - - - uses: manusa/actions-setup-minikube@v2.5.0 - with: - minikube version: v1.23.2 - kubernetes version: v1.22.1 - github token: ${{ secrets.GITHUB_TOKEN }} - - - run: sbt ++${{ matrix.scala }} It/test - - integration-kubernetes-v1-23: - name: integration-kubernetes-v1-23 - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.13.4] - java: [adopt@1.8] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (fast) - uses: actions/checkout@v2 - - - uses: manusa/actions-setup-minikube@v2.5.0 - with: - minikube version: v1.23.2 - kubernetes version: v1.23.6 - github token: ${{ secrets.GITHUB_TOKEN }} - - - run: sbt ++${{ matrix.scala }} It/test - - integration-kubernetes-v1-24: - name: integration-kubernetes-v1-24 - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.13.4] - java: [adopt@1.8] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (fast) - uses: actions/checkout@v2 - - - uses: manusa/actions-setup-minikube@v2.5.0 - with: - minikube version: v1.23.2 - kubernetes version: v1.24.0 - github token: ${{ secrets.GITHUB_TOKEN }} - - - run: sbt ++${{ matrix.scala }} It/test