Update Porch Configs (#2821)

* Use `kubernetes.io/basic-auth` secret type for Git credentials
* Assign initial resources and limits to Porch pods
* Create emptyDir volume for Porch caches
* Pass `--function-runner` flag to Porch server

Author: martinmaly

porch/README.md

@@ -61,8 +61,9 @@ For Git:
   ```sh
   kubectl create secret generic git-repository-auth \
     --namespace=default \
+    --type=kubernetes.io/basic-auth \
     --from-literal=username=<GitHub username> \
-    --from-literal=token=<GitHub Personal Access Token>
+    --from-literal=password=<GitHub Personal Access Token>
   ```
 * Update the [git-repository.yaml](./config/samples/git-repository.yaml) with your repository address
 * Register the repository:

porch/apiserver/pkg/e2e/e2e_test.go

@@ -87,7 +87,6 @@ func (t *PorchSuite) TestGitRepository(ctx context.Context) {
 				"username": []byte(config.Username),
 				"password": []byte(config.Password),
 			},
-			// TODO: Store as SecretTypeBasicAuth ?
 			Type: coreapi.SecretTypeBasicAuth,
 		})
 

porch/config/deploy/2-function-runner.yaml

@@ -28,14 +28,20 @@ spec:
         app: function-runner
     spec:
       containers:
-      - name: function-runner
-        image: gcr.io/example-google-project-id/function-runner:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 9445
+        - name: function-runner
+          image: gcr.io/example-google-project-id/function-runner:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 9445
+          resources:
+            requests:
+              memory: "32Mi"
+              cpu: "125m"
+            limits:
+              memory: "64Mi"
+              cpu: "500m"
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -45,6 +51,6 @@ spec:
   selector:
     app: function-runner
   ports:
-  - port: 9445
-    protocol: TCP
-    targetPort: 9445
+    - port: 9445
+      protocol: TCP
+      targetPort: 9445

porch/config/deploy/3-porch-server.yaml

@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 kind: ServiceAccount
 apiVersion: v1
 metadata:
   name: porch-server
   namespace: porch-system
 
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -39,23 +37,38 @@ spec:
         apiserver: "true"
     spec:
       serviceAccountName: porch-server
+      volumes:
+        - name: cache-volume
+          emptyDir: {}
       containers:
-      - name: porch-server
-        # Update image to the image of your porch apiserver build.
-        image: gcr.io/example-google-project-id/porch-server:latest
-        imagePullPolicy: Always
+        - name: porch-server
+          # Update image to the image of your porch apiserver build.
+          image: gcr.io/example-google-project-id/porch-server:latest
+          imagePullPolicy: Always
+          resources:
+            requests:
+              memory: "64Mi"
+              cpu: "250m"
+            limits:
+              memory: "128Mi"
+              cpu: "1000m"
+          volumeMounts:
+            - mountPath: /cache
+              name: cache-volume
+          args:
+            - --function-runner=function-runner:9445
+            - --cache-directory=/cache
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
   name: api
   namespace: porch-system
 spec:
   ports:
-  - port: 443
-    protocol: TCP
-    targetPort: 443
+    - port: 443
+      protocol: TCP
+      targetPort: 443
   selector:
     apiserver: "true"

porch/config/samples/git-repository.yaml

@@ -31,6 +31,7 @@ spec:
       # 
       # kubectl create secret generic git-repository-auth \
       #  --namespace=default \
+      #  --type=kubernetes.io/basic-auth \
       #  --from-literal=username=<GitHub username> \
-      #  --from-literal=token=<GitHub Personal Access Token>
+      #  --from-literal=password=<GitHub Personal Access Token>
       name: git-repository-auth