Refactor Dockerfile; create k8s deployment manifests

.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+.git
+Dockerfile

Dockerfile

@@ -0,0 +1,30 @@
+ARG ARGOCD_VERSION=v0.12.1
+FROM argoproj/argocd:$ARGOCD_VERSION as argocd
+
+FROM node:11.10.1-slim
+
+RUN apt-get update && apt-get install -y \
+    git && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /home/argocd/argocd-bot
+ADD ["package.json", "package-lock.json", "./"]
+
+RUN npm install
+
+ADD [".", "./"]
+
+COPY --from=argocd /usr/local/bin/argocd /usr/local/bin/argocd
+COPY --from=argocd /usr/local/bin/helm /usr/local/bin/helm
+COPY --from=argocd /usr/local/bin/kustomize /usr/local/bin/kustomize
+COPY --from=argocd /usr/local/bin/kustomize1 /usr/local/bin/kustomize1
+COPY --from=argocd /usr/local/bin/ks /usr/local/bin/ks
+
+RUN groupadd -g 999 argocd && \
+    useradd -r -u 999 -g argocd argocd && \
+    chown argocd:argocd /home/argocd && \
+    chown argocd:argocd /home/argocd/argocd-bot
+#workaround https://github.com/golang/go/issues/14625
+ENV USER=argocd
+USER argocd

deployment/base/argocd-bot-deployment.yaml

@@ -0,0 +1,80 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/name: argocd-bot
+  name: argocd-bot
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: argocd-bot
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-bot
+    spec:
+      containers:
+      - name: argocd-bot
+        command: [npm, start]
+        image: argocd-bot:latest
+        env:
+        - name: NODE_TLS_REJECT_UNAUTHORIZED
+          value: "0"
+        - name: PRIVATE_KEY_PATH
+          value: "/data/key.pem"
+        - name: ARGO_CD_SERVER_IP
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: ARGOCD_SERVER
+        - name: ARGOCD_SERVER
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: ARGOCD_SERVER
+        - name: ARGO_CD_API_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: TOKEN
+        - name: ARGOCD_AUTH_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: TOKEN
+        - name: APP_ID
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: APP_ID
+        - name: GITHUB_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: GITHUB_TOKEN
+        - name: GITHUB_REPO
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: GITHUB_REPO
+        - name: WEBHOOK_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: argocd-bot-secret
+              key: WEBHOOK_SECRET
+        volumeMounts:
+        - name: app-private-key
+          mountPath: "/data"
+          readOnly: true
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 3000
+        readinessProbe:
+          tcpSocket:
+            port: 3000
+          initialDelaySeconds: 5
+          periodSeconds: 1
+      volumes:
+      - name: app-private-key
+        secret:
+          secretName: argocd-bot-secret

deployment/base/argocd-bot-service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: argocd-bot
+  name: argocd-bot
+spec:
+  ports:
+  - port: 80
+    targetPort: 3000
+  selector:
+    app.kubernetes.io/name: argocd-bot

deployment/base/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- argocd-bot-deployment.yaml
+- argocd-bot-service.yaml

deployment/install.yaml

@@ -0,0 +1,95 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: argocd-bot
+  name: argocd-bot
+spec:
+  ports:
+  - port: 80
+    targetPort: 3000
+  selector:
+    app.kubernetes.io/name: argocd-bot
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/name: argocd-bot
+  name: argocd-bot
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: argocd-bot
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-bot
+    spec:
+      containers:
+      - command:
+        - npm
+        - start
+        env:
+        - name: NODE_TLS_REJECT_UNAUTHORIZED
+          value: "0"
+        - name: PRIVATE_KEY_PATH
+          value: /data/key.pem
+        - name: ARGO_CD_SERVER_IP
+          valueFrom:
+            secretKeyRef:
+              key: ARGOCD_SERVER
+              name: argocd-bot-secret
+        - name: ARGOCD_SERVER
+          valueFrom:
+            secretKeyRef:
+              key: ARGOCD_SERVER
+              name: argocd-bot-secret
+        - name: ARGO_CD_API_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: TOKEN
+              name: argocd-bot-secret
+        - name: ARGOCD_AUTH_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: TOKEN
+              name: argocd-bot-secret
+        - name: APP_ID
+          valueFrom:
+            secretKeyRef:
+              key: APP_ID
+              name: argocd-bot-secret
+        - name: GITHUB_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: GITHUB_TOKEN
+              name: argocd-bot-secret
+        - name: GITHUB_REPO
+          valueFrom:
+            secretKeyRef:
+              key: GITHUB_REPO
+              name: argocd-bot-secret
+        - name: WEBHOOK_SECRET
+          valueFrom:
+            secretKeyRef:
+              key: WEBHOOK_SECRET
+              name: argocd-bot-secret
+        image: argocd-bot:latest
+        imagePullPolicy: Always
+        name: argocd-bot
+        ports:
+        - containerPort: 3000
+        readinessProbe:
+          initialDelaySeconds: 5
+          periodSeconds: 1
+          tcpSocket:
+            port: 3000
+        volumeMounts:
+        - mountPath: /data
+          name: app-private-key
+          readOnly: true
+      volumes:
+      - name: app-private-key
+        secret:
+          secretName: argocd-bot-secret

package.json

@@ -13,6 +13,7 @@
     "start": "probot run ./lib/index.js",
     "test": "jest ./test/",
     "build": "tsc"
+    "manifests": "kustomize build ./deployment/base > deployment/install.yaml",
   },
   "dependencies": {
     "@types/jest": "^24.0.11",

src/argo-bot.ts

@@ -353,7 +353,7 @@ ${syncRes.stdout}
             return await this.respondWithError("No Kubernetes deployments found, try running \`argo diff --all\`")
         }
 
-        const jsonItems = jsonArgoCDApps["items"]
+        const jsonItems = jsonArgoCDApps["items"].filter((item) => item["spec"]["source"]["repoURL"].indexOf(this.argoConfig.getGithubRepo()) > -1);
         let foundDiffs = false
         // for each app in the ArgoCD Server, attempt to diff with current directory in repo
         for (var key in jsonItems) {