Squashed commit of the following:

commit c48943b Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 21:07:50 2024 +0000 more info to help debug Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit deb9e55 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 20:28:51 2024 +0000 force node image for kind Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 0f6052d Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 20:01:18 2024 +0000 remove single threading of workflows Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 05ac373 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 19:57:24 2024 +0000 downgrade kind to v0.19.0 Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 78e994a Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 19:37:52 2024 +0000 update test to get away from old deprecated repo Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit e973a0d Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 18:53:11 2024 +0000 updated helm caching workflow step Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 28a7529 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 17:43:55 2024 +0000 updates based on parameter changes Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit c38a194 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 17:37:34 2024 +0000 fixed bug with set-json Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit ba87c3c Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 17:17:02 2024 +0000 enablePrometheusSvcMonitor Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 2eedc70 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 17:16:44 2024 +0000 remove unused cloud.s3/gcs.enabled Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 244b6b4 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 17:04:37 2024 +0000 Revert "fix charts to properly use cloud.s3/gcs.enabled settings" This reverts commit 173ac33. Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 110b950 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 16:55:33 2024 +0000 fix charts to properly use cloud.s3/gcs.enabled settings Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit b5a8fd0 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 15:13:28 2024 +0000 add hederaExplorerTlsLoadBalancerIp and hederaExplorerTlsHostName Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 91d163e Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:53:26 2024 +0000 update cluster issuer type Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 55fb30e Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:15:55 2024 +0000 remove acmeClusterIssuer Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 2d8458c Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:14:09 2024 +0000 removed tlsClusterIssuerNamespace Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 17cc975 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:12:18 2024 +0000 removed self signed cluster issuer Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 8f37d96 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:09:06 2024 +0000 flag reminder TODO for this PR Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 86931fc Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 14:07:34 2024 +0000 remove enableTls Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 7dada78 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 26 13:50:52 2024 +0000 remove Envoy Gateway references in fsnetman Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 99c255a Merge: 0e1ac7a fc7ff7d Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 17:07:00 2024 +1100 Merge branch 'kind-setup-experiement' into 670-cli-rename-the-existing-chart-command commit 0e1ac7a Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 13:44:24 2024 +1100 style: fix spotless error Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit ac7ae5c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 13:33:18 2024 +1100 ci: ensure we pull correct kindest/node image before fsnetman e2e tests Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 0a74d51 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 13:24:38 2024 +1100 ci: let jest force exit rather than hanging on errors Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit fc7ff7d Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 12:19:19 2024 +1100 ci: add dependencies Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit d4851c8 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 12:09:57 2024 +1100 ci: fsnetman should depend on chart tests Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 68ebf98 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 11:59:10 2024 +1100 ci: fix if check Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 96d8ee0 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 12:31:16 2024 +1100 fix: add missing lines Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit d8af4b8 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 11:21:31 2024 +1100 ci: rename variables for clarity Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit ee3c7d1 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 11:10:12 2024 +1100 ci: fix changed file check Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit f412c4e Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 11:03:51 2024 +1100 ci: attempt to fix access to input arg Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit b4fdfb0 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 10:54:27 2024 +1100 ci: do not run java unit tests if no relevant files are changed Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 69ddc8a Merge: d5cf3be 13b423a Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 10:05:04 2024 +1100 Merge branch 'main' into 670-cli-rename-the-existing-chart-command Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> # Conflicts: # .github/workflows/zxc-compile-code.yaml # .github/workflows/zxc-fsnetman-tests.yaml # .github/workflows/zxc-helm-chart-tests.yaml # fullstack-network-manager/src/commands/network.mjs commit 13b423a Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Thu Jan 25 22:56:19 2024 +0000 fix: add flag for fsnetman to delete PVCs on uninstall (#693) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit d5cf3be Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 09:51:58 2024 +1100 ci: output docker info for debugging Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 526d22f Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 26 08:27:17 2024 +1100 ci: use node_image: kindest/node:v1.27.1 Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 9eeb733 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 10:48:27 2024 +1100 fix: command name Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit b6121dc Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 10:46:19 2024 +1100 fix: update command description for consistency Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit c5fd507 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 10:46:02 2024 +1100 fix: rename chart command to network Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit b2250cb Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 10:04:25 2024 +1100 feat(cli): use kubernetes javascript client instead of invoking kubctl CLI (#673) Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 1772906 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 17:25:22 2024 +0000 chore: switch back to acme-cluster-issuer from repo now that changes have be… (#691) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit f1191e4 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 16:28:21 2024 +0000 chore: feedback from PR review for hedera-explorer chart changes (#690) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
hashgraph · Jan 29, 2024 · e1bcc47 · e1bcc47
1 parent 961a599
commit e1bcc47
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 170 deletions.
diff --git a/.github/workflows/flow-pull-request-checks.yaml b/.github/workflows/flow-pull-request-checks.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright (C) 2023 Hedera Hashgraph, LLC
+# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,13 +32,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Code
-    uses: ./.github/workflows/zxc-compile-code.yaml
-    secrets:
-      gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
-      gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
-
   spotless:
     name: Spotless
     uses: ./.github/workflows/zxc-compile-code.yaml
