From cf6798790abf00b38c3c6a088d87c4c8389a4d41 Mon Sep 17 00:00:00 2001 From: Fotis Soldatos Date: Mon, 1 Aug 2022 15:52:32 +0300 Subject: [PATCH] refactor(policy): rename context-policy.proto name --- ...text-policy.proto => context_policy.proto} | 0 .../policy/context/ContextGatewayImpl.java | 2 +- .../src/main/proto/context-policy.proto | 1 - .../src/main/proto/context_policy.proto | 1 + .../grpc/context_policy/ContextPolicy.java | 4 +-- .../context_policy/ContextPolicyService.java | 2 +- .../ContextPolicyServiceBean.java | 2 +- .../ContextPolicyServiceClient.java | 2 +- .../ContextPolicyServiceGrpc.java | 2 +- .../MutinyContextPolicyServiceGrpc.java | 2 +- src/policy/target/kubernetes/kubernetes.yml | 30 +++++++++++-------- 11 files changed, 27 insertions(+), 21 deletions(-) rename proto/{context-policy.proto => context_policy.proto} (100%) delete mode 120000 src/policy/src/main/proto/context-policy.proto create mode 120000 src/policy/src/main/proto/context_policy.proto diff --git a/proto/context-policy.proto b/proto/context_policy.proto similarity index 100% rename from proto/context-policy.proto rename to proto/context_policy.proto diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java index 3af300d49..6185b4e9a 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java +++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java @@ -34,7 +34,7 @@ public class ContextGatewayImpl implements ContextGateway { @GrpcClient("context") MutinyContextServiceStub streamingDelegateContext; - // TODO remove client when RPCs declared in context-policy.proto are moved in context.proto + // TODO remove client when RPCs declared in context_policy.proto are moved in context.proto // and use streamingDelegateContext for all methods @GrpcClient("context_policy") MutinyContextPolicyServiceStub streamingDelegateContextPolicy; diff --git a/src/policy/src/main/proto/context-policy.proto b/src/policy/src/main/proto/context-policy.proto deleted file mode 120000 index 5c0888e9e..000000000 --- a/src/policy/src/main/proto/context-policy.proto +++ /dev/null @@ -1 +0,0 @@ -../../../../../proto/context-policy.proto \ No newline at end of file diff --git a/src/policy/src/main/proto/context_policy.proto b/src/policy/src/main/proto/context_policy.proto new file mode 120000 index 000000000..d41593dde --- /dev/null +++ b/src/policy/src/main/proto/context_policy.proto @@ -0,0 +1 @@ +../../../../../proto/context_policy.proto \ No newline at end of file diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java index 5048be475..455aef779 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java +++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: context-policy.proto +// source: context_policy.proto package context_policy; @@ -23,7 +23,7 @@ public final class ContextPolicy { descriptor; static { java.lang.String[] descriptorData = { - "\n\024context-policy.proto\022\016context_policy\032\r" + + "\n\024context_policy.proto\022\016context_policy\032\r" + "context.proto\032\014policy.proto2\324\002\n\024ContextP" + "olicyService\022?\n\021ListPolicyRuleIds\022\016.cont" + "ext.Empty\032\030.policy.PolicyRuleIdList\"\000\022;\n" + diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java index 4870737ab..7ace0b9dc 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java +++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java @@ -4,7 +4,7 @@ import io.quarkus.grpc.runtime.MutinyService; @javax.annotation.Generated( value = "by Mutiny Grpc generator", -comments = "Source: context-policy.proto") +comments = "Source: context_policy.proto") public interface ContextPolicyService extends MutinyService { diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java index b1a93a601..a08761c67 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java +++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java @@ -6,7 +6,7 @@ import io.quarkus.grpc.runtime.MutinyBean; @javax.annotation.Generated( value = "by Mutiny Grpc generator", -comments = "Source: context-policy.proto") +comments = "Source: context_policy.proto") public class ContextPolicyServiceBean extends MutinyContextPolicyServiceGrpc.ContextPolicyServiceImplBase implements BindableService, MutinyBean { private final ContextPolicyService delegate; diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java index d25541570..98e57eeff 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java +++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java @@ -6,7 +6,7 @@ import io.quarkus.grpc.runtime.MutinyClient; @javax.annotation.Generated( value = "by Mutiny Grpc generator", -comments = "Source: context-policy.proto") +comments = "Source: context_policy.proto") public class ContextPolicyServiceClient implements ContextPolicyService, MutinyClient { private final MutinyContextPolicyServiceGrpc.MutinyContextPolicyServiceStub stub; diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java index 69735c34c..fa859ecff 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java +++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java @@ -9,7 +9,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; */ @javax.annotation.Generated( value = "by gRPC proto compiler (version 1.38.1)", - comments = "Source: context-policy.proto") + comments = "Source: context_policy.proto") public final class ContextPolicyServiceGrpc { private ContextPolicyServiceGrpc() {} diff --git a/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java b/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java index 6e6e29c04..d9ff3b64c 100644 --- a/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java +++ b/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java @@ -8,7 +8,7 @@ import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall; @javax.annotation.Generated( value = "by Mutiny Grpc generator", -comments = "Source: context-policy.proto") +comments = "Source: context_policy.proto") public final class MutinyContextPolicyServiceGrpc implements io.quarkus.grpc.runtime.MutinyGrpc { private MutinyContextPolicyServiceGrpc() {} diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml index 6388d8fe4..b3313f771 100644 --- a/src/policy/target/kubernetes/kubernetes.yml +++ b/src/policy/target/kubernetes/kubernetes.yml @@ -3,20 +3,23 @@ apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: 02cc24e87853c0a2dac459c7704ea3b8748e1b86 - app.quarkus.io/build-timestamp: 2022-08-01 - 11:28:03 +0000 + app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e + app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000 labels: app.kubernetes.io/name: policyservice app: policyservice name: policyservice spec: ports: - - name: grpc + - name: grpc-server port: 6060 targetPort: 6060 - name: http port: 8080 targetPort: 8080 + - name: grpc + port: 6060 + targetPort: 6060 selector: app.kubernetes.io/name: policyservice type: ClusterIP @@ -25,8 +28,8 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: 02cc24e87853c0a2dac459c7704ea3b8748e1b86 - app.quarkus.io/build-timestamp: 2022-08-01 - 11:28:03 +0000 + app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e + app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000 labels: app: policyservice app.kubernetes.io/name: policyservice @@ -39,8 +42,8 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: 02cc24e87853c0a2dac459c7704ea3b8748e1b86 - app.quarkus.io/build-timestamp: 2022-08-01 - 11:28:03 +0000 + app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e + app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000 labels: app: policyservice app.kubernetes.io/name: policyservice @@ -51,12 +54,12 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: CONTEXT_SERVICE_HOST - value: contextservice - - name: SERVICE_SERVICE_HOST - value: serviceservice - name: MONITORING_SERVICE_HOST value: monitoringservice + - name: SERVICE_SERVICE_HOST + value: serviceservice + - name: CONTEXT_SERVICE_HOST + value: contextservice image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0 imagePullPolicy: Always livenessProbe: @@ -72,11 +75,14 @@ spec: name: policyservice ports: - containerPort: 6060 - name: grpc + name: grpc-server protocol: TCP - containerPort: 8080 name: http protocol: TCP + - containerPort: 6060 + name: grpc + protocol: TCP readinessProbe: failureThreshold: 3 httpGet: -- GitLab