Merge branch 'DEV-22107-no-cluster-roles' into DEV-22121-minio-ingres…

…s-svc-fix
AccessibleAI · Feb 13, 2024 · 8e8807f · 8e8807f
2 parents d99d99c + 4f7f240
commit 8e8807f
Show file tree

Hide file tree

Showing 50 changed files with 2,913 additions and 1,385 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
 # Build the manager binary
-FROM golang:1.19.1 as builder
-
+FROM golang:1.21.1 as builder
 ARG git_auth
 ARG private_repo
 

diff --git a/api/v1/appdefaults.go b/api/v1/appdefaults.go
@@ -459,7 +459,7 @@ var ssoDefault = SSO{
 
 	Jwks: Jwks{
 		Enabled:      false,
-		Image:        "cnvrg/jwks:latest",
+		Image:        "cnvrg/jwks:ns-watch-scope",
 		Replicas:     1,
 		SvcName:      "cnvrg-jwks",
 		CacheImage:   "redis:7.0.5",
@@ -470,7 +470,7 @@ var ssoDefault = SSO{
 		Enabled:                          false,
 		Replicas:                         1,
 		SvcName:                          "sso-central",
-		CnvrgProxyImage:                  "cnvrg-proxy:v1.0.15",
+		CnvrgProxyImage:                  "cnvrg-proxy:ns-watch-scope",
 		OauthProxyImage:                  "oauth2-proxy:v7.4.ssov3.p6",
 		CentralUiImage:                   "centralsso:latest",
 		EmailDomain:                      []string{"*"},
@@ -492,7 +492,7 @@ var ssoDefault = SSO{
 	Proxy: CentralProxy{
 		Enabled:  false,
 		Replicas: 1,
-		Image:    "cnvrg-proxy:v1.0.15",
+		Image:    "cnvrg-proxy:ns-watch-scope",
 		SvcName:  "cnvrg-proxy-central",
 		Requests: Requests{
 			Cpu:    "200m",

diff --git a/charts/cnvrg-admission/templates/rbac.yml b/charts/cnvrg-admission/templates/rbac.yml
@@ -33,6 +33,12 @@ rules:
   - domains
   verbs:
   - list
+- apiGroups:
+    - ""
+  resources:
+    - configmaps
+  verbs:
+    - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/charts/cnvrg-all-in-one/values.yaml b/charts/cnvrg-all-in-one/values.yaml
@@ -318,8 +318,8 @@ networking:
     perTryTimeout: 3600s
     istioGwEnabled: true
     istioGwName: ''
-    istioIngressSelectorKey: 'istio'
-    istioIngressSelectorValue: 'ingressgateway'
+    istioIngressSelectorKey: ''
+    istioIngressSelectorValue: ''
     ocpSecureRoutes: false
   https:
     enabled: false

diff --git a/charts/cnvrg-cap/templates/cap.yml b/charts/cnvrg-cap/templates/cap.yml
@@ -3,6 +3,8 @@ kind: CnvrgApp
 metadata:
   name: cnvrg-app
   namespace: {{ .Release.Namespace}}
+  labels:
+    mlops.cnvrg.io/domain.auto.discovery: "true"
 spec:
   clusterDomain: {{.Values.clusterDomain}}
   clusterInternalDomain: {{.Values.clusterInternalDomain}}

diff --git a/charts/cnvrg-mlops/Chart.yaml b/charts/cnvrg-mlops/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: cnvrg-mlops-platform
+description: A cnvrg.io operator chart for K8s
+type: application
+version: 5.0.0
+appVersion: 1.2.3