You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2022/05/06 14:01:57 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-27262] Enrich validator for FlinkSessionJob
This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 6ff7cf3 [FLINK-27262] Enrich validator for FlinkSessionJob
6ff7cf3 is described below
commit 6ff7cf31c61d50a1459b518cfae86fc65e3c5810
Author: Aitozi <yu...@alibaba-inc.com>
AuthorDate: Wed Apr 27 14:58:03 2022 +0800
[FLINK-27262] Enrich validator for FlinkSessionJob
---
examples/basic-session-job.yaml | 39 ++------
.../kubernetes/operator/crd/CrdConstants.java | 2 +
.../operator/validation/DefaultValidator.java | 107 ++++++++++++++++-----
.../operator/validation/DefaultValidatorTest.java | 83 ++++++++--------
.../operator/admission/AdmissionHandler.java | 7 +-
.../operator/admission/FlinkValidator.java | 41 +++++++-
.../admissioncontroller/AdmissionController.java | 4 +-
.../validation/DefaultRequestValidator.java | 2 +-
.../admissioncontroller/validation/Validator.java | 4 +-
.../operator/admission/AdmissionHandlerTest.java | 6 ++
.../templates/webhook.yaml | 3 +-
11 files changed, 189 insertions(+), 109 deletions(-)
diff --git a/examples/basic-session-job.yaml b/examples/basic-session-job.yaml
index 97cbb6b..cde55a5 100644
--- a/examples/basic-session-job.yaml
+++ b/examples/basic-session-job.yaml
@@ -19,16 +19,10 @@
apiVersion: flink.apache.org/v1beta1
kind: FlinkDeployment
metadata:
- name: basic-session-cluster-with-ha
+ name: basic-session-cluster
spec:
image: flink:1.14
flinkVersion: v1_14
- flinkConfiguration:
- taskmanager.numberOfTaskSlots: "2"
- state.savepoints.dir: file:///flink-data/savepoints
- high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
- high-availability.storageDir: file:///flink-data/ha
-# kubernetes.rest-service.exposed.type: LoadBalancer
jobManager:
replicas: 1
resource:
@@ -38,43 +32,28 @@ spec:
resource:
memory: "2048m"
cpu: 1
- podTemplate:
- spec:
- serviceAccount: flink
- containers:
- - name: flink-main-container
- volumeMounts:
- - mountPath: /flink-data
- name: flink-volume
- volumes:
- - name: flink-volume
- hostPath:
- # directory location on host
- path: /tmp/flink
- # this field is optional
- type: Directory
+ serviceAccount: flink
---
apiVersion: flink.apache.org/v1beta1
kind: FlinkSessionJob
metadata:
- name: basic-session-ha-job-example
+ name: basic-session-job-example
spec:
- deploymentName: basic-session-cluster-with-ha
+ deploymentName: basic-session-cluster
job:
- jarURI: file:///opt/flink/artifacts/TopSpeedWindowing.jar
+ jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.3/flink-examples-streaming_2.12-1.14.3-TopSpeedWindowing.jar
parallelism: 4
- upgradeMode: savepoint
- savepointTriggerNonce: 1
+ upgradeMode: stateless
---
apiVersion: flink.apache.org/v1beta1
kind: FlinkSessionJob
metadata:
- name: basic-session-ha-job-example2
+ name: basic-session-job-example2
spec:
- deploymentName: basic-session-cluster-with-ha
+ deploymentName: basic-session-cluster
job:
- jarURI: file:///opt/flink/artifacts/flink-examples-streaming_2.12-1.14.3.jar
+ jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.3/flink-examples-streaming_2.12-1.14.3.jar
parallelism: 2
upgradeMode: stateless
entryClass: org.apache.flink.streaming.examples.statemachine.StateMachineExample
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/CrdConstants.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/CrdConstants.java
index bcdad92..b699ad9 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/CrdConstants.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/CrdConstants.java
@@ -21,4 +21,6 @@ package org.apache.flink.kubernetes.operator.crd;
public class CrdConstants {
public static final String API_GROUP = "flink.apache.org";
public static final String API_VERSION = "v1beta1";
+ public static final String KIND_SESSION_JOB = "FlinkSessionJob";
+ public static final String KIND_FLINK_DEPLOYMENT = "FlinkDeployment";
}
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
index 0150fe6..bd0f25e 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
@@ -25,6 +25,7 @@ import org.apache.flink.kubernetes.operator.config.FlinkConfigManager;
import org.apache.flink.kubernetes.operator.crd.FlinkDeployment;
import org.apache.flink.kubernetes.operator.crd.FlinkSessionJob;
import org.apache.flink.kubernetes.operator.crd.spec.FlinkDeploymentSpec;
+import org.apache.flink.kubernetes.operator.crd.spec.FlinkSessionJobSpec;
import org.apache.flink.kubernetes.operator.crd.spec.FlinkVersion;
import org.apache.flink.kubernetes.operator.crd.spec.IngressSpec;
import org.apache.flink.kubernetes.operator.crd.spec.JobManagerSpec;
@@ -287,12 +288,35 @@ public class DefaultValidator implements FlinkResourceValidator {
@Override
public Optional<String> validateSessionJob(
- FlinkSessionJob sessionJob, Optional<FlinkDeployment> session) {
+ FlinkSessionJob sessionJob, Optional<FlinkDeployment> sessionOpt) {
+
+ if (sessionOpt.isEmpty()) {
+ return validateSessionJobOnly(sessionJob);
+ } else {
+ return firstPresent(
+ validateSessionJobOnly(sessionJob),
+ validateSessionJobWithCluster(sessionJob, sessionOpt.get()));
+ }
+ }
+ private Optional<String> validateSessionJobOnly(FlinkSessionJob sessionJob) {
return firstPresent(
validateJobNotEmpty(sessionJob),
- validateNotApplicationCluster(session),
- validateSessionClusterId(sessionJob, session));
+ validateNotLastStateUpgradeMode(sessionJob),
+ validateSpecChange(sessionJob));
+ }
+
+ private Optional<String> validateSessionJobWithCluster(
+ FlinkSessionJob sessionJob, FlinkDeployment sessionCluster) {
+ Map<String, String> effectiveConfig = configManager.getDefaultConfig().toMap();
+ if (sessionCluster.getSpec().getFlinkConfiguration() != null) {
+ effectiveConfig.putAll(sessionCluster.getSpec().getFlinkConfiguration());
+ }
+
+ return firstPresent(
+ validateNotApplicationCluster(sessionCluster),
+ validateSessionClusterId(sessionJob, sessionCluster),
+ validateJobSpec(sessionJob.getSpec().getJob(), effectiveConfig));
}
private Optional<String> validateJobNotEmpty(FlinkSessionJob sessionJob) {
@@ -302,30 +326,63 @@ public class DefaultValidator implements FlinkResourceValidator {
return Optional.empty();
}
+ private Optional<String> validateNotApplicationCluster(FlinkDeployment session) {
+ if (session.getSpec().getJob() != null) {
+ return Optional.of("Can not submit session job to application cluster");
+ } else {
+ return Optional.empty();
+ }
+ }
+
private Optional<String> validateSessionClusterId(
- FlinkSessionJob sessionJob, Optional<FlinkDeployment> session) {
- return session.flatMap(
- deployment -> {
- if (!deployment
- .getMetadata()
- .getName()
- .equals(sessionJob.getSpec().getDeploymentName())) {
- return Optional.of(
- "The session job's cluster id is not match with the session cluster");
- } else {
- return Optional.empty();
- }
- });
+ FlinkSessionJob sessionJob, FlinkDeployment session) {
+ var deploymentName = session.getMetadata().getName();
+ if (!deploymentName.equals(sessionJob.getSpec().getDeploymentName())) {
+ return Optional.of(
+ "The session job's cluster id is not match with the session cluster");
+ } else {
+ return Optional.empty();
+ }
}
- private Optional<String> validateNotApplicationCluster(Optional<FlinkDeployment> session) {
- return session.flatMap(
- deployment -> {
- if (deployment.getSpec().getJob() != null) {
- return Optional.of("Can not submit to application cluster");
- } else {
- return Optional.empty();
- }
- });
+ private Optional<String> validateNotLastStateUpgradeMode(FlinkSessionJob sessionJob) {
+ if (sessionJob.getSpec().getJob().getUpgradeMode() == UpgradeMode.LAST_STATE) {
+ return Optional.of(
+ String.format(
+ "The %s upgrade mode is not supported in session job now.",
+ UpgradeMode.LAST_STATE));
+ }
+ return Optional.empty();
+ }
+
+ private Optional<String> validateSpecChange(FlinkSessionJob sessionJob) {
+ FlinkSessionJobSpec newSpec = sessionJob.getSpec();
+
+ if (sessionJob.getStatus() == null
+ || sessionJob.getStatus().getReconciliationStatus() == null
+ || sessionJob.getStatus().getReconciliationStatus().getLastReconciledSpec()
+ == null) {
+ // New job
+ if (newSpec.getJob() != null && !newSpec.getJob().getState().equals(JobState.RUNNING)) {
+ return Optional.of("Job must start in running state");
+ }
+
+ return Optional.empty();
+ }
+
+ FlinkSessionJobSpec oldSpec =
+ sessionJob.getStatus().getReconciliationStatus().deserializeLastReconciledSpec();
+
+ JobSpec oldJob = oldSpec.getJob();
+ JobSpec newJob = newSpec.getJob();
+ if (oldJob.getState() == JobState.SUSPENDED
+ && newJob.getState() == JobState.RUNNING
+ && newJob.getUpgradeMode() == UpgradeMode.SAVEPOINT
+ && (sessionJob.getStatus().getJobStatus().getSavepointInfo().getLastSavepoint()
+ == null)) {
+ return Optional.of("Cannot perform savepoint restore without a valid savepoint");
+ }
+
+ return Optional.empty();
}
}
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
index 72cff8d..a98c672 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
@@ -43,13 +43,14 @@ import org.apache.flink.kubernetes.utils.Constants;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nullable;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.Consumer;
-import java.util.function.Supplier;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -299,21 +300,6 @@ public class DefaultValidatorTest {
validatorWithDefaultConfig);
}
- @Test
- public void testSessionJobWithSession() {
- testSessionJobValidateSuccess(job -> {}, session -> {});
-
- testSessionJobValidateError(
- sessionJob -> sessionJob.getSpec().setDeploymentName("not-match"),
- deployment -> {},
- "The session job's cluster id is not match with the session cluster");
-
- testSessionJobValidateError(
- job -> {},
- deployment -> deployment.getSpec().setJob(new JobSpec()),
- "Can not submit to application cluster");
- }
-
private void testSuccess(Consumer<FlinkDeployment> deploymentModifier) {
testSuccess(deploymentModifier, validator);
}
@@ -336,46 +322,59 @@ public class DefaultValidatorTest {
}
}
- private void testSessionJobValidateSuccess(
- Consumer<FlinkSessionJob> sessionJobModifier,
- Consumer<FlinkDeployment> sessionModifier) {
- FlinkDeployment session = TestUtils.buildSessionCluster();
- FlinkSessionJob sessionJob = TestUtils.buildSessionJob();
+ @Test
+ public void testSessionJobWithSession() {
+ testSessionJobValidateWithModifier(job -> {}, session -> {}, null);
- sessionModifier.accept(session);
- sessionJobModifier.accept(sessionJob);
- validator.validateSessionJob(sessionJob, Optional.of(session)).ifPresent(Assertions::fail);
+ testSessionJobValidate(TestUtils.buildSessionJob(), Optional.empty(), null);
+ testSessionJobValidateWithModifier(
+ sessionJob -> sessionJob.getSpec().setDeploymentName("not-match"),
+ deployment -> {},
+ "The session job's cluster id is not match with the session cluster");
+
+ testSessionJobValidateWithModifier(
+ job -> {},
+ deployment -> deployment.getSpec().setJob(new JobSpec()),
+ "Can not submit session job to application cluster");
+
+ testSessionJobValidateWithModifier(
+ sessionJob -> sessionJob.getSpec().getJob().setUpgradeMode(UpgradeMode.LAST_STATE),
+ flinkDeployment -> {},
+ "The LAST_STATE upgrade mode is not supported in session job now.");
+
+ testSessionJobValidateWithModifier(
+ sessionJob -> {
+ sessionJob.getSpec().getJob().setState(JobState.SUSPENDED);
+ },
+ flinkDeployment -> {},
+ "Job must start in running state");
}
- private void testSessionJobValidateError(
+ private void testSessionJobValidateWithModifier(
Consumer<FlinkSessionJob> sessionJobModifier,
Consumer<FlinkDeployment> sessionModifier,
- String expectedErr) {
+ @Nullable String expectedErr) {
FlinkDeployment session = TestUtils.buildSessionCluster();
FlinkSessionJob sessionJob = TestUtils.buildSessionJob();
sessionModifier.accept(session);
sessionJobModifier.accept(sessionJob);
- testSessionJobValidateError(sessionJob, Optional.of(session), expectedErr);
+ testSessionJobValidate(sessionJob, Optional.of(session), expectedErr);
}
- private void testSessionJobValidateError(
- Consumer<FlinkSessionJob> sessionJobModifier,
- Supplier<Optional<FlinkDeployment>> sessionSupplier,
- String expectedErr) {
- FlinkSessionJob sessionJob = TestUtils.buildSessionJob();
-
- sessionJobModifier.accept(sessionJob);
- testSessionJobValidateError(sessionJob, sessionSupplier.get(), expectedErr);
- }
-
- private void testSessionJobValidateError(
- FlinkSessionJob sessionJob, Optional<FlinkDeployment> session, String expectedErr) {
+ private void testSessionJobValidate(
+ FlinkSessionJob sessionJob,
+ Optional<FlinkDeployment> session,
+ @Nullable String expectedErr) {
Optional<String> error = validator.validateSessionJob(sessionJob, session);
- if (error.isPresent()) {
- assertTrue(error.get().startsWith(expectedErr), error.get());
+ if (expectedErr == null) {
+ error.ifPresent(Assertions::fail);
} else {
- fail("Did not get expected error: " + expectedErr);
+ if (error.isPresent()) {
+ assertTrue(error.get().startsWith(expectedErr), error.get());
+ } else {
+ fail("Did not get expected error: " + expectedErr);
+ }
}
}
}
diff --git a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandler.java b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandler.java
index f1468d8..07e4a54 100644
--- a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandler.java
+++ b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandler.java
@@ -40,7 +40,7 @@ import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.LastHttpConten
import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.QueryStringDecoder;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
@@ -64,9 +64,9 @@ public class AdmissionHandler extends SimpleChannelInboundHandler<HttpRequest> {
private static final ObjectMapper objectMapper = new ObjectMapper();
protected static final String VALIDATE_REQUEST_PATH = "/validate";
- private final AdmissionController<GenericKubernetesResource> validatingController;
+ private final AdmissionController<KubernetesResource> validatingController;
- public AdmissionHandler(Validator<GenericKubernetesResource> validator) {
+ public AdmissionHandler(Validator<KubernetesResource> validator) {
this.validatingController = new AdmissionController<>(validator);
}
@@ -83,6 +83,7 @@ public class AdmissionHandler extends SimpleChannelInboundHandler<HttpRequest> {
AdmissionReview response = validatingController.handle(review);
sendResponse(ctx, objectMapper.writeValueAsString(response));
} catch (Exception e) {
+ LOG.error("Failed to validate", e);
sendError(ctx, ExceptionUtils.getStackTrace(e));
}
} else {
diff --git a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkValidator.java b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkValidator.java
index e033a73..ded2659 100644
--- a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkValidator.java
+++ b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkValidator.java
@@ -20,11 +20,16 @@ package org.apache.flink.kubernetes.operator.admission;
import org.apache.flink.kubernetes.operator.admission.admissioncontroller.NotAllowedException;
import org.apache.flink.kubernetes.operator.admission.admissioncontroller.Operation;
import org.apache.flink.kubernetes.operator.admission.admissioncontroller.validation.Validator;
+import org.apache.flink.kubernetes.operator.crd.CrdConstants;
import org.apache.flink.kubernetes.operator.crd.FlinkDeployment;
+import org.apache.flink.kubernetes.operator.crd.FlinkSessionJob;
import org.apache.flink.kubernetes.operator.validation.FlinkResourceValidator;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.GroupVersionKind;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,24 +37,35 @@ import java.util.Optional;
import java.util.Set;
/** Validator for FlinkDeployment creation and updates. */
-public class FlinkValidator implements Validator<GenericKubernetesResource> {
+public class FlinkValidator implements Validator<KubernetesResource> {
private static final Logger LOG = LoggerFactory.getLogger(FlinkValidator.class);
private static final ObjectMapper objectMapper = new ObjectMapper();
private final Set<FlinkResourceValidator> validators;
+ private final KubernetesClient client;
public FlinkValidator(Set<FlinkResourceValidator> validators) {
this.validators = validators;
+ this.client = new DefaultKubernetesClient();
}
@Override
- public void validate(GenericKubernetesResource resource, Operation operation)
+ public void validate(KubernetesResource resource, Operation operation, GroupVersionKind kind)
throws NotAllowedException {
LOG.debug("Validating resource {}", resource);
+ if (CrdConstants.KIND_FLINK_DEPLOYMENT.equals(kind.getKind())) {
+ validateDeployment(resource);
+ } else if (CrdConstants.KIND_SESSION_JOB.equals(kind.getKind())) {
+ validateSessionJob(resource);
+ } else {
+ throw new NotAllowedException("Unexpected resource: " + kind.getKind());
+ }
+ }
+
+ private void validateDeployment(KubernetesResource resource) {
FlinkDeployment flinkDeployment =
objectMapper.convertValue(resource, FlinkDeployment.class);
-
for (FlinkResourceValidator validator : validators) {
Optional<String> validationError = validator.validateDeployment(flinkDeployment);
if (validationError.isPresent()) {
@@ -57,4 +73,21 @@ public class FlinkValidator implements Validator<GenericKubernetesResource> {
}
}
}
+
+ private void validateSessionJob(KubernetesResource resource) {
+ FlinkSessionJob sessionJob = objectMapper.convertValue(resource, FlinkSessionJob.class);
+ var deployment =
+ client.resources(FlinkDeployment.class)
+ .inNamespace(sessionJob.getMetadata().getNamespace())
+ .withName(sessionJob.getSpec().getDeploymentName())
+ .get();
+
+ for (FlinkResourceValidator validator : validators) {
+ Optional<String> validationError =
+ validator.validateSessionJob(sessionJob, Optional.ofNullable(deployment));
+ if (validationError.isPresent()) {
+ throw new NotAllowedException(validationError.get());
+ }
+ }
+ }
}
diff --git a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/AdmissionController.java b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/AdmissionController.java
index 2502bbe..b262166 100644
--- a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/AdmissionController.java
+++ b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/AdmissionController.java
@@ -35,8 +35,8 @@ public class AdmissionController<T extends KubernetesResource> {
this(new DefaultRequestMutator<>(mutator));
}
- public AdmissionController(Validator<T> mutator) {
- this(new DefaultRequestValidator<>(mutator));
+ public AdmissionController(Validator<T> validator) {
+ this(new DefaultRequestValidator<>(validator));
}
public AdmissionController(RequestHandler requestHandler) {
diff --git a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/DefaultRequestValidator.java b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/DefaultRequestValidator.java
index 2a572ff..f1235ef 100644
--- a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/DefaultRequestValidator.java
+++ b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/DefaultRequestValidator.java
@@ -43,7 +43,7 @@ public class DefaultRequestValidator<T extends KubernetesResource> implements Re
T originalResource = (T) getTargetResource(admissionRequest, operation);
AdmissionResponse admissionResponse;
try {
- validator.validate(originalResource, operation);
+ validator.validate(originalResource, operation, admissionRequest.getKind());
admissionResponse = allowedAdmissionResponse();
} catch (NotAllowedException e) {
admissionResponse = AdmissionUtils.notAllowedExceptionToAdmissionResponse(e);
diff --git a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/Validator.java b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/Validator.java
index b145c48..e96a28f 100644
--- a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/Validator.java
+++ b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/admissioncontroller/validation/Validator.java
@@ -20,10 +20,12 @@ package org.apache.flink.kubernetes.operator.admission.admissioncontroller.valid
import org.apache.flink.kubernetes.operator.admission.admissioncontroller.NotAllowedException;
import org.apache.flink.kubernetes.operator.admission.admissioncontroller.Operation;
+import io.fabric8.kubernetes.api.model.GroupVersionKind;
import io.fabric8.kubernetes.api.model.KubernetesResource;
/** Copied as is from https://github.com/java-operator-sdk/admission-controller-framework. */
public interface Validator<T extends KubernetesResource> {
- void validate(T resource, Operation operation) throws NotAllowedException;
+ void validate(T resource, Operation operation, GroupVersionKind kind)
+ throws NotAllowedException;
}
diff --git a/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java b/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
index 9cf9376..09a8c46 100644
--- a/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
+++ b/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
@@ -30,6 +30,7 @@ import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.DefaultHttpRes
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import io.fabric8.kubernetes.api.model.GroupVersionKind;
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
import org.junit.jupiter.api.Test;
@@ -91,6 +92,11 @@ public class AdmissionHandlerTest {
final AdmissionRequest admissionRequest = new AdmissionRequest();
admissionRequest.setOperation(CREATE.name());
admissionRequest.setObject(flinkDeployment);
+ admissionRequest.setKind(
+ new GroupVersionKind(
+ flinkDeployment.getGroup(),
+ flinkDeployment.getVersion(),
+ flinkDeployment.getKind()));
final AdmissionReview admissionReview = new AdmissionReview();
admissionReview.setRequest(admissionRequest);
embeddedChannel.writeInbound(
diff --git a/helm/flink-kubernetes-operator/templates/webhook.yaml b/helm/flink-kubernetes-operator/templates/webhook.yaml
index f1ffa9a..c0ecf67 100644
--- a/helm/flink-kubernetes-operator/templates/webhook.yaml
+++ b/helm/flink-kubernetes-operator/templates/webhook.yaml
@@ -83,7 +83,7 @@ metadata:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/flink-operator-serving-cert
name: flink-operator-{{ .Release.Namespace }}-webhook-configuration
webhooks:
-- name: vflinkdeployments.flink.apache.org
+- name: flinkoperator.flink.apache.org
admissionReviewVersions: ["v1"]
clientConfig:
service:
@@ -100,6 +100,7 @@ webhooks:
- UPDATE
resources:
- flinkdeployments
+ - flinksessionjobs
sideEffects: None
{{- if .Values.watchNamespaces }}
namespaceSelector: