xintongsong commented on a change in pull request #14447:
URL: https://github.com/apache/flink/pull/14447#discussion_r548777962
##########
File path:
flink-kubernetes/src/main/java/org/apache/flink/kubernetes/configuration/KubernetesConfigOptions.java
##########
@@ -53,13 +53,27 @@
.withDescription("The type of the rest service (ClusterIP or
NodePort or LoadBalancer). " +
"When set to ClusterIP, the rest service will not be
created.");
+ public static final ConfigOption<String> KUBERNETES_SERVICE_ACCOUNT =
+ key("kubernetes.service-account")
+ .stringType()
+ .defaultValue("default")
+ .withDescription("Service account that is used by jobmanager
and taskmanger within kubernetes cluster. " +
+ "if specific JOB_MANAGER_SERVICE_ACCOUNT and/or
TASK_MANAGER_SERVICE_ACCOUNT are not defined.");
Review comment:
It might be more user friendly to mention the configuration keys rather
than the java field names.
And I believe we should also mention in descriptions of
`JOB_MANAGER_SERVICE_ACCOUNT` and `TASK_MANAGER_SERVICE_ACCOUNT` that they will
by default fallback to `KUBERNETES_SERVICE_ACCOUNT`.
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitTaskManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesTaskManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
Review comment:
Inconsistent JavaDoc.
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitJobManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesJobManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
+ */
+public class InitJobManagerDecoratorAccountTest extends
KubernetesJobManagerTestBase {
+
+ private static final String SERVICE_ACCOUNT_NAME = "service-test";
+ private static final String JOB_MANGER_SERVICE_ACCOUNT_NAME =
"jm-service-test";
+
+ private Pod resultPod;
+ private Container resultMainContainer;
+
+ @Override
+ protected void setupFlinkConfig() {
+ super.setupFlinkConfig();
+
+
this.flinkConfig.set(KubernetesConfigOptions.KUBERNETES_SERVICE_ACCOUNT,
SERVICE_ACCOUNT_NAME);
+
this.flinkConfig.set(KubernetesConfigOptions.JOB_MANAGER_SERVICE_ACCOUNT,
JOB_MANGER_SERVICE_ACCOUNT_NAME);
+ }
+
+ @Override
+ protected void onSetup() throws Exception {
+ super.onSetup();
+
+ final InitJobManagerDecorator initJobManagerDecorator =
+ new
InitJobManagerDecorator(this.kubernetesJobManagerParameters);
+ final FlinkPod resultFlinkPod =
initJobManagerDecorator.decorateFlinkPod(this.baseFlinkPod);
+
+ this.resultPod = resultFlinkPod.getPod();
+ this.resultMainContainer = resultFlinkPod.getMainContainer();
+ }
+
+ @Test
+ public void testPodServiceAccountName() {
+ assertEquals(JOB_MANGER_SERVICE_ACCOUNT_NAME,
this.resultPod.getSpec().getServiceAccountName());
Review comment:
`assertThat(actual, is(expected))` is preferred.
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitTaskManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesTaskManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
+ */
+public class InitTaskManagerDecoratorAccountTest extends
KubernetesTaskManagerTestBase {
+
+ private static final String SERVICE_ACCOUNT_NAME = "service-test";
+ private static final String TASK_MANAGER_SERVICE_ACCOUNT_NAME =
"tm-service-test";
+
+ private Pod resultPod;
+ private Container resultMainContainer;
Review comment:
Unused
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitTaskManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesTaskManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
+ */
+public class InitTaskManagerDecoratorAccountTest extends
KubernetesTaskManagerTestBase {
+
+ private static final String SERVICE_ACCOUNT_NAME = "service-test";
+ private static final String TASK_MANAGER_SERVICE_ACCOUNT_NAME =
"tm-service-test";
+
+ private Pod resultPod;
+ private Container resultMainContainer;
+
+ @Override
+ protected void setupFlinkConfig() {
+ super.setupFlinkConfig();
+
+
this.flinkConfig.set(KubernetesConfigOptions.KUBERNETES_SERVICE_ACCOUNT,
SERVICE_ACCOUNT_NAME);
+
this.flinkConfig.set(KubernetesConfigOptions.TASK_MANAGER_SERVICE_ACCOUNT,
TASK_MANAGER_SERVICE_ACCOUNT_NAME);
+ }
+
+ @Override
+ protected void onSetup() throws Exception {
+ super.onSetup();
+
+ final InitTaskManagerDecorator initTaskManagerDecorator =
+ new
InitTaskManagerDecorator(kubernetesTaskManagerParameters);
+
+ final FlinkPod resultFlinkPod =
initTaskManagerDecorator.decorateFlinkPod(this.baseFlinkPod);
+ this.resultPod = resultFlinkPod.getPod();
+ this.resultMainContainer = resultFlinkPod.getMainContainer();
+ }
+
+ @Test
+ public void testPodServiceAccountName() {
+ assertThat(TASK_MANAGER_SERVICE_ACCOUNT_NAME,
is(this.resultPod.getSpec().getServiceAccountName()));
Review comment:
```suggestion
assertThat(this.resultPod.getSpec().getServiceAccountName(),
is(TASK_MANAGER_SERVICE_ACCOUNT_NAME));
```
The util method is defined as follows. Out-of-ordered arguments could lead
to improper error messages.
```
public static <T> void assertThat(T actual, Matcher<? super T> matcher)
```
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitJobManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesJobManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
Review comment:
Inconsistent JavaDoc.
##########
File path:
flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/decorators/InitJobManagerDecoratorAccountTest.java
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.kubernetes.kubeclient.decorators;
+
+import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
+import org.apache.flink.kubernetes.kubeclient.FlinkPod;
+import org.apache.flink.kubernetes.kubeclient.KubernetesJobManagerTestBase;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.Pod;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * General tests for the {@link InitJobManagerDecorator}.
+ */
+public class InitJobManagerDecoratorAccountTest extends
KubernetesJobManagerTestBase {
+
+ private static final String SERVICE_ACCOUNT_NAME = "service-test";
+ private static final String JOB_MANGER_SERVICE_ACCOUNT_NAME =
"jm-service-test";
+
+ private Pod resultPod;
+ private Container resultMainContainer;
Review comment:
Unused
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
