gyfora commented on code in PR #278: URL: https://github.com/apache/flink-kubernetes-operator/pull/278#discussion_r923347188
########## flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptor.java: ########## @@ -0,0 +1,257 @@ +/* + * 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.operator.standalone; + +import org.apache.flink.client.deployment.ClusterDeploymentException; +import org.apache.flink.client.deployment.ClusterDescriptor; +import org.apache.flink.client.deployment.ClusterRetrieveException; +import org.apache.flink.client.deployment.ClusterSpecification; +import org.apache.flink.client.deployment.application.ApplicationConfiguration; +import org.apache.flink.client.program.ClusterClient; +import org.apache.flink.client.program.ClusterClientProvider; +import org.apache.flink.client.program.rest.RestClusterClient; +import org.apache.flink.configuration.BlobServerOptions; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.HighAvailabilityOptions; +import org.apache.flink.configuration.JobManagerOptions; +import org.apache.flink.configuration.RestOptions; +import org.apache.flink.configuration.TaskManagerOptions; +import org.apache.flink.kubernetes.KubernetesClusterDescriptor; +import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions; +import org.apache.flink.kubernetes.kubeclient.Endpoint; +import org.apache.flink.kubernetes.kubeclient.FlinkPod; +import org.apache.flink.kubernetes.kubeclient.KubernetesJobManagerSpecification; +import org.apache.flink.kubernetes.operator.kubeclient.FlinkStandaloneKubeClient; +import org.apache.flink.kubernetes.operator.kubeclient.factory.StandaloneKubernetesJobManagerFactory; +import org.apache.flink.kubernetes.operator.kubeclient.factory.StandaloneKubernetesTaskManagerFactory; +import org.apache.flink.kubernetes.operator.kubeclient.parameters.StandaloneKubernetesJobManagerParameters; +import org.apache.flink.kubernetes.operator.kubeclient.parameters.StandaloneKubernetesTaskManagerParameters; +import org.apache.flink.kubernetes.utils.Constants; +import org.apache.flink.kubernetes.utils.KubernetesUtils; +import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils; +import org.apache.flink.runtime.highavailability.nonha.standalone.StandaloneClientHAServices; +import org.apache.flink.runtime.jobmanager.HighAvailabilityMode; +import org.apache.flink.runtime.rpc.AddressResolution; + +import io.fabric8.kubernetes.api.model.apps.Deployment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Optional; + +import static org.apache.flink.util.Preconditions.checkNotNull; + +/** Standalone Kubernetes specific {@link ClusterDescriptor} implementation. */ +public class KubernetesStandaloneClusterDescriptor extends KubernetesClusterDescriptor { + + private static final Logger LOG = + LoggerFactory.getLogger(KubernetesStandaloneClusterDescriptor.class); + + private static final String CLUSTER_DESCRIPTION = "Standalone Kubernetes cluster"; + + private final Configuration flinkConfig; + + private final FlinkStandaloneKubeClient client; + + private final String clusterId; + + public KubernetesStandaloneClusterDescriptor( + Configuration flinkConfig, FlinkStandaloneKubeClient client) { + super(flinkConfig, client); + this.flinkConfig = checkNotNull(flinkConfig); + this.client = checkNotNull(client); + this.clusterId = + checkNotNull( + flinkConfig.getString(KubernetesConfigOptions.CLUSTER_ID), + "ClusterId must be specified!"); + } + + @Override + public String getClusterDescription() { + return CLUSTER_DESCRIPTION; + } + + @Override + public ClusterClientProvider<String> deploySessionCluster( + ClusterSpecification clusterSpecification) throws ClusterDeploymentException { + flinkConfig.set( + StandaloneKubernetesConfigOptionsInternal.CLUSTER_MODE, + StandaloneKubernetesConfigOptionsInternal.ClusterMode.SESSION); + + final ClusterClientProvider clusterClientProvider = + deployClusterInternal(clusterSpecification); + + try (ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient()) { + LOG.info( + "Created flink session cluster {} successfully, JobManager Web Interface: {}", + clusterId, + clusterClient.getWebInterfaceURL()); + } + return clusterClientProvider; + } + + @Override + public ClusterClientProvider<String> deployApplicationCluster( + ClusterSpecification clusterSpecification, + ApplicationConfiguration applicationConfiguration) + throws ClusterDeploymentException { + flinkConfig.set( + StandaloneKubernetesConfigOptionsInternal.CLUSTER_MODE, + StandaloneKubernetesConfigOptionsInternal.ClusterMode.APPLICATION); + applicationConfiguration.applyToConfiguration(flinkConfig); + final ClusterClientProvider clusterClientProvider = + deployClusterInternal(clusterSpecification); + + try (ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient()) { + LOG.info( + "Created flink session cluster {} successfully, JobManager Web Interface: {}", Review Comment: The log should say `application cluster` instead of `session cluster` ########## flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/NativeFlinkService.java: ########## @@ -0,0 +1,160 @@ +/* + * 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.operator.service; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.client.cli.ApplicationDeployer; +import org.apache.flink.client.deployment.ClusterClientFactory; +import org.apache.flink.client.deployment.ClusterClientServiceLoader; +import org.apache.flink.client.deployment.ClusterDescriptor; +import org.apache.flink.client.deployment.DefaultClusterClientServiceLoader; +import org.apache.flink.client.deployment.application.ApplicationConfiguration; +import org.apache.flink.client.deployment.application.cli.ApplicationClusterDeployer; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.kubernetes.operator.config.FlinkConfigManager; +import org.apache.flink.kubernetes.operator.crd.FlinkDeployment; +import org.apache.flink.kubernetes.operator.crd.spec.JobSpec; +import org.apache.flink.kubernetes.operator.crd.spec.UpgradeMode; +import org.apache.flink.kubernetes.operator.crd.status.FlinkDeploymentStatus; +import org.apache.flink.kubernetes.operator.crd.status.JobManagerDeploymentStatus; +import org.apache.flink.kubernetes.utils.KubernetesUtils; + +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.PodList; +import io.fabric8.kubernetes.client.KubernetesClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY; + +/** + * Implementation of {@link FlinkService} submitting and interacting with Native Kubernetes Flink + * clusters and jobs. + */ +public class NativeFlinkService extends AbstractFlinkService { + + private static final Logger LOG = LoggerFactory.getLogger(NativeFlinkService.class); + + public NativeFlinkService(KubernetesClient kubernetesClient, FlinkConfigManager configManager) { + super(kubernetesClient, configManager); + } + + @Override + protected void deployApplicationCluster(JobSpec jobSpec, Configuration conf) throws Exception { + final ClusterClientServiceLoader clusterClientServiceLoader = Review Comment: We should add ` LOG.info("Deploying application cluster");` in the beginning for consistency -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