@@ -49,6 +42,15 @@ jobs:
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
       gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
 
+#  build:
+#    name: Code
+#    uses: ./.github/workflows/zxc-compile-code.yaml
+#    needs:
+#      - spotless
+#    secrets:
+#      gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
+#      gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
+
   unit-tests:
     name: FST Java Unit Tests
     uses: ./.github/workflows/zxc-compile-code.yaml

diff --git a/.github/workflows/zxc-compile-code.yaml b/.github/workflows/zxc-compile-code.yaml
@@ -221,7 +221,10 @@ jobs:
         run: |
           helm repo add haproxytech https://haproxytech.github.io/helm-charts
           helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
           helm repo update
+          helm pull prometheus-community/prometheus
+          helm pull haproxytech/haproxy
 
       - name: Unit Tests
         id: gradle-test

diff --git a/charts/fullstack-deployment/values.yaml b/charts/fullstack-deployment/values.yaml
@@ -9,10 +9,6 @@ cloud:
   buckets:
     streamBucket: "fst-streams"
     backupBucket: "fst-backups"
-  s3:
-    enabled: "true"
-  gcs:
-    enabled: "true"
   minio:
     enabled: true
   acmeClusterIssuer:

diff --git a/dev/github-cluster.yaml b/dev/github-cluster.yaml
@@ -0,0 +1,5 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
diff --git a/...dle-plugin/src/test/kotlin/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.kt b/...dle-plugin/src/test/kotlin/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.kt
@@ -17,28 +17,27 @@
 package com.hedera.fullstack.gradle.plugin
 
 import com.hedera.fullstack.base.api.util.ExceptionUtils.suppressExceptions
-import org.assertj.core.api.Assertions.*
-import org.junit.jupiter.api.Assertions.assertThrows
-
 import com.hedera.fullstack.helm.client.HelmClient
 import com.hedera.fullstack.helm.client.HelmExecutionException
 import com.hedera.fullstack.helm.client.model.Chart
 import com.hedera.fullstack.helm.client.model.Repository
-import java.io.File
+import org.assertj.core.api.Assertions.assertThat
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
 import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
+import java.io.File
 
 class HelmInstallChartTaskTest {
     companion object {
-        private val REPOSITORY = Repository("stable", "https://charts.helm.sh/stable")
-        private val CHART = Chart("mysql", "stable")
+        private val REPOSITORY = Repository("prometheus-community", "https://prometheus-community.github.io/helm-charts")
+        private val CHART = Chart("prometheus", "prometheus-community")
 
-        private const val RELEASE_NAME = "mysql-release"
+        private const val RELEASE_NAME = "prometheus-release"
 
         private lateinit var project: Project
 

diff --git a/fullstack-network-manager/src/commands/cluster.mjs b/fullstack-network-manager/src/commands/cluster.mjs
@@ -60,7 +60,6 @@ export class ClusterCommand extends BaseCommand {
           const chartDir = self.configManager.getFlag(flags.chartDirectory)
           const deployPrometheusStack = self.configManager.getFlag(flags.deployPrometheusStack)
           const deployMinio = self.configManager.getFlag(flags.deployMinio)
-          const deployEnvoyGateway = self.configManager.getFlag(flags.deployEnvoyGateway)
           const deployCertManager = self.configManager.getFlag(flags.deployCertManager)
           const deployCertManagerCrds = self.configManager.getFlag(flags.deployCertManagerCrds)
 
@@ -71,7 +70,6 @@ export class ClusterCommand extends BaseCommand {
             chartDir: await prompts.promptChartDir(task, chartDir),
             deployPrometheusStack: await prompts.promptDeployPrometheusStack(task, deployPrometheusStack),
             deployMinio: await prompts.promptDeployMinio(task, deployMinio),
-            deployEnvoyGateway: await prompts.promptDeployEnvoyGateway(task, deployEnvoyGateway),
             deployCertManager: await prompts.promptDeployCertManager(task, deployCertManager),
             deployCertManagerCrds: await prompts.promptDeployCertManagerCrds(task, deployCertManagerCrds)
           }
@@ -89,7 +87,6 @@ export class ClusterCommand extends BaseCommand {
             ctx.config.chartDir,
             ctx.config.deployPrometheusStack,
             ctx.config.deployMinio,
-            ctx.config.deployEnvoyGateway,
             ctx.config.deployCertManager,
             ctx.config.deployCertManagerCrds
           )
@@ -234,7 +231,6 @@ export class ClusterCommand extends BaseCommand {
               flags.chartDirectory,
               flags.deployPrometheusStack,
               flags.deployMinio,
-              flags.deployEnvoyGateway,
               flags.deployCertManager,
               flags.deployCertManagerCrds
             ),
@@ -282,15 +278,13 @@ export class ClusterCommand extends BaseCommand {
    * @param chartDir local charts directory (default is empty)
    * @param prometheusStackEnabled a bool to denote whether to install prometheus stack
    * @param minioEnabled a bool to denote whether to install minio
-   * @param envoyGatewayEnabled a bool to denote whether to install envoy-gateway
    * @param certManagerEnabled a bool to denote whether to install cert manager
    * @param certManagerCrdsEnabled a bool to denote whether to install cert manager CRDs
    * @returns {string}
    */
   prepareValuesArg (chartDir = flags.chartDirectory.definition.default,
     prometheusStackEnabled = flags.deployPrometheusStack.definition.default,
     minioEnabled = flags.deployMinio.definition.default,
-    envoyGatewayEnabled = flags.deployEnvoyGateway.definition.default,
     certManagerEnabled = flags.deployCertManager.definition.default,
     certManagerCrdsEnabled = flags.deployCertManagerCrds.definition.default
   ) {
@@ -301,7 +295,6 @@ export class ClusterCommand extends BaseCommand {
 
     valuesArg += ` --set cloud.prometheusStack.enabled=${prometheusStackEnabled}`
     valuesArg += ` --set cloud.minio.enabled=${minioEnabled}`
-    valuesArg += ` --set cloud.envoyGateway.enabled=${envoyGatewayEnabled}`
     valuesArg += ` --set cloud.certManager.enabled=${certManagerEnabled}`
     valuesArg += ` --set cert-manager.installCRDs=${certManagerCrdsEnabled}`
 

diff --git a/fullstack-network-manager/src/commands/flags.mjs b/fullstack-network-manager/src/commands/flags.mjs
@@ -97,19 +97,19 @@ export const deployPrometheusStack = {
   }
 }
 
-export const deployMinio = {
-  name: 'minio',
+export const enablePrometheusSvcMonitor = {
+  name: 'enable-prometheus-svc-monitor',
   definition: {
-    describe: 'Deploy minio operator',
+    describe: 'Enable prometheus service monitor for the network nodes',
     default: true,
     type: 'boolean'
   }
 }
 
-export const deployEnvoyGateway = {
-  name: 'envoy-gateway',
+export const deployMinio = {
+  name: 'minio',
   definition: {
-    describe: 'Deploy envoy gateway',
+    describe: 'Deploy minio operator',
     default: true,
     type: 'boolean'
   }
@@ -245,57 +245,39 @@ export const operatorKey = {
   }
 }
 
-export const enableTls = {
-  name: 'enable-tls',
+export const tlsClusterIssuerType = {
+  name: 'tls-cluster-issuer-type',
   definition: {
-    describe: 'Enables TLS for gateway ingress services [grpcs, grpcWeb, hederaExplorer]',
-    default: false,
-    type: 'boolean'
-  }
-}
-
-export const tlsClusterIssuerName = {
-  name: 'tls-cluster-issuer-name',
-  definition: {
-    describe: 'The name of the TLS cluster issuer to use for gateway services, defaults to "self-signed-ca", another option for the acme-cluster-issuer is "letsencrypt-staging" and "letsencrypt-prod"',
+    describe: 'The TLS cluster issuer type to use for hedera explorer, defaults to "self-signed", the available options are: "acme-staging", "acme-prod", or "self-signed"',
     default: 'self-signed',
     type: 'string'
   }
 }
 
-export const selfSignedClusterIssuer = {
-  name: 'self-signed',
+export const enableHederaExplorerTls = { // KEEP
+  name: 'enable-hedera-explorer-tls',
   definition: {
-    describe: 'Enable the self signed cluster issuer',
+    describe: 'Enable the Hedera Explorer TLS, defaults to false',
     default: false,
     type: 'boolean'
   }
 }
 
-export const tlsClusterIssuerNamespace = {
-  name: 'tls-cluster-issuer-namespace',
+export const hederaExplorerTlsLoadBalancerIp = {
+  name: 'hedera-explorer-tls-load-balancer-ip',
   definition: {
-    describe: 'The namespace of the TLS cluster issuer to use for gateway services, defaults to "cert-manager"',
-    default: 'cert-manager',
+    describe: 'The static IP address to use for the Hedera Explorer TLS load balancer, defaults to ""',
+    default: '',
     type: 'string'
   }
 }
 
-export const acmeClusterIssuer = {
-  name: 'acme-cluster-issuer',
+export const hederaExplorerTlsHostName = {
+  name: 'hedera-explorer-tls-host-name',
   definition: {
-    describe: 'The acme let\'s encrypt cert-manager cluster issuer, defaults to false',
-    default: false,
-    type: 'boolean'
-  }
-}
-
-export const enableHederaExplorerTls = {
-  name: 'enable-hedera-explorer-tls',
-  definition: {
-    describe: 'Enable the Hedera Explorer TLS, defaults to false',
-    default: false,
-    type: 'boolean'
+    describe: 'The host name to use for the Hedera Explorer TLS, defaults to "explorer.fst.local"',
+    default: 'explorer.fst.local',
+    type: 'string'
   }
 }
 
@@ -318,11 +300,10 @@ export const allFlags = [
   deployJsonRpcRelay,
   valuesFile,
   deployPrometheusStack,
+  enablePrometheusSvcMonitor,
   deployMinio,
-  deployEnvoyGateway,
   deployCertManager,
   deployCertManagerCrds,
-  acmeClusterIssuer,
   releaseTag,
   relayReleaseTag,
   cacheDir,
@@ -332,10 +313,9 @@ export const allFlags = [
   chainId,
   operatorId,
   operatorKey,
-  enableTls,
-  tlsClusterIssuerName,
-  tlsClusterIssuerNamespace,
+  tlsClusterIssuerType,
   enableHederaExplorerTls,
-  selfSignedClusterIssuer,
+  hederaExplorerTlsLoadBalancerIp,
+  hederaExplorerTlsHostName,
   deletePvcs
 ]