Custom internal alias

.vscode/launch.json

@@ -29,7 +29,9 @@
         "--RADIX_FILE_NAME=/workspace/radixconfig.yaml",
         "--TO_ENVIRONMENT=qa",
         "--IMAGE_TAG_NAME=server=1.23-alpine-slim",
-        "--IMAGE_TAG_NAME=server2=1.22.1-alpine-perl"
+        "--IMAGE_TAG_NAME=server2=1.22.1-alpine-perl",
+        "--RADIX_RESERVED_APP_DNS_ALIASES=api=radix-api,canary=radix-canary-golang,console=radix-web-console,cost-api=radix-cost-allocation-api,webhook=radix-github-webhook",
+        "--RADIX_RESERVED_DNS_ALIASES=grafana,prometheus,www"
       ]
     },
     {
@@ -50,7 +52,9 @@
         "--DEPLOYMENT_NAME=dev-hyxzv-j9pg34k2",
         "--RADIX_FILE_NAME=/workspace/radixconfig.yaml",
         "--DEBUG=true",
-        "--RADIX_CONTAINER_REGISTRY=radixdev.azurecr.io"
+        "--RADIX_CONTAINER_REGISTRY=radixdev.azurecr.io",
+        "--RADIX_RESERVED_APP_DNS_ALIASES=api=radix-api,canary=radix-canary-golang,console=radix-web-console,cost-api=radix-cost-allocation-api,webhook=radix-github-webhook",
+        "--RADIX_RESERVED_DNS_ALIASES=grafana,prometheus,www"
       ]
     },
     { 
@@ -71,7 +75,9 @@
         "--RADIX_CLUSTER_TYPE=development",
         "--RADIX_ZONE=dev",
         "--RADIX_CLUSTERNAME=weekly-44",
-        "--RADIX_CONTAINER_REGISTRY=radixdev.azurecr.io"
+        "--RADIX_CONTAINER_REGISTRY=radixdev.azurecr.io",
+        "--RADIX_RESERVED_APP_DNS_ALIASES=api=radix-api,canary=radix-canary-golang,console=radix-web-console,cost-api=radix-cost-allocation-api,webhook=radix-github-webhook",
+        "--RADIX_RESERVED_DNS_ALIASES=grafana,prometheus,www"
       ]
     },
     {
@@ -127,7 +133,9 @@
         "RADIX_DEPLOYMENTS_PER_ENVIRONMENT_HISTORY_LIMIT": "10",
         "RADIX_PIPELINE_JOBS_HISTORY_LIMIT": "5",
         "SECCOMP_PROFILE_FILENAME": "allow-buildah.json",
-        "RADIX_BUILDAH_IMAGE_BUILDER": "quay.io/buildah/stable:v1.31"
+        "RADIX_BUILDAH_IMAGE_BUILDER": "quay.io/buildah/stable:v1.31",
+        "RADIX_RESERVED_APP_DNS_ALIASES": "api=radix-api,canary=radix-canary-golang,console=radix-web-console,cost-api=radix-cost-allocation-api,webhook=radix-github-webhook",
+        "RADIX_RESERVED_DNS_ALIASES": "grafana,prometheus,www"
       },
       "args": ["--useOutClusterClient=false"]
     },

Makefile

@@ -91,11 +91,13 @@ mocks:
 	mockgen -source ./pkg/apis/deployment/deploymentfactory.go -destination ./pkg/apis/deployment/deploymentfactory_mock.go -package deployment
 	mockgen -source ./pkg/apis/deployment/deployment.go -destination ./pkg/apis/deployment/deployment_mock.go -package deployment
 	mockgen -source ./pkg/apis/deployment/auxiliaryresourcemanager.go -destination ./pkg/apis/deployment/auxiliaryresourcemanager_mock.go -package deployment
-	mockgen -source ./pkg/apis/deployment/ingressannotationprovider.go -destination ./pkg/apis/deployment/ingressannotationprovider_mock.go -package deployment
+	mockgen -source ./pkg/apis/ingress/ingressannotationprovider.go -destination ./pkg/apis/ingress/ingressannotationprovider_mock.go -package ingress
 	mockgen -source ./pkg/apis/alert/alert.go -destination ./pkg/apis/alert/alert_mock.go -package alert
 	mockgen -source ./pkg/apis/alert/alertfactory.go -destination ./pkg/apis/alert/alertfactory_mock.go -package alert
 	mockgen -source ./pkg/apis/batch/syncer.go -destination ./pkg/apis/batch/syncer_mock.go -package batch
