Checkpoint: deploying a postgres works. There is a small issue with the credentials in the terraformrc file.

Signed-off-by: ytimocin <[email protected]>

Author: ytimocin

demo/recipes/kubernetes/postgres/main.tf

@@ -0,0 +1,111 @@
+terraform {
+  required_providers {
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 2.0"
+    }
+  }
+}
+
+variable "context" {
+  description = "This variable contains Radius recipe context."
+  type        = any
+}
+
+resource "kubernetes_namespace" "postgres" {
+  metadata {
+    # name = "postgres-${lower(element(split("/", var.context.resource.id), length(split("/", var.context.resource.id)) - 1))}"
+    name = "postgres-recipe"
+  }
+}
+
+# Removed PVC - using emptyDir volume instead to avoid permission issues
+
+resource "kubernetes_deployment" "postgres" {
+  metadata {
+    name      = "postgres"
+    namespace = kubernetes_namespace.postgres.metadata[0].name
+  }
+
+  spec {
+    replicas = 1
+
+    selector {
+      match_labels = {
+        app = "postgres"
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          app = "postgres"
+        }
+      }
+
+      spec {
+        container {
+          image             = "ghcr.io/ytimocin/postgres:15-alpine"
+          name              = "postgres"
+          image_pull_policy = "IfNotPresent"
+
+          env {
+            name  = "POSTGRES_DB"
+            value = "mydb"
+          }
+          env {
+            name  = "POSTGRES_USER"
+            value = "postgres"
+          }
+          env {
+            name  = "POSTGRES_PASSWORD"
+            value = "mysecretpassword"
+          }
+
+          port {
+            container_port = 5432
+          }
+
+          volume_mount {
+            mount_path = "/var/lib/postgresql/data"
+            name       = "postgres-storage"
+          }
+        }
+
+        volume {
+          name = "postgres-storage"
+          empty_dir {}
+        }
+      }
+    }
+  }
+}
+
+resource "kubernetes_service" "postgres" {
+  metadata {
+    name      = "postgres"
+    namespace = kubernetes_namespace.postgres.metadata[0].name
+  }
+  spec {
+    selector = {
+      app = "postgres"
+    }
+    port {
+      port        = 5432
+      target_port = 5432
+    }
+    type = "ClusterIP"
+  }
+}
+
+output "result" {
+  value = {
+    values = {
+      host     = "${kubernetes_service.postgres.metadata[0].name}.${kubernetes_namespace.postgres.metadata[0].name}.svc.cluster.local"
+      port     = "5432"
+      database = "mydb"
+      username = "postgres"
+      password = "mysecretpassword"
+    }
+  }
+}

pkg/recipes/configloader/environment.go

@@ -167,6 +167,18 @@ func getRecipeDefinition(environment *v20231001preview.EnvironmentResource, reci
 	switch c := found.(type) {
 	case *v20231001preview.TerraformRecipeProperties:
 		definition.TemplateVersion = *c.TemplateVersion
+		// Extract TLS configuration
+		if c.TLS != nil {
+			definition.TLS = &recipes.TLSConfig{
+				SkipVerify: c.TLS.SkipVerify != nil && *c.TLS.SkipVerify,
+			}
+			if c.TLS.CaCertificate != nil {
+				definition.TLS.CACertificate = &recipes.SecretReference{
+					Source: *c.TLS.CaCertificate.Source,
+					Key:    *c.TLS.CaCertificate.Key,
+				}
+			}
+		}
 	case *v20231001preview.BicepRecipeProperties:
 		if c.PlainHTTP != nil {
 			definition.PlainHTTP = *c.PlainHTTP

pkg/recipes/configloader/secrets.go

@@ -1,9 +1,12 @@
 /*
 Copyright 2023 The Radius Authors.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,6 +19,7 @@ package configloader
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	aztoken "github.com/radius-project/radius/pkg/azure/tokencredentials"
@@ -110,10 +114,24 @@ func populateSecretData(secretStoreID string, secretKeysFilter []string, secrets
 	for _, secretKey := range secretKeysFilter {
 		secretDataValue, ok := secrets.Data[secretKey]
 		if !ok {
+			// Special handling for Git authentication: username is optional
+			// If pat exists but username doesn't, that's acceptable for Git auth
+			if secretKey == "username" && containsString(secretKeysFilter, "pat") {
+				// Check if pat exists in the secret store
+				if _, patExists := secrets.Data["pat"]; patExists {
+					// Skip missing username - it's optional for Git authentication
+					continue
+				}
+			}
 			return recipes.SecretData{}, fmt.Errorf("a secret key was not found in secret store '%s'", secretStoreID)
 		}
 		secretData.Data[secretKey] = *secretDataValue.Value
 	}
 
 	return secretData, nil
 }
+
+// containsString checks if a string slice contains a specific string
+func containsString(slice []string, str string) bool {
+	return slices.Contains(slice, str)
+}