Add a dev env in Okteto

cloudflare/src/index.ts

@@ -1,5 +1,3 @@
-import { tryParsePutTagRequest, handleTagManifestRequest } from "./tag_manifest";
-
 if (typeof addEventListener === 'function') {
   addEventListener('fetch', (e: Event): void => {
     // work around as strict typescript check doesn't allow e to be of type FetchEvent

hooks/Dockerfile.hooks

@@ -1,9 +1,10 @@
 FROM node:10 as deps
+
 ADD ./package.json /src/package.json
 ADD ./Makefile /src/Makefile
 ADD . /src
 WORKDIR /src
-RUN make deps  test
+RUN make deps test
 
 ENTRYPOINT ["node"]
 CMD ["--no-deprecation", "build/server.js", "hooks"]

hooks/Dockerfile.reap

@@ -1,4 +1,5 @@
 FROM node:10 as deps
+
 ADD ./package.json /src/package.json
 ADD ./Makefile /src/Makefile
 ADD . /src

hooks/Makefile

@@ -11,15 +11,15 @@ deps:
 
 .PHONY: lint
 lint:
-	`npm bin`/tslint --project ./tsconfig.json --fix
+	npx tslint --project ./tsconfig.json --fix
 
 .PHONY: test
 test: build
 	npm test
 
 .PHONY: build
 build: prebuild
-	`npm bin`/tsc
+	npx tsc
 
 .PHONY: run
 run:

hooks/src/commands/hooks.ts

@@ -1,7 +1,6 @@
 import * as util from "util";
 import { Server } from "../server/server";
 import { logger } from "../logger";
-import { param } from "../util";
 
 exports.name = "hooks";
 exports.describe = "Start and run the hook api server";
@@ -17,7 +16,7 @@ exports.handler = async (argv) => {
 };
 
 async function main(argv): Promise<any> {
-  process.on('SIGTERM', function onSigterm () {
+  process.on("SIGTERM", function onSigterm() {
     logger.info(`Got SIGTERM, cleaning up`);
     process.exit();
   });

hooks/src/commands/reap.ts

@@ -5,6 +5,7 @@ import * as redis from "redis";
 import { promisify } from "util";
 import * as rp from "request-promise";
 
+const registryUrl = process.env["REGISTRY_URL"] || "https://ttl.sh";
 const client = redis.createClient({url: process.env["REDISCLOUD_URL"]});
 const smembersAsync = promisify(client.smembers).bind(client);
 const sremAsync = promisify(client.srem).bind(client);
@@ -25,13 +26,13 @@ exports.handler = async (argv) => {
 };
 
 async function main(argv): Promise<any> {
-  process.on('SIGTERM', function onSigterm () {
+  process.on("SIGTERM", function onSigterm() {
     logger.info(`Got SIGTERM, cleaning up`);
     process.exit();
   });
 
   let jobRunning: boolean = false;
-  
+
   const job = new CronJob({
     cronTime: "* * * * *",
     onTick: async () => {
@@ -45,7 +46,7 @@ async function main(argv): Promise<any> {
 
       try {
         await reapExpiredImages();
-      } catch(err) {
+      } catch (err) {
         console.log("failed to reap expired images:", err);
       } finally {
         jobRunning = false;
@@ -73,17 +74,17 @@ async function reapExpiredImages() {
 
       const imageAndTag = image.split(":");
       const headers = {
-        "Accept": "application/vnd.docker.distribution.manifest.v2+json",
+        Accept: "application/vnd.docker.distribution.manifest.v2+json",
       };
 
       // Get the manifest from the tag
       const getOptions = {
         method: "HEAD",
-        uri: `https://ttl.sh/v2/${imageAndTag[0]}/manifests/${imageAndTag[1]}`,
+        uri: `${registryUrl}/v2/${imageAndTag[0]}/manifests/${imageAndTag[1]}`,
         headers,
         resolveWithFullResponse: true,
         simple: false,
-      }
+      };
       const getResponse = await rp(getOptions);
 
       if (getResponse.statusCode == 404) {
@@ -92,7 +93,7 @@ async function reapExpiredImages() {
         continue;
       }
 
-      const deleteURI = `https://ttl.sh/v2/${imageAndTag[0]}/manifests/${getResponse.headers.etag.replace(/"/g,"")}`;
+      const deleteURI = `${registryUrl}/v2/${imageAndTag[0]}/manifests/${getResponse.headers.etag.replace(/"/g, "")}`;
 
       // Remove from the registry
       const options = {
@@ -101,14 +102,14 @@ async function reapExpiredImages() {
         headers,
         resolveWithFullResponse: true,
         simple: false,
-      }
+      };
 
       await rp(options);
 
       console.log(`expiring ${image}`);
       await sremAsync("current.images", image);
       await delAsync(image);
-    } catch(err) {
+    } catch (err) {
       console.log(`failed to evaluate image ${image}:`, err);
     }
   }

hooks/src/controllers/HookAPI.ts

@@ -57,10 +57,10 @@ export class HookAPI {
         console.log(`parsing tag ${tag}`);
         let expiresIn = durationfromTag(tag);
         if (expiresIn <= 0) {
-          expiresIn = defaultDuration
+          expiresIn = defaultDuration;
         }
         if (expiresIn > maxDuration) {
-          expiresIn = maxDuration
+          expiresIn = maxDuration;
         }
 
         await saddAsync("current.images", imageWithTag);

hooks/src/logger.ts

@@ -13,7 +13,7 @@ function initLogger(): any {
     logger.level = process.env["LOG_LEVEL"] || "warn";
     return logger;
   } else {
-    const logger = pino(logOptions)
+    const logger = pino(logOptions);
     logger.level = process.env["LOG_LEVEL"] || "warn";
     return logger;
   }

hooks/src/router.ts

@@ -122,7 +122,7 @@ export const preRequest = (req: express.Request, reqId: string) => {
 export const requestId = (req: express.Request, handlerName: string) => {
   const id = `${handlerName}:${uuid.v4().replace("-", "").substring(0, 8)}`;
 
-  const clientID: string = <string> req.headers["x-request-uuid"];
+  const clientID: string = req.headers["x-request-uuid"] as string;
 
   if (clientID) {
     return `${id}.${clientID.substring(0, 8)}`;

hooks/src/server.ts

@@ -5,4 +5,4 @@ yargs
   .env()
   .help()
   .demandCommand()
-  .argv;
+  .argv;

hooks/src/server/server.ts

@@ -21,7 +21,7 @@ if (port == null || port == "") {
   debug: false,
   logger: {
     level: "warn",
-  }
+  },
 })
 
 export class Server extends ServerLoader {

kustomize/base/kustomization.yaml

@@ -0,0 +1,3 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: []

kustomize/overlays/dev/hooks.yaml

@@ -0,0 +1,63 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ttl-hooks
+  labels:
+    app: ttl-hooks
+spec:
+  selector:
+    matchLabels:
+      app: ttl-hooks
+  template:
+    metadata:
+      labels:
+        app: ttl-hooks
+    spec:
+      restartPolicy: Always
+      initContainers:
+        - name: wait-for-registry
+          image: quay.io/curl/curl:latest
+          command:
+            - sh
+            - -c
+            - |
+              until curl -s -o /dev/null -w "%{http_code}" ttl-registry:5000/v2/; do
+                echo "Waiting for Docker Registry to be ready..."
+                sleep 2
+              done
+        - name: wait-for-redis
+          image: redis:latest 
+          command:
+            - sh
+            - -c
+            - |
+              until redis-cli -h ttl-redis -p 6379 ping | grep "PONG"; do
+                echo "Waiting for Redis to be ready..."
+                sleep 2
+              done
+      containers:
+        - name: ttl-hooks
+          image: ttl-hooks
+          ports:
+            - containerPort: 8000
+            - containerPort: 2400
+          env:
+            - name: REDISCLOUD_URL
+              value: redis://ttl-redis:6379
+            - name: HOOK_TOKEN
+              value: dev-hook-token
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ttl-hooks
+  labels:
+    app: ttl-hooks
+spec:
+  type: ClusterIP
+  ports:
+    - protocol: TCP
+      port: 8000
+      targetPort: 8000
+  selector:
+    app: ttl-hooks

kustomize/overlays/dev/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+- ./hooks.yaml
+- ./reaper.yaml
+- ./redis.yaml
+- ./registry.yaml

kustomize/overlays/dev/reaper.yaml

@@ -0,0 +1,63 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ttl-reaper
+  labels:
+    app: ttl-reaper
+spec:
+  selector:
+    matchLabels:
+      app: ttl-reaper
+  template:
+    metadata:
+      labels:
+        app: ttl-reaper
+    spec:
+      restartPolicy: Always
+      initContainers:
+        - name: wait-for-registry
+          image: quay.io/curl/curl:latest
+          command:
+            - sh
+            - -c
+            - |
+              until curl -s -o /dev/null -w "%{http_code}" ttl-registry:5000/v2/; do
+                echo "Waiting for Docker Registry to be ready..."
+                sleep 2
+              done
+        - name: wait-for-redis
+          image: redis:latest 
+          command:
+            - sh
+            - -c
+            - |
+              until redis-cli -h ttl-redis -p 6379 ping | grep "PONG"; do
+                echo "Waiting for Redis to be ready..."
+                sleep 2
+              done
+      containers:
+        - name: ttl-reaper
+          image: ttl-reaper
+          ports:
+            - containerPort: 8000
+            - containerPort: 2400
+          env:
+            - name: REGISTRY_URL
+              value: http://ttl-registry:5000
+            - name: REDISCLOUD_URL
+              value: redis://ttl-redis:6379
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ttl-reaper
+  labels:
+    app: ttl-reaper
+spec:
+  type: ClusterIP
+  ports:
+    - protocol: TCP
+      port: 8000
+      targetPort: 8000
+  selector:
+    app: ttl-reaper

kustomize/overlays/dev/redis.yaml

@@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ttl-redis
+  labels:
+    app: ttl-redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ttl-redis
+  template:
+    metadata:
+      labels:
+        app: ttl-redis
+    spec:
+      containers:
+        - name: redis
+          image: redis:latest
+          ports:
+            - containerPort: 6379
+          volumeMounts:
+            - name: redis-data
+              mountPath: /data
+          readinessProbe:
+            exec:
+              command:
+              - redis-cli
+              - ping
+            initialDelaySeconds: 20
+            timeoutSeconds: 5
+            periodSeconds: 3
+      volumes:
+        - name: redis-data
+          emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ttl-redis
+  labels:
+    app: ttl-redis
+spec:
+  type: ClusterIP
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+  selector:
+    app: ttl-redis