-	mockgen -source ./pkg/apis/batch/syncerfactory.go -destination ./pkg/apis/batch/syncerfactory_mock.go -package batch
+	mockgen -source ./radix-operator/batch/internal/syncerfactory.go -destination ./radix-operator/batch/internal/syncerfactory_mock.go -package internal
+	mockgen -source ./pkg/apis/dnsalias/syncer.go -destination ./pkg/apis/dnsalias/syncer_mock.go -package dnsalias
+	mockgen -source ./radix-operator/dnsalias/internal/syncerfactory.go -destination ./radix-operator/dnsalias/internal/syncerfactory_mock.go -package internal
 	mockgen -source ./radix-operator/common/handler.go -destination ./radix-operator/common/handler_mock.go -package common
 	mockgen -source ./pipeline-runner/internal/wait/job.go -destination ./pipeline-runner/internal/wait/job_mock.go -package wait
 
@@ -130,7 +132,7 @@ code-gen:
 	$(GOPATH)/pkg/mod/k8s.io/[email protected]/generate-groups.sh all $(ROOT_PACKAGE)/pkg/client $(ROOT_PACKAGE)/pkg/apis $(CUSTOM_RESOURCE_NAME):$(CUSTOM_RESOURCE_VERSION) --go-header-file $(GOPATH)/pkg/mod/k8s.io/[email protected]/hack/boilerplate.go.txt
 
 .PHONY: crds
-crds: temp-crds radixapplication-crd radixbatch-crd delete-temp-crds
+crds: temp-crds radixapplication-crd radixbatch-crd radixdnsalias-crd delete-temp-crds
 
 .PHONY: radixapplication-crd
 radixapplication-crd: temp-crds
@@ -141,6 +143,10 @@ radixapplication-crd: temp-crds
 radixbatch-crd: temp-crds
 	cp $(CRD_TEMP_DIR)radix.equinor.com_radixbatches.yaml $(CRD_CHART_DIR)radixbatch.yaml
 
+.PHONY: radixdnsalias-crd
+radixdnsalias-crd: temp-crds
+	cp $(CRD_TEMP_DIR)radix.equinor.com_radixdnsaliases.yaml $(CRD_CHART_DIR)radixdnsalias.yaml
+
 .PHONY: temp-crds
 temp-crds: controller-gen
 	echo "tempcrdrun"
@@ -154,4 +160,8 @@ delete-temp-crds:
 staticcheck:
 	staticcheck `go list ./... | grep -v "pkg/client"` &&     go vet `go list ./... | grep -v "pkg/client"`
 
+.PHONY: lint
+lint:
+	golangci-lint run
+
 

charts/radix-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.26.2
-appVersion: 1.46.2
+version: 1.27.0
+appVersion: 1.47.0
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

charts/radix-operator/templates/_helpers.tpl

@@ -56,3 +56,20 @@ Create the name of the service account to use
 {{- define "radix-operator.serviceAccountName" -}}
 {{- default (include "radix-operator.fullname" .) .Values.serviceAccount.name }}
 {{- end }}
+
+{{/*
+Utility function to take list to comma separated dictionary
+*/}}
+{{- define "helm-toolkit.utils.joinMapWithComma" -}}
+{{- $local := dict "first" true -}}
+{{- range $k, $v := . -}}{{- if not $local.first -}},{{- end -}}{{ $k }}={{ $v }}{{- $_ := set $local "first" false -}}{{- end -}}
+{{- end -}}
+
+{{/*
+Utility function to take list to comma separated string
+*/}}
+{{- define "helm-toolkit.utils.joinListWithComma" -}}
+{{- $local := dict "first" true -}}
+{{- range $k, $v := . -}}{{- if not $local.first -}},{{- end -}}{{- $v -}}{{- $_ := set $local "first" false -}}{{- end -}}
+{{- end -}}
+

charts/radix-operator/templates/deployment.yaml

@@ -158,6 +158,10 @@ spec:
               value: {{ .Values.seccompProfile.fileNameOnNode }}
             - name: RADIX_BUILDAH_IMAGE_BUILDER
               value: {{ .Values.buildahImageBuilder }}
+            - name: RADIX_RESERVED_APP_DNS_ALIASES
+              value: {{ include "helm-toolkit.utils.joinMapWithComma" .Values.reservedAppDNSAlias | quote }}
+            - name: RADIX_RESERVED_DNS_ALIASES
+              value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.reservedDNSAlias | quote }}
           livenessProbe:
             httpGet:
               path: /healthz

