impr: add requests and limits to deploy (#697)

Author: pandatix

deploy/Pulumi.yaml

@@ -63,6 +63,22 @@ config:
     secret: true
     description: A kubeconfig to use rather than the default ServiceAccount.
     default: ""
+  requests.cpu:
+    type: string
+    description: The number of CPUs to use.
+    default: "1.0"
+  requests.memory:
+    type: string
+    description: The memory size to use.
+    default: "1Gi"
+  limits.cpu:
+    type: string
+    description: The maximum number of CPUs to use.
+    default: "4.0"
+  limits.memory:
+    type: string
+    description: The maximum memory size to use.
+    default: "5Gi"
   otel.endpoint:
     type: string
     description: The OpenTelemetry Collector endpoint to set signals to. (Optional)

deploy/main.go

@@ -38,6 +38,8 @@ func main() {
 			Expose:         cfg.Expose,
 			RomeoClaimName: pulumi.String(cfg.RomeoClaimName),
 			Kubeconfig:     cfg.Kubeconfig,
+			Requests:       pulumi.ToStringMap(cfg.Requests),
+			Limits:         pulumi.ToStringMap(cfg.Limits),
 		}
 		if cfg.Etcd != nil {
 			args.EtcdReplicas = pulumi.IntPtr(cfg.Etcd.Replicas)
@@ -80,6 +82,8 @@ type (
 		Expose         bool
 		LogLevel       string
 		RomeoClaimName string
+		Requests       map[string]string
+		Limits         map[string]string
 		Otel           *OtelConfig
 
 		// Secrets
@@ -119,6 +123,14 @@ func loadConfig(ctx *pulumi.Context) *Config {
 		Kubeconfig:     cfg.GetSecret("kubeconfig"),
 	}
 
+	if err := cfg.TryObject("requests", &c.Requests); err != nil {
+		panic(err)
+	}
+
+	if err := cfg.TryObject("limits", &c.Limits); err != nil {
+		panic(err)
+	}
+
 	var etcdC EtcdConfig
 	if err := cfg.TryObject("etcd", &etcdC); err == nil && etcdC.Replicas != 0 {
 		c.Etcd = &etcdC

deploy/services/chall-manager.go

@@ -80,6 +80,14 @@ type (
 		// created by default for Chall-Manager.
 		Kubeconfig pulumi.StringInput
 
+		// Requests for the Chall-Manager container. For more infos:
+		// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+		Requests pulumi.StringMapInput
+
+		// Limits for the Chall-Manager container. For more infos:
+		// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+		Limits pulumi.StringMapInput
+
 		Swagger, Expose bool
 
 		Otel *common.OtelArgs
@@ -255,6 +263,8 @@ func (cm *ChallManager) provision(ctx *pulumi.Context, args *ChallManagerArgs, o
 		Otel:           nil,
 		RomeoClaimName: args.RomeoClaimName,
 		Kubeconfig:     args.Kubeconfig,
+		Requests:       args.Requests,
+		Limits:         args.Limits,
 	}
 	if args.EtcdReplicas != nil {
 		cmArgs.Etcd = &parts.ChallManagerEtcdArgs{

deploy/services/parts/chall-manager.go

@@ -83,6 +83,16 @@ type (
 		Kubeconfig      pulumi.StringInput
 		mountKubeconfig bool
 
+		// Requests for the Chall-Manager container. For more infos:
+		// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+		Requests pulumi.StringMapInput
+		requests pulumi.StringMapOutput
+
+		// Limits for the Chall-Manager container. For more infos:
+		// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+		Limits pulumi.StringMapInput
+		limits pulumi.StringMapOutput
+
 		Swagger bool
 
 		Etcd *ChallManagerEtcdArgs
@@ -220,14 +230,24 @@ func (cm *ChallManager) defaults(args *ChallManagerArgs) *ChallManagerArgs {
 		wg.Wait()
 	}
 
+	args.requests = pulumi.StringMap{}.ToStringMapOutput()
+	if args.Requests != nil {
+		args.requests = args.Requests.ToStringMapOutput()
+	}
+
+	args.limits = pulumi.StringMap{}.ToStringMapOutput()
+	if args.Limits != nil {
+		args.limits = args.Limits.ToStringMapOutput()
+	}
+
 	return args
 }
 
 func (cm *ChallManager) provision(ctx *pulumi.Context, args *ChallManagerArgs, opts ...pulumi.ResourceOption) (err error) {
 	// Start chall-manager cluster
 	// Labels: https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/#labels
 
-	//  build custom target ops
+	// Create a specific provider for distant resources ("target").
 	topts := opts
 	if args.Kubeconfig != nil {
 		extcl, err := kubernetes.NewProvider(ctx, "external-cluster-pv", &kubernetes.ProviderArgs{
@@ -238,6 +258,7 @@ func (cm *ChallManager) provision(ctx *pulumi.Context, args *ChallManagerArgs, o
 		}
 		topts = append(topts, pulumi.Provider(extcl))
 	}
+
 	// => Namespace to deploy to
 	cm.tgtns, err = corev1.NewNamespace(ctx, "chall-manager-target-ns", &corev1.NamespaceArgs{
 		Metadata: metav1.ObjectMetaArgs{
@@ -757,6 +778,10 @@ func (cm *ChallManager) provision(ctx *pulumi.Context, args *ChallManagerArgs, o
 									Port: pulumi.Int(port),
 								},
 							},
+							Resources: corev1.ResourceRequirementsArgs{
+								Requests: args.requests,
+								Limits:   args.limits,
+							},
 						},
 					},
 					Volumes: func() corev1.VolumeArrayOutput {