Skip to content

fix: project rename #44

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 22, 2022
Merged

fix: project rename #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14ec86a
fix: project rename
csviri Nov 22, 2022
e06c1bd
format
csviri Nov 22, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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

2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/)
Expand All @@ -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.

Expand All @@ -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
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework</artifactId>
<artifactId>kubernetes-webhooks-framework</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>

<artifactId>admission-controller-framework-core</artifactId>
<artifactId>kubernetes-webhooks-framework-core</artifactId>
<name>Admission Controller Framework - Core</name>
<packaging>jar</packaging>

Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>

<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework</artifactId>
<artifactId>kubernetes-webhooks-framework</artifactId>
<version>0.2.1-SNAPSHOT</version>
<name>Admission Controller Framework for Java</name>
<description>Framework to Implement Admission Controllers in Java</description>
<name>Kubernetes Webhooks Framework for Java</name>
<description>Framework to Implement Admission Controllers and Conversion Hooks in Java</description>
<packaging>pom</packaging>
<url>https://github.com/java-operator-sdk/admission-controller-framework</url>
<url>https://github.com/java-operator-sdk/kubernetes-webhooks-framework</url>

<licenses>
<license>
Expand All @@ -19,9 +19,9 @@
</licenses>

<scm>
<connection>scm:git:git://github.com/java-operator-sdk/admission-controller-framework.git</connection>
<developerConnection>scm:git:git@github.com/java-operator-sdk/admission-controller-framework.git</developerConnection>
<url>https://github.com/java-operator-sdk/admission-controller-framework/tree/master</url>
<connection>scm:git:git://github.com/java-operator-sdk/kubernetes-webhooks-framework.git</connection>
<developerConnection>scm:git:git@github.com/java-operator-sdk/kubernetes-webhooks-framework.git</developerConnection>
<url>https://github.com/java-operator-sdk/kubernetes-webhooks-framework/tree/master</url>
</scm>

<developers>
Expand Down
4 changes: 2 additions & 2 deletions samples/commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-samples</artifactId>
<artifactId>kubernetes-webhooks-framework-samples</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>

Expand All @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-core</artifactId>
<artifactId>kubernetes-webhooks-framework-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework</artifactId>
<artifactId>kubernetes-webhooks-framework</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<artifactId>admission-controller-framework-samples</artifactId>
<artifactId>kubernetes-webhooks-framework-samples</artifactId>
<packaging>pom</packaging>
<name>Admission Controller Framework - Samples</name>
<modules>
Expand Down
4 changes: 2 additions & 2 deletions samples/quarkus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-samples</artifactId>
<artifactId>kubernetes-webhooks-framework-samples</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<groupId>io.javaoperatorsdk.admissioncontroller.sample</groupId>
Expand Down Expand Up @@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-core</artifactId>
<artifactId>kubernetes-webhooks-framework-core</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
12 changes: 6 additions & 6 deletions ...eratorsdk/webhook/admission/sample/quarkus/admission/AdmissionAdditionalTestEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion samples/spring-boot/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
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)).
4 changes: 2 additions & 2 deletions samples/spring-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-samples</artifactId>
<artifactId>kubernetes-webhooks-framework-samples</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>admission-controller-framework-core</artifactId>
<artifactId>kubernetes-webhooks-framework-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down