diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index db7659da..27d90c63 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -15,7 +15,7 @@ on: jobs: test: runs-on: ubuntu-latest - if: ${{ ( github.event_name == 'push' ) || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'admission-controller-framework' ) }} + if: ${{ ( github.event_name == 'push' ) || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'kubernetes-webhooks-framework' ) }} strategy: matrix: java: [ 17 ] @@ -44,5 +44,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent verify org.jacoco:jacoco-maven-plugin:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=java-operator-sdk_admission-controller-framework + run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent verify org.jacoco:jacoco-maven-plugin:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=java-operator-sdk_kubernetes-webhooks-framework diff --git a/.gitignore b/.gitignore index 7d5b5cb9..5a8d4c16 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -admission-controller-framework.iml +kubernetes-webhooks-framework.iml .idea target .cache \ No newline at end of file diff --git a/README.md b/README.md index 46300a57..fc67b038 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# admission-controller-framework +# kubernetes-webhooks-framework Framework and tooling to support implementing [admission controllers](https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/) @@ -11,11 +11,11 @@ for Kubernetes in Java. Supports both **quarkus** and **spring boot**. Both Sync Defining a mutation or validation controller is simple as: -https://github.com/java-operator-sdk/admission-controller-framework/blob/0946595d941b789caef6a69b34c2e5be8c6b59cf/samples/quarkus/src/main/java/io/javaoperatorsdk/admissioncontroller/sample/quarkus/AdmissionControllerConfig.java#L31-L68 +https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/0946595d941b789caef6a69b34c2e5be8c6b59cf/samples/quarkus/src/main/java/io/javaoperatorsdk/admissioncontroller/sample/quarkus/AdmissionControllerConfig.java#L31-L68 What can be then simple used in an endpoint: -https://github.com/java-operator-sdk/admission-controller-framework/blob/0946595d941b789caef6a69b34c2e5be8c6b59cf/samples/quarkus/src/main/java/io/javaoperatorsdk/admissioncontroller/sample/quarkus/AdmissionEndpoint.java#L57-L89 +https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/0946595d941b789caef6a69b34c2e5be8c6b59cf/samples/quarkus/src/main/java/io/javaoperatorsdk/admissioncontroller/sample/quarkus/AdmissionEndpoint.java#L57-L89 See samples also for details. @@ -26,11 +26,11 @@ in [Kuberbuilder](https://book.kubebuilder.io/multiversion-tutorial/conversion-c custom resource from actual version to a hub, and as next step from the hub to the target resource version. To create the controller -register [mappers](https://github.com/java-operator-sdk/admission-controller-framework/blob/main/core/src/main/java/io/javaoperatorsdk/webhook/conversion/Mapper.java) +register [mappers](https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/main/core/src/main/java/io/javaoperatorsdk/webhook/conversion/Mapper.java) : -https://github.com/java-operator-sdk/admission-controller-framework/blob/2a2bce54b49ea3398bef95a9102ee8645e11cf87/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionControllerConfig.java#L15-L29 +https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/2a2bce54b49ea3398bef95a9102ee8645e11cf87/samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/conversion/ConversionControllerConfig.java#L15-L29 and use the controllers in the endpoint: -https://github.com/java-operator-sdk/admission-controller-framework/blob/2a2bce54b49ea3398bef95a9102ee8645e11cf87/samples/spring-boot/src/main/java/io/javaoperatorsdk/webhook/sample/springboot/conversion/ConversionEndpoint.java#L29-L40 +https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/2a2bce54b49ea3398bef95a9102ee8645e11cf87/samples/spring-boot/src/main/java/io/javaoperatorsdk/webhook/sample/springboot/conversion/ConversionEndpoint.java#L29-L40 diff --git a/core/pom.xml b/core/pom.xml index 4c5a9b3b..d516cb10 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,11 +5,11 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework + kubernetes-webhooks-framework 0.2.1-SNAPSHOT - admission-controller-framework-core + kubernetes-webhooks-framework-core Admission Controller Framework - Core jar diff --git a/pom.xml b/pom.xml index 0128e8ee..1f263225 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework + kubernetes-webhooks-framework 0.2.1-SNAPSHOT - Admission Controller Framework for Java - Framework to Implement Admission Controllers in Java + Kubernetes Webhooks Framework for Java + Framework to Implement Admission Controllers and Conversion Hooks in Java pom - https://github.com/java-operator-sdk/admission-controller-framework + https://github.com/java-operator-sdk/kubernetes-webhooks-framework @@ -19,9 +19,9 @@ - scm:git:git://github.com/java-operator-sdk/admission-controller-framework.git - scm:git:git@github.com/java-operator-sdk/admission-controller-framework.git - https://github.com/java-operator-sdk/admission-controller-framework/tree/master + scm:git:git://github.com/java-operator-sdk/kubernetes-webhooks-framework.git + scm:git:git@github.com/java-operator-sdk/kubernetes-webhooks-framework.git + https://github.com/java-operator-sdk/kubernetes-webhooks-framework/tree/master diff --git a/samples/commons/pom.xml b/samples/commons/pom.xml index e06ad7a5..ece88fbc 100644 --- a/samples/commons/pom.xml +++ b/samples/commons/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework-samples + kubernetes-webhooks-framework-samples 0.2.1-SNAPSHOT @@ -23,7 +23,7 @@ io.javaoperatorsdk - admission-controller-framework-core + kubernetes-webhooks-framework-core ${project.version} diff --git a/samples/pom.xml b/samples/pom.xml index d3ce7434..64badf38 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,10 +4,10 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework + kubernetes-webhooks-framework 0.2.1-SNAPSHOT - admission-controller-framework-samples + kubernetes-webhooks-framework-samples pom Admission Controller Framework - Samples diff --git a/samples/quarkus/pom.xml b/samples/quarkus/pom.xml index bba275da..b85b0c3d 100644 --- a/samples/quarkus/pom.xml +++ b/samples/quarkus/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework-samples + kubernetes-webhooks-framework-samples 0.2.1-SNAPSHOT io.javaoperatorsdk.admissioncontroller.sample @@ -42,7 +42,7 @@ io.javaoperatorsdk - admission-controller-framework-core + kubernetes-webhooks-framework-core ${project.version} diff --git a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionAdditionalTestEndpoint.java b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionAdditionalTestEndpoint.java index 3a42dd0b..fac1f02d 100644 --- a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionAdditionalTestEndpoint.java +++ b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/admission/sample/quarkus/admission/AdmissionAdditionalTestEndpoint.java @@ -1,11 +1,5 @@ package io.javaoperatorsdk.webhook.admission.sample.quarkus.admission; -import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview; -import io.javaoperatorsdk.webhook.admission.AdmissionController; -import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController; -import io.smallrye.mutiny.Uni; - import javax.inject.Inject; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -14,6 +8,12 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview; +import io.javaoperatorsdk.webhook.admission.AdmissionController; +import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController; +import io.smallrye.mutiny.Uni; + @Path("/") public class AdmissionAdditionalTestEndpoint { diff --git a/samples/spring-boot/README.md b/samples/spring-boot/README.md index 18f3b723..32a839ef 100644 --- a/samples/spring-boot/README.md +++ b/samples/spring-boot/README.md @@ -164,4 +164,4 @@ Now, the pod resource passed the validation because the mutating webhook added t app.kubernetes.io/name: mutation-test ``` -This label was added by our mutate webhook (see logic in [here](https://github.com/java-operator-sdk/admission-controller-framework/blob/ce64f6e2a1a11a538d73acf6c49af96c04ed484d/samples/spring-boot/src/main/java/io/javaoperatorsdk/webhook/sample/springboot/Config.java#L57)). \ No newline at end of file +This label was added by our mutate webhook (see logic in [here](https://github.com/java-operator-sdk/kubernetes-webhooks-framework/blob/ce64f6e2a1a11a538d73acf6c49af96c04ed484d/samples/spring-boot/src/main/java/io/javaoperatorsdk/webhook/sample/springboot/Config.java#L57)). \ No newline at end of file diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 567b3509..188e466b 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.javaoperatorsdk - admission-controller-framework-samples + kubernetes-webhooks-framework-samples 0.2.1-SNAPSHOT @@ -51,7 +51,7 @@ io.javaoperatorsdk - admission-controller-framework-core + kubernetes-webhooks-framework-core ${project.version}