Enable health, liveness and readiness probes (#221)

AzBuilder · Jun 17, 2022 · 91afbf9 · 91afbf9
1 parent 7b70c5e
commit 91afbf9
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 2 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -50,6 +50,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.yahoo.elide</groupId>
             <artifactId>elide-spring-boot-starter</artifactId>

diff --git a/...ilder/api/plugin/security/authentication/azure/AADOAuth2ResourceServerSecurityConfig.java b/...ilder/api/plugin/security/authentication/azure/AADOAuth2ResourceServerSecurityConfig.java
@@ -31,6 +31,7 @@ protected void configure(HttpSecurity http) throws Exception {
         //http.authorizeRequests(requests -> requests.anyRequest().authenticated());
         http.cors().and().authorizeRequests()
                 .antMatchers(HttpMethod.OPTIONS,"/**").permitAll()
+                .antMatchers("/actuator/**").permitAll()
                 .antMatchers("/callback/v1/**").permitAll()
                 .antMatchers("/doc").permitAll()
                 .and()

diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
@@ -98,21 +98,34 @@ org.azbuilder.executor.url=${AzBuilderExecutorUrl}
 #Storage Service#
 #################
 org.terrakube.storage.type=${StorageType}
+
 #################
 # Azure Storage #
 #################
 org.terrakube.storage.azure.accountName=${AzureAccountName}
 org.terrakube.storage.azure.accountKey=${AzureAccountKey}
+
 ###############
 # AWS Storage #
 ###############
 org.terrakube.storage.aws.accessKey=${AwsStorageAccessKey}
 org.terrakube.storage.aws.secretKey=${AwsStorageSecretKey}
 org.terrakube.storage.aws.bucketName=${AwsStorageBucketName}
 org.terrakube.storage.aws.region=${AwsStorageRegion}
+
 ###############
 # GCP Storage #
 ###############
 org.terrakube.storage.gcp.credentials=${GcpStorageCredentialsBase64}
 org.terrakube.storage.gcp.bucketName=${GcpStorageBucketName}
-org.terrakube.storage.gcp.projectId=${GcpStorageProjectId}
+org.terrakube.storage.gcp.projectId=${GcpStorageProjectId}
+
+##########
+# HEALTH #
+##########
+management.endpoints.web.exposure.include=health
+management.endpoint.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.probes.enabled=true
+management.health.livenessstate.enabled=true
+management.health.readinessstate.enabled=true
diff --git a/executor/pom.xml b/executor/pom.xml
@@ -53,6 +53,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.terrakube.terraform</groupId>
 			<artifactId>terraform-spring-boot-starter</artifactId>

diff --git a/executor/src/main/resources/application.properties b/executor/src/main/resources/application.properties
@@ -83,4 +83,14 @@ org.terrakube.tools.branch=${TerrakubeToolsBranch}
 #Terrakube Domains/URL#
 #######################
 org.terrakube.registry.domain=${TerrakubeRegistryDomain}
-org.terrakube.api.url=${TerrakubeApiUrl}
+org.terrakube.api.url=${TerrakubeApiUrl}
+
+##########
+# HEALTH #
+##########
+management.endpoints.web.exposure.include=health
+management.endpoint.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.probes.enabled=true
+management.health.livenessstate.enabled=true
+management.health.readinessstate.enabled=true
diff --git a/registry/pom.xml b/registry/pom.xml
@@ -35,6 +35,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

diff --git a/...ry/configuration/security/authentication/azure/AADOAuth2ResourceServerSecurityConfig.java b/...ry/configuration/security/authentication/azure/AADOAuth2ResourceServerSecurityConfig.java
@@ -30,6 +30,7 @@ protected void configure(HttpSecurity http) throws Exception {
         super.configure(http);
         http.cors().and().authorizeRequests()
                 .antMatchers("/.well-known/**").permitAll()
+                .antMatchers("/actuator/**").permitAll()
                 .antMatchers("/terraform/modules/v1/download/**").permitAll()
                 .antMatchers(HttpMethod.OPTIONS,"/**").permitAll()
                 .and()

diff --git a/registry/src/main/resources/application.properties b/registry/src/main/resources/application.properties
@@ -57,3 +57,13 @@ org.terrakube.registry.plugin.storage.gcp.projectId=${GcpStorageProjectId}
 ########
 org.terrakube.ui.fqdn=${TerrakubeUiURL}
 
+##########
+# HEALTH #
+##########
+management.endpoints.web.exposure.include=health
+management.endpoint.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.probes.enabled=true
+management.health.livenessstate.enabled=true
+management.health.readinessstate.enabled=true
+