charts/radix-operator/templates/radix-operator-rbac.yaml

@@ -29,6 +29,8 @@ rules:
   - radixalerts/status
   - radixbatches
   - radixbatches/status
+  - radixdnsaliases
+  - radixdnsaliases/status
   verbs:
   - get
   - list

charts/radix-operator/templates/radixapplication.yaml

@@ -374,7 +374,7 @@ spec:
                               applies to.
                             maxLength: 63
                             minLength: 1
-                            pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                            pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                             type: string
                           horizontalScaling:
                             description: 'Configuration for automatic horizontal scaling
@@ -880,14 +880,14 @@ spec:
                           description: Defines which port in the ports list where
                             metrics is served.
                           maxLength: 15
-                          pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                          pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                           type: string
                       type: object
                     name:
                       description: Name of the component.
                       maxLength: 253
                       minLength: 1
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                     node:
                       description: 'Defines GPU requirements for the component. More
@@ -910,7 +910,7 @@ spec:
                             description: Name of the port.
                             maxLength: 15
                             minLength: 1
-                            pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                            pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                             type: string
                           port:
                             description: Port number.
@@ -934,7 +934,7 @@ spec:
                       description: 'Defines which port (name) from the ports list
                         that shall be accessible from the internet. More info: https://www.radix.equinor.com/references/reference-radix-config/#publicport'
                       maxLength: 15
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                     resources:
                       description: 'Configures CPU and memory resources for the component.
@@ -1079,6 +1079,42 @@ spec:
                 x-kubernetes-list-map-keys:
                 - name
                 x-kubernetes-list-type: map
+              dnsAlias:
+                description: 'List of DNS names and which component and environment
+                  incoming requests shall be routed to. More info: https://www.radix.equinor.com/references/reference-radix-config/#dnsalias'
+                items:
+                  description: DNSAlias defines mapping between an DNS alias and a
+                    component and environment.
+                  properties:
+                    alias:
+                      description: Alias name, e.g. my-app, which will prefix full
+                        internal alias my-app.radix.equinor.com
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
+                      type: string
+                    component:
+                      description: Name of the component that shall receive the incoming
+                        requests.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
+                      type: string
+                    environment:
+                      description: Name of the environment for the component.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
+                      type: string
+                  required:
+                  - alias
+                  - component
+                  - environment
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - alias
+                x-kubernetes-list-type: map
               dnsAppAlias:
                 description: 'Configure a component and environment to be linked to
                   the app alias DNS record. More info: https://www.radix.equinor.com/references/reference-radix-config/#dnsappalias'
@@ -1088,13 +1124,13 @@ spec:
                       requests.
                     maxLength: 63
                     minLength: 1
-                    pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                    pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                     type: string
                   environment:
                     description: Name of the environment for the component.
                     maxLength: 63
                     minLength: 1
-                    pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                    pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                     type: string
                 type: object
               dnsExternalAlias:
@@ -1115,13 +1151,13 @@ spec:
                         requests.
                       maxLength: 63
                       minLength: 1
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                     environment:
                       description: Name of the environment for the component.
                       maxLength: 63
                       minLength: 1
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                   required:
                   - alias
@@ -1210,7 +1246,7 @@ spec:
                       description: Name of the environment.
                       maxLength: 63
                       minLength: 1
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                   required:
                   - name
@@ -1264,7 +1300,7 @@ spec:
                               applies to.
                             maxLength: 63
                             minLength: 1
-                            pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                            pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                             type: string
                           identity:
                             description: 'Environment specific configuration for workload
@@ -1726,15 +1762,15 @@ spec:
                           description: Defines which port in the ports list where
                             metrics is served.
                           maxLength: 15
-                          pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                          pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                           type: string
                       type: object
                     name:
                       description: Name of the environment which the settings applies
                         to.
                       maxLength: 253
                       minLength: 1
-                      pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                      pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                       type: string
                     node:
                       description: 'Defines GPU requirements for the job. More info:
@@ -1779,7 +1815,7 @@ spec:
                             description: Name of the port.
                             maxLength: 15
                             minLength: 1
-                            pattern: ^(([a-z0-9][-a-z0-9.]*)?[a-z0-9])?$
+                            pattern: ^(([a-z0-9][-a-z0-9]*)?[a-z0-9])?$
                             type: string
                           port:
                             description: Port number.