Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update K8s to 1.31.1 #309

Merged
merged 8 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 15 additions & 93 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
checks:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -25,119 +25,41 @@ jobs:
- name: Style checks
run: ./mill __.checkStyle + __.docJar

integration-kubernetes-v1-25:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Minikube and start Kubernetes
uses: medyagh/[email protected]
with:
minikube-version: 1.28.0
kubernetes-version: v1.25.3
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 11.0.x
distribution: zulu
- name: Test against Kubernetes v1.25
run: ./mill __[3.3.4].test

integration-kubernetes-v1-24:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Minikube and start Kubernetes
uses: medyagh/[email protected]
with:
minikube-version: 1.28.0
kubernetes-version: v1.24.7
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 11.0.x
distribution: zulu
- name: Test against Kubernetes v1.24
run: ./mill __[3.3.4].test

integration-kubernetes-v1-23:
runs-on: ubuntu-latest
integration-kubernetes:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
kubernetes-version:
- v1.32.1
- v1.31.5
- v1.30.9
- v1.29.13
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Minikube and start Kubernetes
uses: medyagh/[email protected].8
uses: medyagh/[email protected].19
with:
minikube-version: 1.28.0
kubernetes-version: v1.23.13
minikube-version: 1.35.0
kubernetes-version: ${{ matrix.kubernetes-version }}
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 11.0.x
distribution: zulu
- name: Test against Kubernetes v1.23
run: ./mill __[3.3.4].test

integration-kubernetes-v1-22:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Minikube and start Kubernetes
uses: medyagh/[email protected]
with:
minikube-version: 1.28.0
kubernetes-version: v1.22.15
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 11.0.x
distribution: zulu
- name: Test against Kubernetes v1.22
run: ./mill __[3.3.4].test

integration-kubernetes-v1-21:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Minikube and start Kubernetes
uses: medyagh/[email protected]
with:
minikube-version: 1.28.0
kubernetes-version: v1.21.14
- name: Setup Java 11
uses: actions/setup-java@v3
with:
java-version: 11.0.x
distribution: zulu
- name: Test against Kubernetes v1.21
- name: Test against Kubernetes ${{ matrix.kubernetes-version }}
run: ./mill __[3.3.4].test

publish:
needs:
- checks
- integration-kubernetes-v1-25
- integration-kubernetes-v1-24
- integration-kubernetes-v1-23
- integration-kubernetes-v1-22
- integration-kubernetes-v1-21
- integration-kubernetes
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Pull all history with tags for correct versionning
- name: Pull all history with tags for correct versioning
run: git fetch --prune --unshallow
- name: Setup Java
uses: actions/setup-java@v3
Expand Down
11 changes: 11 additions & 0 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ trait KubernetesClientModule
with StyleModule
with GitVersionedPublishModule
with SwaggerModelGenerator {
def kubernetesSwagger = downloadedKubernetesSwagger
lazy val jvmVersion = "11"
override def javacOptions = super.javacOptions() ++ Seq("-source", jvmVersion, "-target", jvmVersion)
override def scalacOptions = super.scalacOptions() ++ ScalacOptions.tokensForVersion(
Expand Down Expand Up @@ -49,3 +50,13 @@ trait KubernetesClientModule
developers = Seq(Developer("joan38", "Joan Goyeau", "https://github.com/joan38"))
)
}

def kubernetesVersion: T[String] = T("1.31.1")

def downloadedKubernetesSwagger: T[String] = T {
requests
.get(
s"https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v${kubernetesVersion()}/api/openapi-spec/swagger.json"
)
.text()
}
Loading