All files from main/src/carvel (#5035)

Corneil du Plessis · web-flow · commit be9ebde47de3 · 2022-07-25T16:14:14.000+02:00
diff --git a/src/carvel/config/db/_ytt_lib/external/external-secrets.yml b/src/carvel/config/db/_ytt_lib/external/external-secrets.yml
@@ -0,0 +1,14 @@
+#@ load("external.star", "name")
+#@ load("external.star", "username")
+#@ load("external.star", "password")
+#@ load("@ytt:base64", "base64")
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: #@ name()
+  labels:
+    app: #@ name()
+data:
+  external-user: #@ base64.encode(username())
+  external-password: #@ base64.encode(password())
diff --git a/src/carvel/config/db/_ytt_lib/external/external.star b/src/carvel/config/db/_ytt_lib/external/external.star
@@ -0,0 +1,13 @@
+load("@ytt:data", "data")
+
+def name():
+  return data.values.name
+end
+
+def username():
+  return data.values.username
+end
+
+def password():
+  return data.values.password
+end
diff --git a/src/carvel/config/db/_ytt_lib/external/values.yml b/src/carvel/config/db/_ytt_lib/external/values.yml
@@ -0,0 +1,5 @@
+#@data/values-schema
+---
+name: ""
+username: ""
+password: ""
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb-deployment.yml b/src/carvel/config/db/_ytt_lib/mariadb/mariadb-deployment.yml
@@ -1,9 +1,9 @@
-#@ load("mysql.lib.yml", "name")
-#@ load("mysql.lib.yml", "username")
-#@ load("mysql.lib.yml", "password")
-#@ load("mysql.star", "image")
-#@ load("mysql.star", "has_image_pull_secrets")
-#@ load("mysql.star", "image_pull_secrets")
+#@ load("mariadb.lib.yml", "name")
+#@ load("mariadb.lib.yml", "username")
+#@ load("mariadb.lib.yml", "password")
+#@ load("mariadb.star", "image")
+#@ load("mariadb.star", "has_image_pull_secrets")
+#@ load("mariadb.star", "image_pull_secrets")
 
 apiVersion: apps/v1
 kind: Deployment
@@ -23,31 +23,31 @@ spec:
     spec:
       containers:
       - image: #@ image()
-        name: mysql
+        name: mariadb
         env:
-        - name: MYSQL_ROOT_PASSWORD
+        - name: MARIADB_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
-              key: mysql-root-password
+              key: mariadb-root-password
               name: #@ name()
-        - name: MYSQL_USER
+        - name: MARIADB_USER
           valueFrom:
             secretKeyRef:
-              key: mysql-user
+              key: mariadb-user
               name: #@ name()
-        - name: MYSQL_PASSWORD
+        - name: MARIADB_PASSWORD
           valueFrom:
             secretKeyRef:
-              key: mysql-password
+              key: mariadb-password
               name: #@ name()
-        - name: MYSQL_DATABASE
+        - name: MARIADB_DATABASE
           value: #@ name()
         ports:
         - containerPort: 3306
           name: #@ name()
         volumeMounts:
         - name: data
-          mountPath: /var/lib/mysql
+          mountPath: /var/lib/mariadb
         args:
         - "--ignore-db-dir=lost+found"
       #@ if has_image_pull_secrets():
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb-pvc.yml b/src/carvel/config/db/_ytt_lib/mariadb/mariadb-pvc.yml
@@ -1,4 +1,4 @@
-#@ load("mysql.lib.yml", "name")
+#@ load("mariadb.lib.yml", "name")
 
 apiVersion: v1
 kind: PersistentVolumeClaim
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb-secrets.yml b/src/carvel/config/db/_ytt_lib/mariadb/mariadb-secrets.yml
@@ -0,0 +1,14 @@
+#@ load("mariadb.lib.yml", "name")
+#@ load("mariadb.lib.yml", "username")
+#@ load("mariadb.lib.yml", "password")
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: #@ name()
+  labels:
+    app: #@ name()
+data:
+  mariadb-root-password: #@ password()
+  mariadb-user: #@ username()
+  mariadb-password: #@ password()
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb-svc.yml b/src/carvel/config/db/_ytt_lib/mariadb/mariadb-svc.yml
@@ -1,4 +1,4 @@
-#@ load("mysql.lib.yml", "name")
+#@ load("mariadb.lib.yml", "name")
 
 apiVersion: v1
 kind: Service
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb.lib.yml b/src/carvel/config/db/_ytt_lib/mariadb/mariadb.lib.yml
@@ -5,18 +5,18 @@
 #@ def password(): return data.values.password
 
 #@ def skipper_datasource():
-url: jdbc:mysql://${DB-SKIPPER_SERVICE_HOST}:${DB-SKIPPER_SERVICE_PORT}/db-skipper
-username: ${mysql-user}
-password: ${mysql-password}
+url: jdbc:mariadb://${DB-SKIPPER_SERVICE_HOST}:${DB-SKIPPER_SERVICE_PORT}/db-skipper
+username: ${mariadb-user}
+password: ${mariadb-password}
 driverClassName: org.mariadb.jdbc.Driver
 testOnBorrow: true
 validationQuery: "SELECT 1"
 #@ end
 ---
 #@ def dataflow_datasource():
-url: jdbc:mysql://${DB-DATAFLOW_SERVICE_HOST}:${DB-DATAFLOW_SERVICE_PORT}/db-dataflow
-username: ${mysql-user}
-password: ${mysql-password}
+url: jdbc:mariadb://${DB-DATAFLOW_SERVICE_HOST}:${DB-DATAFLOW_SERVICE_PORT}/db-dataflow
+username: ${mariadb-user}
+password: ${mariadb-password}
 driverClassName: org.mariadb.jdbc.Driver
 testOnBorrow: true
 validationQuery: "SELECT 1"
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/mariadb.star b/src/carvel/config/db/_ytt_lib/mariadb/mariadb.star
diff --git a/src/carvel/config/db/_ytt_lib/mariadb/values.yml b/src/carvel/config/db/_ytt_lib/mariadb/values.yml
@@ -1,10 +1,10 @@
 #@data/values-schema
 ---
-name: mysql
+name: mariadb
 username: ""
 password: ""
 image:
-  repository: mysql
-  tag: "5.7"
+  repository: mariadb
+  tag: "10.4"
   digest: ""
 registrySecretRef: ""
diff --git a/src/carvel/config/db/_ytt_lib/mysql/mysql-secrets.yml b/src/carvel/config/db/_ytt_lib/mysql/mysql-secrets.yml
diff --git a/src/carvel/config/monitoring/_ytt_lib/grafana/grafana.star b/src/carvel/config/monitoring/_ytt_lib/grafana/grafana.star
@@ -0,0 +1,17 @@
+load("@ytt:data", "data")
+
+def non_empty_string(value):
+  return type(value) == "string" and len(value) > 0
+end
+
+def has_image_pull_secrets():
+  return non_empty_string(data.values.registrySecretRef)
+end
+
+def registry_secret_ref():
+  return data.values.registrySecretRef
+end
+
+def image_pull_secrets():
+  return [{"name": registry_secret_ref()}]
+end
diff --git a/src/carvel/config/monitoring/_ytt_lib/prometheus-rsocket-proxy/prometheus-rsocket-proxy.star b/src/carvel/config/monitoring/_ytt_lib/prometheus-rsocket-proxy/prometheus-rsocket-proxy.star
@@ -0,0 +1,17 @@
+load("@ytt:data", "data")
+
+def non_empty_string(value):
+  return type(value) == "string" and len(value) > 0
+end
+
+def has_image_pull_secrets():
+  return non_empty_string(data.values.registrySecretRef)
+end
+
+def registry_secret_ref():
+  return data.values.registrySecretRef
+end
+
+def image_pull_secrets():
+  return [{"name": registry_secret_ref()}]
+end
diff --git a/src/carvel/config/monitoring/_ytt_lib/prometheus/prometheus.star b/src/carvel/config/monitoring/_ytt_lib/prometheus/prometheus.star
@@ -0,0 +1,17 @@
+load("@ytt:data", "data")
+
+def non_empty_string(value):
+  return type(value) == "string" and len(value) > 0
+end
+
+def has_image_pull_secrets():
+  return non_empty_string(data.values.registrySecretRef)
+end
+
+def registry_secret_ref():
+  return data.values.registrySecretRef
+end
+
+def image_pull_secrets():
+  return [{"name": registry_secret_ref()}]
+end
diff --git a/src/carvel/docs/debug.adoc b/src/carvel/docs/debug.adoc
@@ -0,0 +1,86 @@
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:important-caption: :heavy_exclamation_mark:
+:caution-caption: :fire:
+:warning-caption: :warning:
+:scdf-server-env: link:configuration-options.adoc#configuration-options-scdf.server.env[scdf.server.env]
+:scdf-skipper-env: link:configuration-options.adoc#configuration-options-scdf.skipper.env[scdf.skipper.env]
+endif::[]
+ifndef::env-github[]
+:scdf-server-env: <<configuration-options-scdf.server.env>>
+:scdf-skipper-env: <<configuration-options-scdf.skipper.env>>
+endif::[]
+
+[[debug]]
+== Debug
+There are times when you need to debug a _dataflow_ environment running on a
+_k8s_ cluster. Here are tips what you can do.
+
+[[debug-dataflow]]
+=== Dataflow
+To prepare running _dataflow_ container to accept a debugger, configure
+container environment values to have `JAVA_TOOL_OPTIONS` using {scdf-server-env}.
+
+[source, yaml]
+----
+scdf:
+  server:
+    env:
+    - name: JAVA_TOOL_OPTIONS
+      value: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005
+----
+
+Find _pod_ name for server and forward port.
+
+[source, bash]
+----
+$ kubectl get pod
+NAME                           READY   STATUS    RESTARTS   AGE
+db-dataflow-5f54b69b9b-ms78g   1/1     Running   0          5m17s
+db-skipper-58bfcb6f4-xnkl4     1/1     Running   0          5m17s
+rabbitmq-6df954df66-xhbfj      1/1     Running   0          5m18s
+scdf-server-8698c78d9-2r574    1/1     Running   0          5m17s
+skipper-6b8fd4f9bd-xf86v       1/1     Running   0          5m17s
+
+$ kubectl port-forward pod/scdf-server-8698c78d9-2r574 5005:5005
+----
+
+Now you can point your favourite _IDE_ debugger into it.
+
+TIP: Dataflow's vscode has a launch configuration to attach debugger to
+     localhost port 5005.
+
+[[debug-skipper]]
+=== Skipper
+To prepare running _skipper_ container to accept a debugger, configure
+container environment values to have `JAVA_TOOL_OPTIONS` using {scdf-skipper-env}.
+
+[source, yaml]
+----
+scdf:
+  skipper:
+    env:
+    - name: JAVA_TOOL_OPTIONS
+      value: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:6006
+----
+
+Find _pod_ name for server and forward port.
+
+[source, bash]
+----
+$ kubectl get pod
+NAME                           READY   STATUS    RESTARTS   AGE
+db-dataflow-5f54b69b9b-ms78g   1/1     Running   0          5m17s
+db-skipper-58bfcb6f4-xnkl4     1/1     Running   0          5m17s
+rabbitmq-6df954df66-xhbfj      1/1     Running   0          5m18s
+scdf-server-8698c78d9-2r574    1/1     Running   0          5m17s
+skipper-6b8fd4f9bd-xf86v       1/1     Running   0          5m17s
+
+$ kubectl port-forward pod/skipper-6b8fd4f9bd-xf86v 6006:6006
+----
+
+Now you can point your favourite _IDE_ debugger into it.
+
+TIP: Skipper's vscode has a launch configuration to attach debugger to
+     localhost port 6006.
diff --git a/src/carvel/docs/examples/tanzu-external-kafka/minikube-values.yml b/src/carvel/docs/examples/tanzu-external-kafka/minikube-values.yml
@@ -0,0 +1,16 @@
+scdf:
+  deploy:
+    binder:
+      enabled: false
+  binder:
+    kafka:
+      broker:
+        host: my-cluster-kafka-bootstrap.kafka
+        port: 9092
+      zk:
+        host: my-cluster-zookeeper-client.kafka
+        port: 2181
+  server:
+    service:
+      type:
+        NodePort
diff --git a/src/carvel/docs/examples/tanzu-external-postgres/README.adoc b/src/carvel/docs/examples/tanzu-external-postgres/README.adoc
@@ -0,0 +1,51 @@
+ifdef::env-github[]
+:tip-caption: :bulb:
+:note-caption: :information_source:
+:important-caption: :heavy_exclamation_mark:
+:caution-caption: :fire:
+:warning-caption: :warning:
+endif::[]
+ifndef::env-github[]
+endif::[]
+
+[[examples-tanzu-external-kafka]]
+== Tanzu External Kafka
+In this example you use _Tanzu CLI_ and external postgres database.
+
+Deploy postgres operator using https://postgres-operator.readthedocs.io[Zalando Postgres Operator]
+
+Deploy postgres instance.
+
+[source, bash]
+----
+kubectl create -f examples/tanzu-external-postgres/postgres-dataflow.yml
+----
+
+Setup _Dataflow_ package repo:
+
+[source, bash]
+----
+tanzu package repository add scdf-repo --url springcloud/scdf-repo:2.10.0-SNAPSHOT
+
+tanzu package repository list
+  NAME        REPOSITORY                            STATUS               DETAILS
+  scdf-repo   springcloud/scdf-repo:2.10.0-SNAPSHOT Reconcile succeeded
+
+tanzu package available list
+  NAME                   DISPLAY-NAME  SHORT-DESCRIPTION
+  scdf.tanzu.vmware.com  scdf          Spring Cloud Data Flow
+
+tanzu package available list scdf.tanzu.vmware.com
+  NAME                   VERSION         RELEASED-AT
+  scdf.tanzu.vmware.com  2.10.0-SNAPSHOT
+----
+
+Get password for database and update values yml and install:
+
+[source, bash]
+----
+tanzu package install scdf-demo \
+  --package-name scdf.tanzu.vmware.com \
+  --version 2.10.0-SNAPSHOT \
+  --values-file examples/tanzu-external-postgres/minikube-values.yml
+----
diff --git a/src/carvel/docs/examples/tanzu-external-postgres/minikube-values.yml b/src/carvel/docs/examples/tanzu-external-postgres/minikube-values.yml
diff --git a/src/carvel/docs/examples/tanzu-external-postgres/postgres-dataflow.yml b/src/carvel/docs/examples/tanzu-external-postgres/postgres-dataflow.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#@ load("mysql.lib.yml", "name")`
	`1`	`+#@ load("mariadb.lib.yml", "name")`
`2`	`2`
`3`	`3`	`apiVersion: v1`
`4`	`4`	`kind: PersistentVolumeClaim`