Pass targetIPs to service-backend

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · May 3, 2024 · e5e1c7e · e5e1c7e
1 parent 320c419
commit e5e1c7e
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 0 deletions.
diff --git a/apis/installer/v1alpha1/ace_service_backend_types.go b/apis/installer/v1alpha1/ace_service_backend_types.go
@@ -76,6 +76,8 @@ type ServiceBackendSpec struct {
 	Ingress    AppIngress     `json:"ingress"`
 	Monitoring Monitoring     `json:"monitoring"`
 	Server     ServerConfig   `json:"server"`
+	// +optional
+	DNS ServiceBackendDns `json:"dns"`
 }
 
 type ServerConfig struct {
@@ -99,6 +101,11 @@ type Cookie struct {
 	EncryptionKey string `json:"encryptionKey"`
 }
 
+type ServiceBackendDns struct {
+	// +optional
+	TargetIPs []string `json:"targetIPs"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ServiceBackendList is a list of ServiceBackends

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/ace-installer/templates/apps/opscenter-features/opscenter-features.yaml b/charts/ace-installer/templates/apps/opscenter-features/opscenter-features.yaml
@@ -7,6 +7,19 @@
 {{ $_ := set $overrides.helm "repositories" $helmrepos }}
 {{ $_ := set $overrides.helm "createNamespace" $.Values.helm.createNamespace }}
 
+{{ $targetIPs := dig "releases" "ace" "values" "global" "infra" "dns" "targetIPs" list $.Values.helm }}
+{{ if $targetIPs }}
+{{ $hrs := printf `
+service-backend:
+  values:
+    dns:
+      targetIPs: %v
+`
+  ($targetIPs | toJson)
+  | fromYaml }}
+{{ $_ := set $overrides.helm "releases" $hrs }}
+{{ end }}
+
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 

diff --git a/charts/service-backend/README.md b/charts/service-backend/README.md
@@ -86,6 +86,7 @@ The following table lists the configurable parameters of the `service-backend` c
 | server.consumerScope                       | How consumers access the service provider cluster. In Kubernetes, "namespaced" allows namespace isolation. In kcp, "cluster" allows workspace isolation, and with that allows cluster-scoped resources to bind, and it is generally more performant. | <code>"Namespaced"</code>                                                                                                                           |
 | server.cookie.signingKey                   | The key which is used to sign cookies, base64 encoded. Valid lengths are 32 or 64 bytes.                                                                                                                                                             | <code>""</code>                                                                                                                                     |
 | server.cookie.encryptionKey                | The key which is used to encrypt cookies, base64 encoded, optional. Valid lengths are 16, 24, or 32 bytes selecting AES-128, AES-192, or AES-256.                                                                                                    | <code>""</code>                                                                                                                                     |
+| dns.targetIPs                              |                                                                                                                                                                                                                                                      | <code>[]</code>                                                                                                                                     |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

diff --git a/charts/service-backend/templates/ingress.yaml b/charts/service-backend/templates/ingress.yaml
@@ -1,11 +1,17 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "service-backend.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
+
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
+
+{{- if and (not (hasKey .Values.ingress.annotations "external-dns.alpha.kubernetes.io/target")) .Values.dns.targetIPs }}
+{{- $_ := set .Values.ingress.annotations "external-dns.alpha.kubernetes.io/target" (join "," .Values.dns.targetIPs)}}
+{{- end }}
+
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}

diff --git a/charts/service-backend/values.openapiv3_schema.yaml b/charts/service-backend/values.openapiv3_schema.yaml
@@ -421,6 +421,13 @@ properties:
     - maxReplicas
     - minReplicas
     type: object
+  dns:
+    properties:
+      targetIPs:
+        items:
+          type: string
+        type: array
+    type: object
   fullnameOverride:
     type: string
   image:

diff --git a/charts/service-backend/values.yaml b/charts/service-backend/values.yaml
@@ -115,3 +115,6 @@ server:
     signingKey: ""
     # The key which is used to encrypt cookies, base64 encoded, optional. Valid lengths are 16, 24, or 32 bytes selecting AES-128, AES-192, or AES-256.
     encryptionKey: ""
+
+dns:
+  targetIPs: []