Merge pull request #489 from kube-tarian/update-dbname-chart

fix db name helm attribute values in chart
kube-tarian · May 19, 2024 · ea6b057 · ea6b057
2 parents a56409c + 9e54970
commit ea6b057
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 31 deletions.
diff --git a/Notes.md b/Notes.md
@@ -13,9 +13,8 @@
 
 ## IntelOps Market Place
 
-- Climon
 - Temporal
-- Cassandra
+- Postgres
 
 # Installation using kind
 
@@ -97,8 +96,6 @@ git clone https://github.com/temporalio/helm-charts.git
 helm dependencies update
 
 # Install temporal
-helm install     --set server.replicaCount=1     --set cassandra.config.cluster_size=1     --set prometheus.enabled=false     --set grafana.enabled=false     --set elasticsearch.enabled=false     temporal . --timeout 8m
-```
 
 ### Delete temporal
 

diff --git a/capten/.env b/capten/.env
@@ -1,6 +1,4 @@
 COMPOSE_PROJECT_NAME=temporal
-CASSANDRA_VERSION=3.11.9
-ELASTICSEARCH_VERSION=7.16.2
 MYSQL_VERSION=8
 POSTGRESQL_VERSION=13
 TEMPORAL_VERSION=1.17.1

diff --git a/capten/Makefile b/capten/Makefile
@@ -46,7 +46,6 @@ clean:
 start-kind:
 	kind create cluster --config=tests/kind-config.yaml
 	kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
-	# helm install     --set server.replicaCount=1     --set cassandra.config.cluster_size=1     --set prometheus.enabled=false     --set grafana.enabled=false     --set elasticsearch.enabled=false     temporal . --timeout 8m
 
 stop-kind:
 	kind delete cluster

diff --git a/capten/Notes.md b/capten/Notes.md
@@ -10,8 +10,6 @@ $ make start-kind
 # Reference: https://github.com/temporalio/helm-charts
 
 $ cd ~/go/src/github.com/temporalio/helm-charts
-$ helm install     --set server.replicaCount=1     --set cassandra.config.cluster_size=1     --set prometheus.enabled=false     --set grafana.enabled=false     --set elasticsearch.enabled=false     temporal . --timeout 8m
-```
 
 ## Expose temporal
 
@@ -29,9 +27,6 @@ image:
   pullPolicy: IfNotPresent
   tag: "0.1.1"
 
-cassandra:
-  host: temporal-cassandra.default.svc.cluster.local
-
 $ cd charts/server/
 $ helm install server . -f /tmp/server-values.yaml
 ```

diff --git a/capten/common-pkg/pb/vaultcredpb/vault_cred_grpc.pb.go b/capten/common-pkg/pb/vaultcredpb/vault_cred_grpc.pb.go
diff --git a/capten/deployment-worker/internal/activities/plugin_activity.go b/capten/deployment-worker/internal/activities/plugin_activity.go
@@ -58,7 +58,7 @@ type PluginActivities struct {
 func NewPluginActivities() (*PluginActivities, error) {
 	conf := &Configuration{}
 	if err := envconfig.Process("", conf); err != nil {
-		return nil, fmt.Errorf("cassandra config read faile, %v", err)
+		return nil, fmt.Errorf("agent config read faile, %v", err)
 	}
 
 	as, err := captenstore.NewStore(logger)

diff --git a/charts/kad/templates/agent-deployment.yaml b/charts/kad/templates/agent-deployment.yaml
@@ -80,7 +80,7 @@ spec:
             - name: PG_DB_ENTITY_NAME
               value: {{ .Values.postgres.entityName }}
             - name: PG_DB_NAME
-              value: {{ .Values.cassandra.dbName }}
+              value: {{ .Values.postgres.dbName }}
             - name: AGENT_CLUSTER_CA_ISSUER_NAME
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/kad/templates/config-worker-deployment.yaml b/charts/kad/templates/config-worker-deployment.yaml
@@ -80,7 +80,7 @@ spec:
             - name: PG_DB_ENTITY_NAME
               value: {{ .Values.postgres.entityName }}
             - name: PG_DB_NAME
-              value: {{ .Values.cassandra.dbName }}
+              value: {{ .Values.postgres.dbName }}
             - name: TEKTON_PLUGIN_CONFIG_FILE
               value: "{{ .Values.configWorker.pluginConfigDir }}/{{ .Values.configWorker.tektonPluginConfigFile }}"
             - name: CROSSPLANE_PLUGIN_CONFIG_FILE

diff --git a/charts/kad/templates/deployment-worker-deployment.yaml b/charts/kad/templates/deployment-worker-deployment.yaml
@@ -66,7 +66,7 @@ spec:
             - name: PG_DB_ENTITY_NAME
               value: {{ .Values.postgres.entityName }}
             - name: PG_DB_NAME
-              value: {{ .Values.cassandra.dbName }}
+              value: {{ .Values.postgres.dbName }}
             - name: AGENT_ADDRESSES
               value: {{ include "kad.fullname" . }}-agent
             - name: AGENT_CLUSTER_CA_ISSUER_NAME

diff --git a/proto/vault_cred.proto b/proto/vault_cred.proto
@@ -4,11 +4,6 @@ option go_package = "/vaultcredpb";
 package vaultcredpb;
 
 service VaultCred {
-  // single RPC for all credential types like user/password, certificates etc.
-  // vault secret path  prepated based on <credentialType>/<credEntityName>/<credIdentifier>
-  // for example, client-certs path will be certs/client/clientA
-  // for example, cassandra root user path will be service-cred/cassandra/root
-  // pass authentication token with service account token to authenticate & authorize the request with vault
   rpc GetCredential (GetCredentialRequest) returns (GetCredentialResponse) {};
   rpc PutCredential (PutCredentialRequest) returns (PutCredentialResponse) {};
   rpc DeleteCredential (DeleteCredentialRequest) returns (DeleteCredentialResponse) {};