Skip to content
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

Fixed deregister function, source and sink #168

Merged
merged 2 commits into from
May 24, 2021
Merged

Fixed deregister function, source and sink #168

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
20bd9d6
Fixed deregister function, source and sink
tuteng May 24, 2021
ddad119
Merge branch 'master' into fix/delete-secret-failed
tuteng May 24, 2021
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
96 changes: 56 additions & 40 deletions mesh-worker-service/src/main/java/io/functionmesh/compute/rest/api/MeshComponentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import io.functionmesh.compute.functions.models.V1alpha1Function;
import io.functionmesh.compute.functions.models.V1alpha1FunctionList;
import io.functionmesh.compute.MeshWorkerService;
import io.functionmesh.compute.sinks.models.V1alpha1Sink;
import io.functionmesh.compute.sources.models.V1alpha1Source;
import io.functionmesh.compute.util.KubernetesUtils;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Call;
import okhttp3.Response;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.broker.authentication.AuthenticationDataHttps;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.client.admin.PulsarAdminException;
Expand Down Expand Up @@ -105,12 +108,22 @@ public void deregisterFunction(final String tenant,
clientAuthenticationDataHttps,
ComponentTypeUtils.toString(componentType));
try {
Call functionInfoCall =
Call componentCall =
worker().getCustomObjectsApi()
.getNamespacedCustomObjectCall(
group, version, KubernetesUtils.getNamespace(worker().getFactoryConfig()),
plural, componentName, null);
V1alpha1Function v1alpha1Function = executeCall(functionInfoCall, V1alpha1Function.class);
String clusterName;
if ("Source".equals(kind)) {
V1alpha1Source v1alpha1Source = executeCall(componentCall, V1alpha1Source.class);
clusterName = v1alpha1Source.getSpec().getClusterName();
} else if ("Sink".equals(kind)) {
V1alpha1Sink v1alpha1Sink = executeCall(componentCall, V1alpha1Sink.class);
clusterName = v1alpha1Sink.getSpec().getClusterName();
} else {
V1alpha1Function v1alpha1Function = executeCall(componentCall, V1alpha1Function.class);
clusterName = v1alpha1Function.getSpec().getClusterName();
}
Call deleteObjectCall = worker().getCustomObjectsApi().deleteNamespacedCustomObjectCall(
group,
version,
Expand All @@ -126,44 +139,47 @@ public void deregisterFunction(final String tenant,
);
executeCall(deleteObjectCall, null);

Call deleteAuthSecretCall = worker().getCoreV1Api()
.deleteNamespacedSecretCall(
KubernetesUtils.getUniqueSecretName(
kind.toLowerCase(),
"auth",
DigestUtils.sha256Hex(
KubernetesUtils.getSecretName(
v1alpha1Function.getSpec().getClusterName(),
tenant, namespace, componentName))),
KubernetesUtils.getNamespace(worker().getFactoryConfig()),
null,
null,
30,
false,
null,
null,
null
);
executeCall(deleteAuthSecretCall, null);
Call deleteTlsSecretCall = worker().getCoreV1Api()
.deleteNamespacedSecretCall(
KubernetesUtils.getUniqueSecretName(
kind.toLowerCase(),
"tls",
DigestUtils.sha256Hex(
KubernetesUtils.getSecretName(
v1alpha1Function.getSpec().getClusterName(),
tenant, namespace, componentName))),
KubernetesUtils.getNamespace(worker().getFactoryConfig()),
null,
null,
30,
false,
null,
null,
null
);
executeCall(deleteTlsSecretCall, null);
if (!StringUtils.isEmpty(worker().getWorkerConfig().getBrokerClientAuthenticationPlugin())
&& !StringUtils.isEmpty(worker().getWorkerConfig().getBrokerClientAuthenticationParameters())) {
Call deleteAuthSecretCall = worker().getCoreV1Api()
.deleteNamespacedSecretCall(
KubernetesUtils.getUniqueSecretName(
kind.toLowerCase(),
"auth",
DigestUtils.sha256Hex(
KubernetesUtils.getSecretName(
clusterName, tenant, namespace, componentName))),
KubernetesUtils.getNamespace(worker().getFactoryConfig()),
null,
null,
30,
false,
null,
null,
null
);
executeCall(deleteAuthSecretCall, null);
}
if (worker().getWorkerConfig().getTlsEnabled()) {
Call deleteTlsSecretCall = worker().getCoreV1Api()
.deleteNamespacedSecretCall(
KubernetesUtils.getUniqueSecretName(
kind.toLowerCase(),
"tls",
DigestUtils.sha256Hex(
KubernetesUtils.getSecretName(
clusterName, tenant, namespace, componentName))),
KubernetesUtils.getNamespace(worker().getFactoryConfig()),
null,
null,
30,
false,
null,
null,
null
);
executeCall(deleteTlsSecretCall, null);
}
} catch (Exception e) {
log.error("deregister {}/{}/{} {} failed", tenant, namespace, componentName, plural, e);
throw new RestException(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
Expand Down
2 changes: 1 addition & 1 deletion mesh-worker-service/src/main/java/io/functionmesh/compute/util/KubernetesUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static String upsertSecret(
CoreV1Api coreV1Api,
KubernetesRuntimeFactoryConfig factoryConfig) throws ApiException, InterruptedException {

String combinationName = getSecretName(type, tenant, namespace, name);
String combinationName = getSecretName(cluster, tenant, namespace, name);
String hashcode = DigestUtils.sha256Hex(combinationName);
String secretName = getUniqueSecretName(component, type, hashcode);
Map<String, byte[]> data = Maps.newHashMap();
Expand Down