Merge remote-tracking branch 'upstream/main' into issue-74-cleanup

# Conflicts: # config/base/kustomization.yaml
ruivieira · Jul 17, 2023 · 0baa067 · 0baa067
2 parents 49dc778 + 3280f1c
commit 0baa067
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -1,4 +1,4 @@
-namespace: trustyai-service-operator-system
+#namespace: trustyai-service-operator-system
 
 namePrefix: trustyai-service-operator-
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -6,3 +6,10 @@ images:
 - name: controller
   newName: quay.io/trustyai/trustyai-service-operator
   newTag: latest
+configMapGenerator:
+  - name: config
+    literals:
+      - trustyaiServiceImageName=quay.io/trustyai/trustyai-service
+      - trustyaiServiceImageTag=latest
+generatorOptions:
+  disableNameSuffixHash: true
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,16 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: trustyai-service-operator
-    app.kubernetes.io/part-of: trustyai-service-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata: