diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index fca492b6325f3aab836a84eb69d357e8a2680697..22c1d8a3aff5b9143be48446b05899ff3a194f3d 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -50,10 +50,6 @@ spec: httpGet: path: /api/partition/v1/_ah/readiness_check port: 80 - livenessProbe: - httpGet: - path: /api/partition/v1/_ah/liveness_check - port: 80 volumeMounts: - name: azure-keyvault mountPath: "/mnt/azure-keyvault" diff --git a/devops/azure/release.yaml b/devops/azure/release.yaml index 1d1d4afddc29cbd69c0d4e14051ab377ad956b2e..e72c308b5ca8acd6a657745b15a9b6df96271e4a 100644 --- a/devops/azure/release.yaml +++ b/devops/azure/release.yaml @@ -76,10 +76,6 @@ spec: httpGet: path: /api/partition/v1/_ah/readiness_check port: 80 - livenessProbe: - httpGet: - path: /api/partition/v1/_ah/liveness_check - port: 80 volumeMounts: - name: azure-keyvault mountPath: "/mnt/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 23fb95a8ddb752368355808c157e7dad519bd224..102bffb956a963163585d9a13d5e224814f00cab 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,11 +1,9 @@ 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(value = IHealthCheckService.class) 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 1917f77ac6b8b2bd66359731db4b7b306b2bf22b..d72eebe704364ee5308b3a9862b5025406caf601 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 @@ -7,9 +7,11 @@ 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.context.annotation.Primary; import org.springframework.stereotype.Service; @Service +@Primary @RequiredArgsConstructor public class HealthCheckServiceImpl extends DefaultHealthCheckImpl {