Added resources field for kube-rbac-proxy container

.github/workflows/ce.yaml

@@ -13,10 +13,6 @@ jobs:
         with:
           wait: 2m
           config: hack/kind.yaml
-      - name: install kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.1
-        with:
-          version: 2.3.1
       - name: Install Go
         uses: actions/setup-go@v2
         with:

.github/workflows/pro.yaml

@@ -17,10 +17,6 @@ jobs:
           wait: 2m
           node_image: ${{ matrix.k8s }}
           config: hack/kind.yaml
-      - name: install kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.1
-        with:
-          version: 2.3.1
       - name: Install Go
         uses: actions/setup-go@v2
         with:

config/default/manager_auth_proxy_patch.yaml

@@ -9,13 +9,13 @@ spec:
   template:
     spec:
       containers:
-      - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-        args:
-        - "--secure-listen-address=0.0.0.0:8443"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        ports:
-        - containerPort: 8443
-          name: https
+        - name: kube-rbac-proxy
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+          args:
+            - "--secure-listen-address=0.0.0.0:8443"
+            - "--upstream=http://127.0.0.1:8080/"
+            - "--logtostderr=true"
+            - "--v=10"
+          ports:
+            - containerPort: 8443
+              name: https

config/helm/manager_auth_proxy_patch.yaml

@@ -9,13 +9,20 @@ spec:
   template:
     spec:
       containers:
-      - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
-        args:
-        - "--secure-listen-address=0.0.0.0:8443"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        ports:
-        - containerPort: 8443
-          name: https
+        - name: kube-rbac-proxy
+          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+          args:
+            - "--secure-listen-address=0.0.0.0:8443"
+            - "--upstream=http://127.0.0.1:8080/"
+            - "--logtostderr=true"
+            - "--v=10"
+          ports:
+            - containerPort: 8443
+              name: https
+          resources:
+            limits:
+              cpu: 50m
+              memory: 20Mi
+            requests:
+              cpu: 50m
+              memory: 20Mi

hack/helm/pre_helm.go

@@ -13,6 +13,7 @@ func main() {
 		{envFrom, envFromTPL},
 		{envVars, envVarsTPL},
 		{resources, resourcesTPL},
+		{resourcesRBAC, resourcesRBACTPL},
 		{annotation, annotationTPL},
 		{securityContext, securityContextTPL},
 
@@ -74,6 +75,19 @@ const resourcesTPL = `{{- with .Values.resources }}
 {{- toYaml . | nindent 10 }}
 {{- end }}`
 
+const resourcesRBAC = `        resources:
+          limits:
+            cpu: 50m
+            memory: 20Mi
+          requests:
+            cpu: 50m
+            memory: 20Mi`
+
+const resourcesRBACTPL = `{{- with .Values.rbac.resources }}
+        resources:
+{{- toYaml . | nindent 10 }}
+{{- end }}`
+
 const securityContext = `        securityContext:
           allowPrivilegeEscalation: false`
 const securityContextTPL = `{{- with .Values.securityContext }}

helm/templates/all.yaml

@@ -403,6 +403,10 @@ spec:
         ports:
         - containerPort: 8443
           name: https
+{{- with .Values.rbac.resources }}
+        resources:
+{{- toYaml . | nindent 10 }}
+{{- end }}
       securityContext:
         runAsNonRoot: true
       serviceAccountName: {{ include "tyk-operator-helm.fullname" . }}-controller-manager

helm/values.yaml

@@ -1,14 +1,14 @@
-replicaCount: 1
-
- # loads enviroment variables to the operator.
+replicaCount:
+  1
+  # loads enviroment variables to the operator.
 envFrom:
   - secretRef:
       name: tyk-operator-conf
 envVars:
-- name: TYK_HTTPS_INGRESS_PORT
-  value: "8443" 
-- name: TYK_HTTP_INGRESS_PORT
-  value: "8080"
+  - name: TYK_HTTPS_INGRESS_PORT
+    value: "8443"
+  - name: TYK_HTTP_INGRESS_PORT
+    value: "8080"
 
 image:
   repository: tykio/tyk-operator
@@ -23,4 +23,8 @@ annotations: {}
 podAnnotations: {}
 podSecurityContext:
   allowPrivilegeEscalation: false
-resources: {}
+resources: {}
+
+#specify necessary resources for kube-rbac-proxy container
+rbac:
+  resources: {}