review fixes

Author: skudasov

book/src/SUMMARY.md

@@ -6,7 +6,6 @@
   - [Configuration](./framework/developer_environment/toml.md)
 - [Basic Usage](./framework/getting_started.md)
   - [Getting Started](./framework/getting_started.md)
-  - [Running in Kubernetes](./framework/kubernetes.md)
 - [Advanced Usage](./framework/configuration.md)
   - [CLI](./framework/cli.md)
   - [Configuration](./framework/configuration.md)
@@ -26,6 +25,7 @@
   - [Fake Services](framework/components/mocking.md)
   - [Detecting Resource Leaks](framework/resource_leaks.md)
   - [Copying Files](framework/copying_files.md)
+  - [Running in Kubernetes](./framework/kubernetes.md)
   - [External Environment](framework/components/external.md)
 - [Observability Stack](framework/observability/observability_stack.md)
   - [Overview](framework/observability/observability_stack.md)

book/src/framework/kubernetes.md

@@ -4,4 +4,11 @@ Set up Kubernetes context for `main.stage` and add namespace variable to run `de
 ```bash
 kubectl config use-context staging-eks-admin
 export KUBERNETES_NAMESPACE="devenv-1"
+```
+
+Each Pod always has a service, you can found programmatic connection data in `.out`.
+
+To forward all the services locally use [kubefwd]()
+```bash
+sudo -E kubefwd svc -n $KUBERNETES_NAMESPACE
 ```

framework/components/clnode/clnode.go

@@ -181,6 +181,18 @@ func generateEntryPoint() []string {
 	return entrypoint
 }
 
+// natPortsToK8sFormat transforms nat.PortMap
+// to Pods port pair format: $external_port:$internal_port
+func natPortsToK8sFormat(nat nat.PortMap) []string {
+	out := make([]string, 0)
+	for port, portBinding := range nat {
+		for _, b := range portBinding {
+			out = append(out, fmt.Sprintf("%s:%s", b.HostPort, strconv.Itoa(port.Int())))
+		}
+	}
+	return out
+}
+
 // generatePortBindings generates exposed ports and port bindings
 // exposes default CL node port
 // exposes custom_ports in format "host:docker" or map 1-to-1 if only "host" port is provided
@@ -302,10 +314,7 @@ func newNode(ctx context.Context, in *Input, pgOut *postgres.Output) (*NodeOut,
 					Env:      pods.EnvsFromMap(in.Node.EnvVars),
 					Requests: pods.ResourcesMedium(),
 					Limits:   pods.ResourcesMedium(),
-					Ports: []string{
-						fmt.Sprintf("%d:%s", in.Node.HTTPPort, DefaultHTTPPort),
-						fmt.Sprintf("%d:%s", in.Node.P2PPort, DefaultP2PPort),
-					},
+					Ports:    natPortsToK8sFormat(portBindings),
 					ContainerSecurityContext: &v1.SecurityContext{
 						// these are specific things we need for staging cluster
 						RunAsNonRoot: pods.Ptr(true),

framework/components/postgres/postgres.go

@@ -136,19 +136,21 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 					Env: []v1.EnvVar{
 						{
 							Name:  "POSTGRES_USER",
-							Value: "chainlink",
+							Value: User,
 						},
 						{
 							Name:  "POSTGRES_PASSWORD",
-							Value: "thispasswordislongenough",
+							Value: Password,
 						},
 						{
 							Name:  "POSTGRES_DB",
-							Value: "chainlink",
+							Value: Database,
 						},
 					},
 					Requests: pods.ResourcesLarge(),
 					Limits:   pods.ResourcesLarge(),
+					// container and pod security settings are specific to
+					// 'postgres' Docker image
 					ContainerSecurityContext: &v1.SecurityContext{
 						RunAsUser:  pods.Ptr[int64](999),
 						RunAsGroup: pods.Ptr[int64](999),
@@ -189,6 +191,24 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 				Database,
 			),
 		}
+		if in.JDDatabase {
+			o.JDInternalURL = fmt.Sprintf(
+				"postgresql://%s:%s@%s:%s/%s?sslmode=disable",
+				User,
+				Password,
+				fmt.Sprintf("%s-svc", in.Name),
+				Port,
+				JDDatabase,
+			)
+			o.JDUrl = fmt.Sprintf(
+				"postgresql://%s:%s@%s:%d/%s?sslmode=disable",
+				User,
+				Password,
+				fmt.Sprintf("%s-svc", in.Name),
+				portToExpose,
+				JDDatabase,
+			)
+		}
 		return o, nil
 	}
 	// local deployment

framework/pods/defaults.go

@@ -80,7 +80,6 @@ func SizedVolumeClaim(size string) []v1.PersistentVolumeClaim {
 				AccessModes: []v1.PersistentVolumeAccessMode{
 					v1.ReadWriteOnce,
 				},
-				StorageClassName: Ptr("gp3"),
 				Resources: v1.VolumeResourceRequirements{
 					Requests: v1.ResourceList{
 						v1.ResourceStorage: storageQuantity,

framework/pods/forward.go

@@ -17,7 +17,8 @@ import (
 )
 
 const (
-	RetryDelay = 1 * time.Second
+	RetryDelay    = 1 * time.Second
+	K8sAPITimeout = 2 * time.Minute
 )
 
 // PortForwardConfig represents a single port forward configuration
@@ -210,15 +211,17 @@ func (m *PortForwardManager) attemptForward(cfg PortForwardConfig) error {
 
 // getTargetPodAndPort finds the target pod and resolves the port
 func (m *PortForwardManager) getTargetPodAndPort(cfg PortForwardConfig, namespace string) (*corev1.Pod, int, error) {
-	service, err := m.cs.CoreV1().Services(namespace).Get(context.TODO(), cfg.ServiceName, metav1.GetOptions{})
+	ctx, cancel := context.WithTimeout(context.Background(), K8sAPITimeout)
+	defer cancel()
+	service, err := m.cs.CoreV1().Services(namespace).Get(ctx, cfg.ServiceName, metav1.GetOptions{})
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to get service: %w", err)
 	}
 
 	if len(service.Spec.Selector) == 0 {
 		return nil, 0, fmt.Errorf("service %s has no selector", cfg.ServiceName)
 	}
-	pods, err := m.cs.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{
+	pods, err := m.cs.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{
 		LabelSelector: labels.FormatLabels(service.Spec.Selector),
 	})
 	if err != nil {