Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: operator-framework/java-operator-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 118a6dec3a273845b98f86ba96a94ecbeb21cbb5
Choose a base ref
..
head repository: operator-framework/java-operator-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e8d541e4bd0edf67345ab630e921b0b6b608fb3
Choose a head ref
Showing with 16 additions and 79 deletions.
  1. +6 −54 .github/workflows/build.yml
  2. +7 −18 .github/workflows/integration-tests.yml
  3. +0 −6 .github/workflows/pr.yml
  4. +2 −0 docs/content/en/blog/news/nonssa-vs-ssa.md
  5. +1 −1 pom.xml
60 changes: 6 additions & 54 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -5,69 +5,31 @@ env:

on:
workflow_call:
inputs:
kube-version:
type: string
required: true

jobs:
set_up_kubernetes:
name: Set up Kubernetes ${{ inputs.kube-version }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Minikube
uses: manusa/actions-setup-minikube@v2.13.1
with:
minikube version: 'v1.34.0'
kubernetes version: '${{ inputs.kube-version }}'
driver: 'docker'
github token: ${{ secrets.GITHUB_TOKEN }}

- name: Save minikube directory
id: minikube
run: |
echo "minikube-dir=$MINIKUBE_HOME" >> $GITHUB_OUTPUT
- name: Upload minikube
uses: actions/upload-artifact@v4
with:
name: minikube-${{ inputs.kube-version }}
path: ${{ steps.minikube.outputs.minikube-dir }}
include-hidden-files: true

integration_tests:
name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}"
needs: set_up_kubernetes
strategy:
matrix:
java: [ 17, 21 ]
it-category: [ 'baseapi', 'dependent', 'workflow' ]
kubernetes: [ 'v1.29.12','1.30.8', '1.31.4', '1.32.0' ]
uses: ./.github/workflows/integration-tests.yml
with:
kube-version: ${{ inputs.kube-version }}
java-version: ${{ matrix.java }}
it-category: ${{ matrix.it-category }}
kube-version: ${{ matrix.kubernetes }}

http_client_tests:
name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}, HTTP client: ${{ matrix.httpclient }}"
needs: set_up_kubernetes
httpclient-tests:
strategy:
matrix:
java: [ 17, 21 ]
it-category: [ 'baseapi' ]
httpclient: [ 'vertx', 'jdk', 'jetty' ]
uses: ./.github/workflows/integration-tests.yml
with:
kube-version: ${{ inputs.kube-version }}
java-version: ${{ matrix.java }}
it-category: ${{ matrix.it-category }}
java-version: 21
kube-version: '1.32.0'
http-client: ${{ matrix.httpclient }}
experimental: true

special_integration_tests:
name: "Special integration tests (${{ matrix.java }})"
needs: set_up_kubernetes
runs-on: ubuntu-latest
strategy:
matrix:
@@ -81,13 +43,3 @@ jobs:
java-version: ${{ matrix.java }}
- name: Run Special Integration Tests
run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml

delete_kubernetes:
needs: [ integration_tests, http_client_tests, special_integration_tests ]
if: always()
name: Delete Kubernetes ${{ inputs.kube-version }} artifact
runs-on: ubuntu-latest
steps:
- uses: geekyeggo/delete-artifact@v5
with:
name: minikube-${{ inputs.kube-version }}
25 changes: 7 additions & 18 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -21,20 +21,14 @@ on:
type: string
required: false
default: ''
it-category:
type: string
required: false
default: ''

jobs:
integration_tests:
name: "Experimental: ${{ inputs.experimental }}, Checkout ref: ${{ inputs.checkout-ref }}"
name: Integration tests (${{ inputs.java-version }}, ${{ inputs.kube-version }}, ${{ inputs.http-client }})
runs-on: ubuntu-latest
continue-on-error: ${{ inputs.experimental }}
timeout-minutes: 40
steps:
- name: Output test information
run: echo "Running ITs with ${{ inputs.http-client }}, ${{ inputs.kube-version }}, ${{ inputs.java-version }}"
- uses: actions/checkout@v4
with:
ref: ${{ inputs.checkout-ref }}
@@ -44,18 +38,13 @@ jobs:
distribution: temurin
java-version: ${{ inputs.java-version }}
cache: 'maven'
- name: Download minikube artifact for Kubernetes ${{ inputs.kube-version }}
uses: actions/download-artifact@v4
- name: Set up Minikube
uses: manusa/actions-setup-minikube@v2.13.1
with:
name: minikube-${{inputs.kube-version}}
path: minikube
- name: Start minikube with Kubernetes ${{ inputs.kube-version }}
run: |
# wait for docker
docker version -f '{{.Server.Version}} - {{.Client.Version}}'
export MINIKUBE_HOME=$PWD/minikube
minikube start --driver=docker
kubectl version
minikube version: 'v1.34.0'
kubernetes version: '${{ inputs.kube-version }}'
driver: 'docker'
github token: ${{ secrets.GITHUB_TOKEN }}
- name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
run: |
if [ -z "${{inputs.it-category}}" ]; then
6 changes: 0 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -31,10 +31,4 @@ jobs:
run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml

build:
name: Integration tests with Kubernetes ${{ matrix.kubernetes }}
strategy:
matrix:
kubernetes: [ 'v1.29.12','1.30.8', '1.31.4', '1.32.0' ]
uses: ./.github/workflows/build.yml
with:
kube-version: ${{ matrix.kubernetes }}
2 changes: 2 additions & 0 deletions docs/content/en/blog/news/nonssa-vs-ssa.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: From legacy approach to server-side apply
date: 2025-02-25
author: >-
[Attila Mészáros](https://github.com/csviri)
---

From version 5 of Java Operator SDK [server side apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/)
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
<git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
<jib-maven-plugin.version>3.4.4</jib-maven-plugin.version>
<spotless.version>2.44.3</spotless.version>