onprem: 2.5.6 (#10)

codefresh-io · Oct 23, 2024 · 22bc634 · 22bc634
1 parent 2a570ad
commit 22bc634
Show file tree

Hide file tree

Showing 11 changed files with 174 additions and 216 deletions.
diff --git a/codefresh/.ci/values/cfapi-roles-no-rbac.yaml b/codefresh/.ci/values/cfapi-roles-no-rbac.yaml
diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml
@@ -1,105 +1,8 @@
 seed-e2e:
   enabled: true
 
-# kinda external secrets
-secrets:
-  ext-mongo:
-    enabled: true
-    stringData:
-      mongodb-host: cf-mongodb:27017
-      mongodb-password: mTiXcU2wafr9
-      mongodb-user: cfuser
-      mongodb-root-user: root
-      mongodb-root-password: XT9nmM8dZD
-  ext-postgres:
-    enabled: true
-    stringData:
-      postgres-hostname: cf-postgresql
-      postgres-password: eC9arYka4ZbH
-      postgres-user: postgres
-  ext-redis:
-    enabled: true
-    stringData:
-      redis-url: cf-redis-master
-      redis-password: hoC9szf7NtrU
-  ext-rabbitmq:
-    enabled: true
-    stringData:
-      rabbitmq-hostname: cf-rabbitmq:5672
-      rabbitmq-password: cVz9ZdJKYm7u
-      rabbitmq-username: user
-  ext-firebase:
-    enabled: true
-    stringData:
-      firebase-url: "" # placeholder for ${FIRBASE_URL}
-      firebase-secret: ""  # placeholder for ${FIREBASE_SECRET}
-  e2e-mongo-uri:
-    enabled: true
-    stringData:
-      mongo-uri: mongodb://cfuser:mTiXcU2wafr9@cf-mongodb:27017/codefresh
-
-seed:
-  mongoSeedJob:
-    mongodbRootUserSecretKeyRef:
-      name: cf-codefresh-ext-mongo
-      key: mongodb-root-user
-    mongodbRootPasswordSecretKeyRef:
-      name: cf-codefresh-ext-mongo
-      key: mongodb-root-password
-
-  postgresSeedJob:
-    postgresUserSecretKeyRef:
-      name: cf-codefresh-ext-postgres
-      key: postgres-user
-    postgresPasswordSecretKeyRef:
-      name: cf-codefresh-ext-postgres
-      key: postgres-password
-
 global:
   appUrl: "" # placeholder
-  firebaseUrlSecretKeyRef:
-    name: cf-codefresh-ext-firebase
-    key: firebase-url
-  firebaseSecretSecretKeyRef:
-    name: cf-codefresh-ext-firebase
-    key: firebase-secret
-
-  mongodbUserSecretKeyRef:
-    name: cf-codefresh-ext-mongo
-    key: mongodb-user
-  mongodbPasswordSecretKeyRef:
-    name: cf-codefresh-ext-mongo
-    key: mongodb-password
-  mongodbHostSecretKeyRef:
-    name: cf-codefresh-ext-mongo
-    key: mongodb-host
-
-  postgresHostnameSecretKeyRef:
-    name: cf-codefresh-ext-postgres
-    key: postgres-hostname
-  postgresPasswordSecretKeyRef:
-    name: cf-codefresh-ext-postgres
-    key: postgres-password
-  postgresUserSecretKeyRef:
-    name: cf-codefresh-ext-postgres
-    key: postgres-user
-
-  rabbitmqHostnameSecretKeyRef:
-    name: cf-codefresh-ext-rabbitmq
-    key: rabbitmq-hostname
-  rabbitmqPasswordSecretKeyRef:
-    name: cf-codefresh-ext-rabbitmq
-    key: rabbitmq-password
-  rabbitmqUsernameSecretKeyRef:
-    name: cf-codefresh-ext-rabbitmq
-    key: rabbitmq-username
-
-  redisPasswordSecretKeyRef:
-    name: cf-codefresh-ext-redis
-    key: redis-password
-  redisUrlSecretKeyRef:
-    name: cf-codefresh-ext-redis
-    key: redis-url
 
 cfapi:
   rbac:

diff --git a/codefresh/.ci/values/external-secrets.yaml b/codefresh/.ci/values/external-secrets.yaml
@@ -0,0 +1,98 @@
+# values to emulate external secrets
+secrets:
+  ext-mongo:
+    enabled: true
+    stringData:
+      mongodb-host: cf-mongodb:27017
+      mongodb-password: mTiXcU2wafr9
+      mongodb-user: cfuser
+      mongodb-root-user: root
+      mongodb-root-password: XT9nmM8dZD
+  ext-postgres:
+    enabled: true
+    stringData:
+      postgres-hostname: cf-postgresql
+      postgres-password: eC9arYka4ZbH
+      postgres-user: postgres
+  ext-redis:
+    enabled: true
+    stringData:
+      redis-url: cf-redis-master
+      redis-password: hoC9szf7NtrU
+  ext-rabbitmq:
+    enabled: true
+    stringData:
+      rabbitmq-hostname: cf-rabbitmq:5672
+      rabbitmq-password: cVz9ZdJKYm7u
+      rabbitmq-username: user
+  ext-firebase:
+    enabled: true
+    stringData:
+      firebase-url: "" # placeholder for ${FIRBASE_URL}
+      firebase-secret: ""  # placeholder for ${FIREBASE_SECRET}
+  e2e-mongo-uri:
+    enabled: true
+    stringData:
+      mongo-uri: mongodb://cfuser:mTiXcU2wafr9@cf-mongodb:27017/codefresh
+
+seed:
+  mongoSeedJob:
+    mongodbRootUserSecretKeyRef:
+      name: cf-codefresh-ext-mongo
+      key: mongodb-root-user
+    mongodbRootPasswordSecretKeyRef:
+      name: cf-codefresh-ext-mongo
+      key: mongodb-root-password
+
+  postgresSeedJob:
+    postgresUserSecretKeyRef:
+      name: cf-codefresh-ext-postgres
+      key: postgres-user
+    postgresPasswordSecretKeyRef:
+      name: cf-codefresh-ext-postgres
+      key: postgres-password
+
+global:
+  firebaseUrlSecretKeyRef:
+    name: cf-codefresh-ext-firebase
+    key: firebase-url
+  firebaseSecretSecretKeyRef:
+    name: cf-codefresh-ext-firebase
+    key: firebase-secret
+
+  mongodbUserSecretKeyRef:
+    name: cf-codefresh-ext-mongo
+    key: mongodb-user
+  mongodbPasswordSecretKeyRef:
+    name: cf-codefresh-ext-mongo
+    key: mongodb-password
+  mongodbHostSecretKeyRef:
+    name: cf-codefresh-ext-mongo
+    key: mongodb-host
+
+  postgresHostnameSecretKeyRef:
+    name: cf-codefresh-ext-postgres
+    key: postgres-hostname
+  postgresPasswordSecretKeyRef:
+    name: cf-codefresh-ext-postgres
+    key: postgres-password
+  postgresUserSecretKeyRef:
+    name: cf-codefresh-ext-postgres
+    key: postgres-user
+
+  rabbitmqHostnameSecretKeyRef:
+    name: cf-codefresh-ext-rabbitmq
+    key: rabbitmq-hostname
+  rabbitmqPasswordSecretKeyRef:
+    name: cf-codefresh-ext-rabbitmq
+    key: rabbitmq-password
+  rabbitmqUsernameSecretKeyRef:
+    name: cf-codefresh-ext-rabbitmq
+    key: rabbitmq-username
+
+  redisPasswordSecretKeyRef:
+    name: cf-codefresh-ext-redis
+    key: redis-password
+  redisUrlSecretKeyRef:
+    name: cf-codefresh-ext-redis
+    key: redis-url
diff --git a/codefresh/.ci/values/mtls-mongodb-redis.yaml b/codefresh/.ci/values/mtls-mongodb-redis.yaml
@@ -137,7 +137,6 @@ extraResources:
   kind: Service
   metadata:
     name: cf-redis
-    namespace: codefresh-mtls
   spec:
     ports:
     - name: tcp-redis

diff --git a/codefresh/.ci/values/values-install-only.yaml b/codefresh/.ci/values/values-install-only.yaml
@@ -1,12 +1,11 @@
 # -- checking postgresql password with special characters
 postgresql:
   auth:
-    postgresPassword: "e%C9ar$Yka4Zb!H"
+    postgresPassword: "()e%C9ar$Yka4Zb!H"
 
-secrets:
-  ext-postgres:
-    enabled: true
-    stringData:
-      postgres-hostname: cf-postgresql
-      postgres-password: e%C9ar$Yka4Zb!H
-      postgres-user: postgres
+global:
+  postgresPassword: "()e%C9ar$Yka4Zb!H"
+
+seed:
+  postgresSeedJob:
+    postgresPassword: "()e%C9ar$Yka4Zb!H"
diff --git a/codefresh/.ci/values/values-openshift.yaml b/codefresh/.ci/values/values-openshift.yaml
@@ -0,0 +1,4 @@
+# values provided for openshift cluster
+cfapi:
+  podSecurityContext:
+    runAsUser: 1000620000