finish with DEV-22200

api/v1/app.go

@@ -378,10 +378,16 @@ type Proxy struct {
 	NoProxy    []string `json:"noProxy,omitempty"`
 }
 
+type ClusterDomainPrefix struct {
+	Enabled bool   `json:"enabled,omitempty"`
+	Prefix  string `json:"prefix,omitempty"`
+}
+
 type Networking struct {
-	Ingress Ingress `json:"ingress,omitempty"`
-	HTTPS   HTTPS   `json:"https,omitempty"`
-	Proxy   Proxy   `json:"proxy,omitempty"`
+	Ingress             Ingress             `json:"ingress,omitempty"`
+	HTTPS               HTTPS               `json:"https,omitempty"`
+	Proxy               Proxy               `json:"proxy,omitempty"`
+	ClusterDomainPrefix ClusterDomainPrefix `json:"clusterDomainPrefix,omitempty"`
 }
 
 type SSO struct {

api/v1/appdefaults.go

@@ -440,8 +440,9 @@ var networkingDefault = Networking{
 		IstioIngressSelectorValue: "ingressgateway",
 		OcpSecureRoutes:           false,
 	},
-	HTTPS: HTTPS{Enabled: false},
-	Proxy: Proxy{Enabled: false, ConfigRef: "cp-proxy"},
+	HTTPS:               HTTPS{Enabled: false},
+	Proxy:               Proxy{Enabled: false, ConfigRef: "cp-proxy"},
+	ClusterDomainPrefix: ClusterDomainPrefix{Enabled: false},
 }
 
 var ssoDefault = SSO{

charts/cnvrg-mlops-idc/crds/mlops.cnvrg.io_cnvrgapps.yaml

@@ -744,6 +744,13 @@ spec:
                 type: object
               networking:
                 properties:
+                  clusterDomainPrefix:
+                    properties:
+                      enabled:
+                        type: boolean
+                      prefix:
+                        type: string
+                    type: object
                   https:
                     properties:
                       cert:

charts/cnvrg-mlops-idc/templates/cap.yml

@@ -321,6 +321,9 @@ spec:
       httpProxy: {{ toJson .Values.networking.proxy.httpProxy  }}
       httpsProxy: {{ toJson .Values.networking.proxy.httpsProxy}}
       noProxy: {{ toJson .Values.networking.proxy.noProxy}}
+    clusterDomainPrefix:
+      enabled: {{ .Values.networking.clusterDomainPrefix.enabled }}
+      prefix: {{ .Values.networking.clusterDomainPrefix.prefix }}
   sso:
     enabled: {{.Values.sso.enabled}}
     version: {{.Values.sso.version}}

charts/cnvrg-mlops-idc/templates/operator.yml

@@ -66,7 +66,7 @@ spec:
             - "3"
             - --namespace
             - {{.Release.Namespace}}
-          image: "{{.Values.imageHub}}/cnvrg-operator:v5.0.1.snp"
+          image: "{{.Values.imageHub}}/cnvrg-operator:5.0.0-DEV-22200-definable-application-host-names-943"
           imagePullPolicy: Always
           name: cnvrg-operator
           resources:

charts/cnvrg-mlops-idc/values.yaml

@@ -315,6 +315,9 @@ networking:
     httpProxy: []
     httpsProxy: []
     noProxy: []
+  clusterDomainPrefix:
+    enabled: true
+    prefix: ""
 sso:
   enabled: false
   version: v3

charts/cnvrg-mlops/crds/mlops.cnvrg.io_cnvrgapps.yaml

@@ -744,6 +744,13 @@ spec:
                 type: object
               networking:
                 properties:
+                  clusterDomainPrefix:
+                    properties:
+                      enabled:
+                        type: boolean
+                      prefix:
+                        type: string
+                    type: object
                   https:
                     properties:
                       cert:

charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml

@@ -744,6 +744,13 @@ spec:
                 type: object
               networking:
                 properties:
+                  clusterDomainPrefix:
+                    properties:
+                      enabled:
+                        type: boolean
+                      prefix:
+                        type: string
+                    type: object
                   https:
                     properties:
                       cert:

config/crd/bases/mlops.cnvrg.io_cnvrgapps.yaml

@@ -744,6 +744,13 @@ spec:
                 type: object
               networking:
                 properties:
+                  clusterDomainPrefix:
+                    properties:
+                      enabled:
+                        type: boolean
+                      prefix:
+                        type: string
+                    type: object
                   https:
                     properties:
                       cert:

controllers/app/utils.go

@@ -12,6 +12,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
+	mathrand "math/rand"
 	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sort"
@@ -64,6 +65,9 @@ func getTlsCert(app *mlopsv1.CnvrgApp, clientset client.Client) (cert string, ke
 
 func CalculateAndApplyAppDefaults(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.CnvrgAppSpec, clientset client.Client) error {
 
+	// set cluster domain prefix if enabled
+	setClusterDomainPrefix(app, defaultSpec)
+
 	// set default heap size for ES if not set by user
 	if strings.Contains(app.Spec.Dbs.Es.Requests.Memory, "Gi") && app.Spec.Dbs.Es.JavaOpts == "" {
 		requestMem := strings.TrimSuffix(app.Spec.Dbs.Es.Requests.Memory, "Gi")
@@ -131,7 +135,11 @@ func CalculateAndApplyAppDefaults(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.Cn
 			scheme = "https"
 		}
 		if app.Spec.SSO.Central.PublicUrl == "" {
-			defaultSpec.SSO.Central.PublicUrl = fmt.Sprintf("%s://%s.%s", scheme, defaultSpec.SSO.Central.SvcName, app.Spec.ClusterDomain)
+			defaultSpec.SSO.Central.PublicUrl = fmt.Sprintf("%s://%s%s.%s",
+				scheme,
+				defaultSpec.SSO.Central.SvcName,
+				defaultSpec.Networking.ClusterDomainPrefix.Prefix,
+				app.Spec.ClusterDomain)
 		}
 		if app.Spec.SSO.Proxy.Address == "" {
 			defaultSpec.SSO.Proxy.Address = fmt.Sprintf("%s.%s.svc.%s",
@@ -142,8 +150,9 @@ func CalculateAndApplyAppDefaults(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.Cn
 		}
 		if app.Spec.SSO.Central.JwksURL == "" {
 
-			defaultSpec.SSO.Central.JwksURL = fmt.Sprintf("%s://%s.%s/v1/%s/.well-known/jwks.json?client_id", scheme,
+			defaultSpec.SSO.Central.JwksURL = fmt.Sprintf("%s://%s%s.%s/v1/%s/.well-known/jwks.json?client_id", scheme,
 				defaultSpec.SSO.Jwks.SvcName,
+				defaultSpec.Networking.ClusterDomainPrefix.Prefix,
 				app.Spec.ClusterDomain,
 				strings.Split(app.Spec.ClusterDomain, ".")[0],
 			)
@@ -165,9 +174,26 @@ func CalculateAndApplyAppDefaults(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.Cn
 	return nil
 }
 
+func setClusterDomainPrefix(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.CnvrgAppSpec) {
+	if app.Spec.Networking.ClusterDomainPrefix.Enabled && app.Spec.Networking.ClusterDomainPrefix.Prefix == "" {
+		defaultSpec.Networking.ClusterDomainPrefix.Prefix = fmt.Sprintf("-%s", RandomString(5))
+	}
+}
+
 func labelsMapToList(labels map[string]string) (labelList []string) {
 	for labelName, _ := range labels {
 		labelList = append(labelList, labelName)
 	}
 	return labelList
 }
+
+func RandomString(length int) string {
+	var output strings.Builder
+	charSet := "abcdefghijklmnopqrstuvwxyz0123456789"
+	for i := 0; i < length; i++ {
+		random := mathrand.Intn(len(charSet))
+		randomChar := charSet[random]
+		output.WriteString(string(randomChar))
+	}
+	return output.String()
+}

pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl

@@ -20,6 +20,7 @@ data:
   DEFAULT_COMPUTE_CLUSTER_DOMAIN: "{{ defaultComputeClusterDomain .}}"
   DEFAULT_COMPUTE_CLUSTER_HTTPS: "{{ .Spec.Networking.HTTPS.Enabled }}"
   CNVRG_CLUSTER_INTERNAL_DOMAIN: "{{ .Spec.ClusterInternalDomain }}"
+  CNVRG_CLUSTER_DOMAIN_PREFIX: "{{ .Spec.Networking.ClusterDomainPrefix.Prefix }}"
   HYPER_SERVER_URL: "{{ hyperServerUrl .}}"
   HYPER_SERVER_PORT: "{{ .Spec.ControlPlane.Hyper.Port }}"
   ROUTE_BY_ISTIO: "{{ routeBy . "ISTIO" }}"

pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml

@@ -747,6 +747,13 @@ spec:
                 type: object
               networking:
                 properties:
+                  clusterDomainPrefix:
+                    properties:
+                      enabled:
+                        type: boolean
+                      prefix:
+                        type: string
+                    type: object
                   https:
                     properties:
                       cert:

pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgthirdparties.yaml

@@ -21,6 +21,15 @@ metadata:
     mlops.cnvrg.io/default-loader: "true"
     mlops.cnvrg.io/own: "false"
     mlops.cnvrg.io/updatable: "true"
+    mlops.cnvrg.io/default-loader: "true"
+    mlops.cnvrg.io/own: "false"
+    mlops.cnvrg.io/updatable: "true"
+    mlops.cnvrg.io/default-loader: "true"
+    mlops.cnvrg.io/own: "false"
+    mlops.cnvrg.io/updatable: "true"
+    mlops.cnvrg.io/default-loader: "true"
+    mlops.cnvrg.io/own: "false"
+    mlops.cnvrg.io/updatable: "true"
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: cnvrgthirdparties.mlops.cnvrg.io

pkg/app/controlplane/tmpl/webapp/ingress.tpl

@@ -28,11 +28,11 @@ spec:
   {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }}
   tls:
   - hosts:
-      - {{ .Spec.ControlPlane.WebApp.SvcName}}.{{ .Spec.ClusterDomain }}
+      - {{ .Spec.ControlPlane.WebApp.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}
     secretName: {{ .Spec.Networking.HTTPS.CertSecret }}
   {{- end }}
   rules:
-    - host: "{{.Spec.ControlPlane.WebApp.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - host: "{{.Spec.ControlPlane.WebApp.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
       http:
         paths:
           - path: /

pkg/app/controlplane/tmpl/webapp/route.tpl

@@ -23,7 +23,7 @@ metadata:
     {{$k}}: "{{$v}}"
     {{- end }}
 spec:
-  host: "{{ .Spec.ControlPlane.WebApp.SvcName }}.{{ .Spec.ClusterDomain }}"
+  host: "{{ .Spec.ControlPlane.WebApp.SvcName }}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   port:
     {{- if isTrue .Spec.SSO.Enabled }}
     targetPort: 8888

pkg/app/controlplane/tmpl/webapp/vs.tpl

@@ -22,7 +22,7 @@ metadata:
     {{- end }}
 spec:
   hosts:
-    - "{{.Spec.ControlPlane.WebApp.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - "{{.Spec.ControlPlane.WebApp.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   gateways:
     - {{ .Spec.Networking.Ingress.IstioGwName}}
   http:

pkg/app/dbs/tmpl/es/elastalert/ingress.tpl

@@ -22,11 +22,11 @@ spec:
   {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }}
   tls:
   - hosts:
-      - {{ .Spec.Dbs.Es.Elastalert.SvcName }}.{{ .Spec.ClusterDomain }}
+      - {{ .Spec.Dbs.Es.Elastalert.SvcName }}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}
     secretName: {{ .Spec.Networking.HTTPS.CertSecret }}
   {{- end }}
   rules:
-    - host: "{{.Spec.Dbs.Es.Elastalert.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - host: "{{.Spec.Dbs.Es.Elastalert.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
       http:
         paths:
           - path: /

pkg/app/dbs/tmpl/es/elastalert/route.tpl

@@ -17,7 +17,7 @@ metadata:
     {{$k}}: "{{$v}}"
     {{- end }}
 spec:
-  host: "{{ .Spec.Dbs.Es.Elastalert.SvcName }}.{{ .Spec.ClusterDomain }}"
+  host: "{{ .Spec.Dbs.Es.Elastalert.SvcName }}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   port:
     targetPort: {{ .Spec.Dbs.Es.Elastalert.Port }}
   to:

pkg/app/dbs/tmpl/es/elastalert/vs.tpl

@@ -16,7 +16,7 @@ metadata:
     {{- end }}
 spec:
   hosts:
-    - "{{.Spec.Dbs.Es.Elastalert.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - "{{.Spec.Dbs.Es.Elastalert.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   gateways:
   - {{ .Spec.Networking.Ingress.IstioGwName}}
   http:

pkg/app/dbs/tmpl/es/elastic/ingress.tpl

@@ -22,11 +22,11 @@ spec:
   {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }}
   tls:
   - hosts:
-      - {{ .Spec.Dbs.Es.SvcName}}.{{ .Spec.ClusterDomain }}
+      - {{ .Spec.Dbs.Es.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}
     secretName: {{ .Spec.Networking.HTTPS.CertSecret }}
   {{- end }}
   rules:
-    - host: "{{.Spec.Dbs.Es.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - host: "{{.Spec.Dbs.Es.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
       http:
         paths:
           - path: /

pkg/app/dbs/tmpl/es/elastic/route.tpl

@@ -17,7 +17,7 @@ metadata:
     {{$k}}: "{{$v}}"
     {{- end }}
 spec:
-  host: "{{ .Spec.Dbs.Es.SvcName }}.{{ .Spec.ClusterDomain }}"
+  host: "{{ .Spec.Dbs.Es.SvcName }}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   port:
     targetPort: {{ .Spec.Dbs.Es.Port }}
   to:

pkg/app/dbs/tmpl/es/elastic/vs.tpl

@@ -16,7 +16,7 @@ metadata:
     {{- end }}
 spec:
   hosts:
-    - "{{.Spec.Dbs.Es.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - "{{.Spec.Dbs.Es.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   gateways:
     - {{ .Spec.Networking.Ingress.IstioGwName }}
   http:

pkg/app/dbs/tmpl/es/kibana/ingress.tpl

@@ -28,11 +28,11 @@ spec:
   {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }}
   tls:
   - hosts:
-      - {{.Spec.Dbs.Es.Kibana.SvcName}}.{{ .Spec.ClusterDomain }}
+      - {{.Spec.Dbs.Es.Kibana.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}
     secretName: {{ .Spec.Networking.HTTPS.CertSecret }}
   {{- end }}
   rules:
-    - host: "{{.Spec.Dbs.Es.Kibana.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - host: "{{.Spec.Dbs.Es.Kibana.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
       http:
         paths:
           - path: /

pkg/app/dbs/tmpl/es/kibana/route.tpl

@@ -23,7 +23,7 @@ metadata:
     {{$k}}: "{{$v}}"
     {{- end }}
 spec:
-  host: "{{ .Spec.Dbs.Es.Kibana.SvcName }}.{{ .Spec.ClusterDomain }}"
+  host: "{{ .Spec.Dbs.Es.Kibana.SvcName }}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   port:
     {{- if isTrue .Spec.SSO.Enabled }}
     targetPort: 8888

pkg/app/dbs/tmpl/es/kibana/vs.tpl

@@ -22,7 +22,7 @@ metadata:
     {{- end }}
 spec:
   hosts:
-    - "{{.Spec.Dbs.Es.Kibana.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - "{{.Spec.Dbs.Es.Kibana.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
   gateways:
   - {{ .Spec.Networking.Ingress.IstioGwName}}
   http:

pkg/app/dbs/tmpl/minio/ingress.tpl

@@ -22,11 +22,11 @@ spec:
   {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }}
   tls:
   - hosts:
-      - {{ .Spec.Dbs.Minio.SvcName}}.{{ .Spec.ClusterDomain }}
+      - {{ .Spec.Dbs.Minio.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}
     secretName: {{ .Spec.Networking.HTTPS.CertSecret }}
   {{- end }}
   rules:
-    - host: "{{.Spec.Dbs.Minio.SvcName}}.{{ .Spec.ClusterDomain }}"
+    - host: "{{.Spec.Dbs.Minio.SvcName}}{{.Spec.Networking.ClusterDomainPrefix.Prefix}}.{{ .Spec.ClusterDomain }}"
       http:
         paths:
           - path: /