diff --git a/devops/azure/release.yaml b/devops/azure/release.yaml index b45c367aa116803839ec5b7d3aec78f6f36aee23..1d1d4afddc29cbd69c0d4e14051ab377ad956b2e 100644 --- a/devops/azure/release.yaml +++ b/devops/azure/release.yaml @@ -74,7 +74,11 @@ spec: - containerPort: 80 readinessProbe: httpGet: - path: /api/partition/v1/swagger-ui.html + path: /api/partition/v1/_ah/readiness_check + port: 80 + livenessProbe: + httpGet: + path: /api/partition/v1/_ah/liveness_check port: 80 volumeMounts: - name: azure-keyvault diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java b/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java index 102bffb956a963163585d9a13d5e224814f00cab..1d911bc5b9e96997cf46cc64a49e5880cc2306a6 100644 --- a/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java @@ -1,9 +1,11 @@ package org.opengroup.osdu.partition.service; import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.stereotype.Service; @Service +@ConditionalOnMissingBean public class DefaultHealthCheckImpl implements IHealthCheckService { @Override diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java index f18b5b4c384bd1843553a3fddd03ecca50fbe468..1917f77ac6b8b2bd66359731db4b7b306b2bf22b 100644 --- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java +++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java @@ -4,23 +4,19 @@ import lombok.RequiredArgsConstructor; import org.opengroup.osdu.partition.model.PartitionInfo; import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService; import org.opengroup.osdu.partition.provider.interfaces.IPartitionServiceCache; +import org.opengroup.osdu.partition.service.DefaultHealthCheckImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor -public class HealthCheckServiceImpl implements IHealthCheckService { +public class HealthCheckServiceImpl extends DefaultHealthCheckImpl { @Autowired @Qualifier("partitionServiceCache") private IPartitionServiceCache<String, PartitionInfo> partitionServiceCache; - @Override - public void performLivenessCheck() { - - } - /** * Cache layer must be ready before the pod can serve the traffic */