(cleanup) Kustomization

Closes #155, #160 Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com>
operator-framework · Sep 28, 2023 · 2cb65c0 · 2cb65c0
1 parent 7f903c6
commit 2cb65c0
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 156 deletions.
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -15,5 +15,4 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-patches:
-- path: manager_auth_proxy_patch.yaml
+
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
diff --git a/config/etcd/etcd.yaml b/config/etcd/etcd.yaml
diff --git a/config/etcd/kustomization.yaml b/config/etcd/kustomization.yaml
diff --git a/config/rbac/catalogserver_service.yaml → config/manager/catalogserver_service.yaml b/config/rbac/catalogserver_service.yaml → config/manager/catalogserver_service.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
 - manager.yaml
+- catalogserver_service.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -38,15 +38,56 @@ spec:
       labels:
         control-plane: controller-manager
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                - key: kubernetes.io/arch
+                  operator: In
+                  values:
+                    - amd64
+                    - arm64
+                    - ppc64le
+                    - s390x
+                - key: kubernetes.io/os
+                  operator: In
+                  values:
+                    - linux
       securityContext:
         runAsNonRoot: true
         seccompProfile:
           type: RuntimeDefault
       containers:
+      - name: kube-rbac-proxy
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+              - ALL
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
+        args:
+        - --secure-listen-address=0.0.0.0:8443
+        - --upstream=http://127.0.0.1:8080/
+        - --logtostderr=true
+        - --v=0
+        ports:
+        - containerPort: 8443
+          protocol: TCP
+          name: https
+        resources:
+          requests:
+            cpu: 5m
+            memory: 64Mi
       - command:
-        - "./manager"
+        - ./manager
         args:
         - --leader-elect
+        - --health-probe-bind-address=:8081
+        - --metrics-bind-address=127.0.0.1:8080
+        - --catalogs-storage-dir=/var/cache/catalogs
+        - --feature-gates=HTTPServer=true
+        - --http-external-address=http://catalogd-catalogserver.catalogd-system.svc
         image: controller:latest
         name: manager
         volumeMounts:
@@ -56,7 +97,7 @@ spec:
           allowPrivilegeEscalation: false
           capabilities:
             drop:
-              - "ALL"
+              - ALL
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -9,7 +9,6 @@ resources:
 - role_binding.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-- catalogserver_service.yaml
 # Comment the following 4 lines if you want to disable
 # the auth proxy (https://github.com/brancz/kube-rbac-proxy)
 # which protects your /metrics endpoint.