Merge pull request #237 from intelops/commmondb

Updated the qt in capten

apps/conf/credentials/clickhouse.yaml

@@ -5,7 +5,7 @@ namespaces:
  - platform
 credentialEntity: clickhouse
 credentialIdentifier: clickhouse-admin
-credentialType: clickhouse-password
+credentialType: "clickhouse-password"
 userName: "admin"
 
 

apps/conf/credentials/qt.yaml

@@ -0,0 +1,8 @@
+name: quality-trace-db
+secretName: quality-trace-db
+namespaces:
+ - quality-trace
+credentialEntity: qt
+credentialIdentifier: qt-password
+credentialType: qt-password
+userName: "tracetest"

apps/conf/kad.yaml

@@ -6,7 +6,7 @@ RepoName: "kad"
 RepoURL: "https://kube-tarian.github.io/kad"
 Namespace: "capten"
 ReleaseName: "kad"
-Version: "1.0.5"
+Version: "1.0.6"
 CreateNamespace: true
 PrivilegedNamespace: true
 APIEndpoint: https://captenagent.{{.DomainName}}

apps/conf/monitoring.yaml

@@ -6,7 +6,7 @@ RepoName: "tools"
 RepoURL: "https://kube-tarian.github.io/helmrepo-supporting-tools"
 Namespace: "observability"
 ReleaseName: "monitoring"
-Version: "0.1.18"
+Version: "0.1.21"
 CreateNamespace: true
 PrivilegedNamespace: true
 OverrideValues:

apps/conf/quality-trace.yaml

@@ -6,8 +6,10 @@ RepoName: "quality-trace"
 RepoURL: "https://intelops.github.io/quality-trace"
 Namespace: "quality-trace"
 ReleaseName: "quality-trace"
-Version: "1.0.2"
+Version: "1.0.5"
 CreateNamespace: true
 APIEndpoint: https://quality-trace.{{.DomainName}}
 OverrideValues:
  DomainName: "{{.DomainName}}"
+ qtSecretName: "{{ .qtSecretName }}"
+ postgresSecretName: "{{ .postgresSecretName }}"

apps/conf/values/kubviz-agent_template.yaml

@@ -42,7 +42,7 @@ container_bridge:
  hosts:
  - "containerbridge.{{.DomainName}}"
 kuberhealthy:
- enabled: true
+ enabled: false
 clusterName: "capten-controlplane"
 resources: 
  limits:

apps/conf/values/quality-trace_template.yaml

@@ -32,3 +32,16 @@ otelCollector:
  endpoint: quality-trace.quality-trace.svc.cluster.local:4317
  otlp/signoz:
  endpoint: signoz-otel-collector.observability.svc.cluster.local:4317
+postgresql:
+ enabled: false
+externalPostgresql:
+ host: postgresql.platform.svc.cluster.local
+ existingSecret:
+ name: "{{ .postgresSecretName }}"
+ passwordKey: admin-password
+ qualitytrace:
+ database: "tracetest"
+ username: "tracetest"
+ existingSecret:
+ name: "{{ .qtSecretName }}"
+ passwordKey: password

go.mod

@@ -127,6 +127,7 @@ require (
  github.com/shopspring/decimal v1.3.1 // indirect
  github.com/spf13/cast v1.5.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
+ github.com/stretchr/objx v0.5.0 // indirect
  github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
  github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect

pkg/agent/store_cred.go

@@ -13,7 +13,6 @@ import (
  "encoding/pem"
  "fmt"
 
-
  random "math/rand"
  "os"
  "path/filepath"
@@ -49,6 +48,7 @@ var (
 
  postgresSecretNameVar = "postgresSecretName"
  clickhouseSecretNameVar = "clickkhouseSecretName"
+ qtSecretNameVar = "qtSecretName"
 )
 
 func StoreCredentials(captenConfig config.CaptenConfig, appGlobalValues map[string]interface{}) error {
@@ -341,6 +341,27 @@ func storeCredentials(captenConfig config.CaptenConfig, appGlobalValues map[stri
  }
  appGlobalValues[clickhouseSecretNameVar] = config.SecretName
 
+ case "qt-password":
+
+ dbkey := map[string]string{
+ "username": config.UserName,
+ }
+ err := generateAndStoreDBPassword(vaultClient, config, "password", dbkey)
+ if err != nil {
+ return fmt.Errorf("error while getting and storing password: %v", err)
+ }
+
+ secretKeyMapping := map[string][]string{
+ "username": {"username"},
+ "password": {"password"},
+ }
+
+ err = configureSecret(captenConfig, vaultClient, config, secretKeyMapping, nil, serviceCredentailType)
+ if err != nil {
+ return fmt.Errorf("error while configuring secret: %v", err)
+ }
+ appGlobalValues[qtSecretNameVar] = config.SecretName
+
  case "temporal-password":
  temporaldbuserkey := map[string]string{
  "username": config.UserName,
@@ -382,7 +403,6 @@ func storeCredentials(captenConfig config.CaptenConfig, appGlobalValues map[stri
  "password": {"admin-password", "password"},
  }
 
-
  err = configureSecret(captenConfig, vaultClient, postgresconfig, secretKey, secretPropertiesMapping, serviceCredentailType)
  if err != nil {
  return err
@@ -408,12 +428,11 @@ func putCredentialInVault(vaultClient vaultcredpb.VaultCredClient, config types.
 
 func configureCosignKeysSecret(captenConfig config.CaptenConfig, vaultClient vaultcredpb.VaultCredClient, config types.CredentialAppConfig) error {
 
-
  secretKeyMapping := map[string][]string{
  "cosign.key": {"cosign.key"},
  "cosign.pub": {"cosign.pub"},
  }
- 
+
  return configureSecret(captenConfig, vaultClient, config, secretKeyMapping, nil, genericCredentailType)
 }
 
@@ -423,7 +442,6 @@ func configureNatsSecret(captenConfig config.CaptenConfig, vaultClient vaultcred
  secretKeyMapping := map[string][]string{
  secretPath: {"token"},
  }
-
 
  return configureSecret(captenConfig, vaultClient, config, secretKeyMapping, nil, genericCredentailType)
 }
@@ -441,8 +459,6 @@ func generatePassword() string {
  return string(password)
 }
 
-
-
 func generateAndStoreDBPassword(vaultClient vaultcredpb.VaultCredClient, config types.CredentialAppConfig, passwordKey string, credential map[string]string) error {
  _, err := vaultClient.GetCredential(context.Background(), &vaultcredpb.GetCredentialRequest{
  CredentialType: serviceCredentailType,
@@ -541,7 +557,7 @@ func configureSecret(captenConfig config.CaptenConfig, vaultClient vaultcredpb.V
  SecretPathData: secretPathData,
  DomainName: "capten.svc.cluster.local:8200",
  }
- 
+
  _, err = vaultClient.ConfigureVaultSecret(context.Background(), request)
  if err != nil {
  return fmt.Errorf("failed to configure vault secret: %v", err)