Use a configmap to make the model configurable; setup ACM for label bot

Label_Microservice/Makefile

@@ -2,9 +2,9 @@
 CONTEXT=issue-label-bot
 
 hydrate-prod:
-	rm -rf .build/prod
-	mkdir -p .build/prod
-	kustomize build -o .build/prod deployment/overlays/prod
+	rm -f ../acm-repos/issue-label-bot/namespaces/label-bot-prod/*
+	kustomize build -o ../acm-repos/issue-label-bot/namespaces/label-bot-prod deployment/overlays/prod
 
-apply-prod: hydrate-prod
-	kubectl --context=$(CONTEXT) apply -f .build/prod
+update-image:    
+	skaffold build --kube-context=${CONTEXT} -v info --file-output=latest_image.json
+	cd deployment/overlays/prod && kustomize edit set image gcr.io/issue-label-bot-dev/bot-worker=$(shell yq r latest_image.json builds[0].tag )

Label_Microservice/README.md

@@ -84,8 +84,8 @@ The following describes the GCP projects and clusters where the two services are
 1. Repo-specific label microservice
     - **repository**: [kubeflow/code-intelligence](https://github.com/kubeflow/code-intelligence/tree/master/Label_Microservice)
     - **GCP project**: issue-label-bot-dev
-    - **cluster**: github-mlapp-test
-    - **namespace**: default
+    - **cluster**: label-bot-dev
+    - **namespace**: labelbot-dev
     - **yaml files**: [Label\_Microservice/deployment](https://github.com/kubeflow/code-intelligence/tree/master/Label_Microservice/deployment)
 
 1, GitHub bot - **kf-label-bot-dev**
@@ -95,6 +95,23 @@ The following describes the GCP projects and clusters where the two services are
 
 ## Instructions
 
+### Deploying
+
+#### Production instance
+
+1. Build a docker image and update the kustomization
+
+   ```
+   CONTEXT=<kube context> make update-image
+   ```
+
+#### Dev instance of the label bot worker
+
+Use skaffold
+
+```
+skaffold --kube-context=${KUBE_CONTEXT} dev -v info
+```
 ### Installation
 
 If you would like to install the new repo-specific label microservice to your repositories, you need to follow the procedures in [the doc](./docs/onboarding_new_repositories.md).

Label_Microservice/deployment/base/configs/model_config.yaml

@@ -0,0 +1,4 @@
+# This file describes the models to load
+orgs:
+  - name: kubeflow
+    automl_model: "projects/976279526634/locations/us-central1/models/TCN654213816573231104"

Label_Microservice/deployment/base/deployments.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: worker
@@ -10,6 +10,9 @@ spec:
           app: worker          
       spec:
         volumes:
+        - name: config
+          configMap:
+            name: model-config
         - name: github-app
           secret:
             secretName: github-app
@@ -26,6 +29,9 @@ spec:
               memory: "4Gi"
               cpu: "4"                      
           volumeMounts:
+            - name: config
+              mountPath: /var/config
+              readOnly: true
             - name: github-app
               mountPath: /var/secrets/github
           env:
@@ -42,9 +48,8 @@ spec:
               value: "50112"         
             - name: GITHUB_APP_PEM_KEY
               value: /var/secrets/github/kf-label-bot-dev.private-key.pem
-            # TODO(jlewi):Not needed because we use workload identity
-            #- name: GOOGLE_APPLICATION_CREDENTIALS
-            #  value: /var/secrets/google/user-gcp-sa.json
+            - name: MODEL_CONFIG
+              value: /var/config/model_config.yaml
         restartPolicy: Always
         # We need to set a service account corresponding to workload
         # identity

Label_Microservice/deployment/base/kustomization.yaml

@@ -10,3 +10,7 @@ images:
 resources:
   - service.yaml
   - deployments.yaml
+configMapGenerator:
+  - name: model-config
+    files:
+      - configs/model_config.yaml

Label_Microservice/deployment/overlays/dev/deployments.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: worker

Label_Microservice/deployment/overlays/prod/deployments.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
     name: worker

Label_Microservice/deployment/overlays/prod/kustomization.yaml

@@ -7,7 +7,8 @@ patchesStrategicMerge:
 - deployments.yaml
 resources:
 - ../../base
+- namespace.yaml
 images:
-- name: gcr.io/issue-label-bot-dev/bot-worker
-  newName: gcr.io/issue-label-bot-dev/bot-worker
-  newTag: 6848ad6
+- digest: sha256:2faaf9d94c9beba082f184790770d1d08cb06a94b1ad4a8e797033f0bccb4cf7
+  name: gcr.io/issue-label-bot-dev/bot-worker
+  newName: gcr.io/issue-label-bot-dev/bot-worker:f0bf8d1-dirty

Label_Microservice/deployment/overlays/prod/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: label-bot-prod

Label_Microservice/deployment/requirements.universal_model.txt

@@ -1,5 +1,9 @@
 # Requirements for the universal model.
 # These requirements are largely copied from
 # https://github.com/machine-learning-apps/Issue-Label-Bot/blob/master/deployment/Dockerfile
- h5py==2.9.0 
- ktext==0.34 
+h5py==2.9.0 
+# Newer versions of Keras appear to require TensorFlow 2.2
+Keras==2.3.1
+Keras-Applications==1.0.8
+Keras-Preprocessing==1.1.0
+ktext==0.34 

Label_Microservice/latest_image.json

@@ -0,0 +1 @@
+{"builds":[{"imageName":"gcr.io/issue-label-bot-dev/bot-worker","tag":"gcr.io/issue-label-bot-dev/bot-worker:f0bf8d1-dirty@sha256:2faaf9d94c9beba082f184790770d1d08cb06a94b1ad4a8e797033f0bccb4cf7"}]}

acm-repos/issue-label-bot/README.md

@@ -0,0 +1,5 @@
+# Anthos Configuration Management Directory
+
+This is the root directory for Anthos Configuration Management.
+
+See [our documentation](https://cloud.google.com/anthos-config-management/docs/repo) for how to use each subdirectory.

Label_Microservice/.build/prod/extensions_v1beta1_deployment_label-bot-worker.yaml → acm-repos/issue-label-bot/namespaces/label-bot-prod/apps_v1_deployment_label-bot-worker.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -42,18 +42,26 @@ spec:
           value: "27079"
         - name: GITHUB_APP_PEM_KEY
           value: /var/secrets/github/issue-label-bot-github-app.private-key.pem
-        image: gcr.io/issue-label-bot-dev/bot-worker:6848ad6
+        - name: MODEL_CONFIG
+          value: /var/config/model_config.yaml
+        image: gcr.io/issue-label-bot-dev/bot-worker:f0bf8d1-dirty@sha256:2faaf9d94c9beba082f184790770d1d08cb06a94b1ad4a8e797033f0bccb4cf7
         name: app
         resources:
           requests:
             cpu: "4"
             memory: 4Gi
         volumeMounts:
+        - mountPath: /var/config
+          name: config
+          readOnly: true
         - mountPath: /var/secrets/github
           name: github-app
       restartPolicy: Always
       serviceAccountName: default-editor
       volumes:
+      - configMap:
+          name: label-bot-model-config-7fdmtg95kc
+        name: config
       - name: github-app
         secret:
           secretName: github-app

acm-repos/issue-label-bot/namespaces/label-bot-prod/~g_v1_configmap_label-bot-model-config-7fdmtg95kc.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+data:
+  model_config.yaml: |-
+    # This file describes the models to load
+    orgs:
+      - name: kubeflow
+        automl_model: "projects/976279526634/locations/us-central1/models/TCN654213816573231104"
+kind: ConfigMap
+metadata:
+  labels:
+    app: label-bot
+    environment: prod
+    service: label-bot
+  name: label-bot-model-config-7fdmtg95kc
+  namespace: label-bot-prod

acm-repos/issue-label-bot/namespaces/label-bot-prod/~g_v1_namespace_label-bot-prod.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    environment: prod
+  name: label-bot-prod

acm-repos/issue-label-bot/system/README.md

@@ -0,0 +1,3 @@
+# System
+
+This directory contains system configs such as the repo version and how resources are synced.

acm-repos/issue-label-bot/system/repo.yaml

@@ -0,0 +1,6 @@
+apiVersion: configmanagement.gke.io/v1
+kind: Repo
+metadata:
+  name: repo
+spec:
+  version: 1.0.0