update severely outdated package versions (#78)

sourcegraph · May 8, 2021 · 7f55c1e · 7f55c1e
1 parent bef5279
commit 7f55c1e
Show file tree

Hide file tree

Showing 15 changed files with 620 additions and 876 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,6 @@ yarn-error.log
 .history
 
 .envrc
+.local-deploy-sourcegraph
 
 Pulumi.dev.yaml
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12.16.1
+14.16.1
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+.local-deploy-sourcegraph/
diff --git a/.tool-versions b/.tool-versions
@@ -1,4 +1,4 @@
 yarn 1.22.4
 kubectl 1.17.3
 fd 7.4.0
-pulumi 1.14.0
+pulumi 3.2.1
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "editor.formatOnSave": true
-}
+  "editor.formatOnSave": true,
+}
diff --git a/README.md b/README.md
@@ -1,29 +1,29 @@
-# deploy-k8s-helper 
+# deploy-k8s-helper
 
-A small helper program to aid in creating a test cluster for https://github.com/sourcegraph/deploy-sourcegraph. 
+A small helper program to aid in creating a test cluster for https://github.com/sourcegraph/deploy-sourcegraph.
 
-## Prerequisites 
+## Prerequisites
 
 - [Pulumi](https://pulumi.io/quickstart/install.html)
-    - Run `pulumi login` after installation
+  - Run `pulumi login` after installation
 - [Yarn](https://yarnpkg.com/en/)
 - GCP access to the ["Sourcegraph Auxiliary" (sourcegraph-server) GCP project](https://console.cloud.google.com/kubernetes/list?project=sourcegraph-server)
-    - Run `gcloud auth application-default login` to fetch the necessary credentials for Pulumi to use 
+  - Run `gcloud auth application-default login` to fetch the necessary credentials for Pulumi to use
 - https://github.com/sourcegraph/deploy-sourcegraph checked out on your local machine
-    - deploy-k8s-helper reads the contents of that directory. Make sure your that your checkout is up-to-date!
+  - deploy-k8s-helper reads the contents of that directory. Make sure your that your checkout is up-to-date!
 
 ### Configuration
 
 See [config.ts](config.ts) for more information, but you **must** set the following configuration values via `pulumi config set <NAME> <VALUE>`
 
-- `gcloudEmail` -  The email that you use to sign in to our GCP project.
-    - example: geoffrey@sourcegraph.com
+- `gcloudEmail` - The email that you use to sign in to our GCP project.
+  - example: geoffrey@sourcegraph.com
 - `deploySourcegraphRoot` - The path to the root of your https://github.com/sourcegraph/deploy-sourcegraph checkout.
-    - example: /Users/ggilmore/dev/go/src/github.com/sourcegraph/deploy-sourcegraph
+  - example: /Users/ggilmore/dev/go/src/github.com/sourcegraph/deploy-sourcegraph
 
-## Usage 
+## Usage
 
-Run `yarn` so that you install all the necessary dependencies. 
+Run `yarn` so that you install all the necessary dependencies.
 
 - `yarn up`: creates a new GKE cluster and fetches the necessary credentials
 - `yarn destroy`: deletes a GKE cluster that was previously created with `yarn up`
@@ -57,7 +57,7 @@ Solution: Pick another zone to use from https://cloud.google.com/compute/docs/re
 
 ### (ingress-nginx) Cannot read property 'status' of undefined
 
-This happens if you're trying to deploy a pre-`3.x` release of https://github.com/sourcegraph/deploy-sourcegraph/ (which didn't have `nginx-ingress`). 
+This happens if you're trying to deploy a pre-`3.x` release of https://github.com/sourcegraph/deploy-sourcegraph/ (which didn't have `nginx-ingress`).
 
 Example:
 

diff --git a/cluster.ts b/cluster.ts
@@ -19,7 +19,6 @@ const cluster = new gcp.container.Cluster(name, {
     project: gcloudConfig.project,
 
     initialNodeCount: clusterConfig.nodeCount,
-    removeDefaultNodePool: true,
 
     nodeConfig: {
         diskType: 'pd-ssd',

diff --git a/config.ts b/config.ts
@@ -14,13 +14,13 @@ export const clusterConfig = {
      * The number of nodes to create in this cluster.
      * Defaults to 4.
      */
-    nodeCount: config.getNumber('nodeCount') || 4,
+    nodeCount: config.getNumber('nodeCount') || 3,
 
     /**
      * The name of a Google Compute Engine machine type.
      * Defaults to n1-standard-8.
      */
-    machineType: config.get('machineType') || 'n1-standard-8',
+    machineType: config.get('machineType') || 'n1-standard-16',
 }
 
 export const gcloudConfig = {
@@ -47,4 +47,6 @@ export const gcloudConfig = {
  * The path to the root of your sourcegraph/deploy-sourcegraph checkout.
  * Example: /Users/ggilmore/dev/go/src/github.com/sourcegraph/deploy-sourcegraph
  */
-export const deploySourcegraphRoot = config.require('deploySourcegraphRoot')
+export const deploySourcegraphLocalRoot = config.get('deploySourcegraphLocalRoot')
+
+export const deploySourcegraphRef = config.get('deploySourcegraphRef') || 'master'
diff --git a/index.ts b/index.ts
@@ -3,71 +3,83 @@ import * as path from 'path'
 
 import * as k8s from '@pulumi/kubernetes'
 
-import { k8sProvider } from './cluster'
-import { deploySourcegraphRoot, gcloudConfig } from './config'
+import { deploySourcegraphLocalRoot, gcloudConfig, deploySourcegraphRef } from './config'
+import { cloneLocalDSCheckout } from './util'
+import * as cluster from './cluster'
 
-const clusterAdmin = new k8s.rbac.v1.ClusterRoleBinding(
-    'cluster-admin-role-binding',
-    {
-        metadata: { name: `${os.userInfo().username}-cluster-admin-role-binding` },
+const k8sProvider = cluster.k8sProvider
 
-        roleRef: {
-            apiGroup: 'rbac.authorization.k8s.io',
-            kind: 'ClusterRole',
-            name: 'cluster-admin',
-        },
+export = async () => {
+    const clusterAdmin = new k8s.rbac.v1.ClusterRoleBinding(
+        'cluster-admin-role-binding',
+        {
+            metadata: { name: `${os.userInfo().username}-cluster-admin-role-binding` },
 
-        subjects: [
-            {
+            roleRef: {
                 apiGroup: 'rbac.authorization.k8s.io',
-                kind: 'User',
-                name: gcloudConfig.username,
+                kind: 'ClusterRole',
+                name: 'cluster-admin',
             },
-        ],
-    },
-    { provider: k8sProvider }
-)
 
-const storageClass = new k8s.storage.v1.StorageClass(
-    'sourcegraph-storage-class',
-    {
-        metadata: {
-            name: 'sourcegraph',
+            subjects: [
+                {
+                    apiGroup: 'rbac.authorization.k8s.io',
+                    kind: 'User',
+                    name: gcloudConfig.username,
+                },
+            ],
+        },
+        { provider: k8sProvider }
+    )
+
+    const storageClass = new k8s.storage.v1.StorageClass(
+        'sourcegraph-storage-class',
+        {
+            metadata: {
+                name: 'sourcegraph',
 
-            labels: {
-                deploy: 'sourcegraph',
+                labels: {
+                    deploy: 'sourcegraph',
+                },
             },
-        },
-        provisioner: 'kubernetes.io/gce-pd',
+            provisioner: 'kubernetes.io/gce-pd',
 
-        parameters: {
-            type: 'pd-ssd',
+            parameters: {
+                type: 'pd-ssd',
+            },
         },
-    },
-    { provider: k8sProvider }
-)
+        { provider: k8sProvider }
+    )
 
-const baseDeployment = new k8s.yaml.ConfigGroup(
-    'base',
-    {
-        files: `${path.posix.join(deploySourcegraphRoot, 'base')}/**/*.yaml`,
-    },
-    {
-        providers: { kubernetes: k8sProvider },
-        dependsOn: [clusterAdmin, storageClass],
-    }
-)
+    const deploySourcegraphRoot = deploySourcegraphLocalRoot
+        ? deploySourcegraphLocalRoot
+        : await cloneLocalDSCheckout(deploySourcegraphRef)
 
-const ingressNginx = new k8s.yaml.ConfigGroup(
-    'ingress-nginx',
-    {
-        files: `${path.posix.join(deploySourcegraphRoot, 'configure', 'ingress-nginx')}/**/*.yaml`,
-    },
-    { providers: { kubernetes: k8sProvider }, dependsOn: clusterAdmin }
-)
+    const baseDeployment = new k8s.yaml.ConfigGroup(
+        'base',
+        {
+            files: `${path.posix.join(deploySourcegraphRoot, 'base')}/**/*.yaml`,
+        },
+        {
+            providers: { kubernetes: k8sProvider },
+            dependsOn: [clusterAdmin, storageClass],
+        }
+    )
 
-export const ingressIPs = ingressNginx
-    .getResource('v1/Service', 'ingress-nginx', 'ingress-nginx')
-    .apply(svc => svc.status.apply(status => status.loadBalancer.ingress.map(i => i.ip)))
+    const ingressNginx = new k8s.yaml.ConfigGroup(
+        'ingress-nginx',
+        {
+            files: `${path.posix.join(deploySourcegraphRoot, 'configure', 'ingress-nginx')}/**/*.yaml`,
+        },
+        { providers: { kubernetes: k8sProvider }, dependsOn: clusterAdmin }
+    )
 
-export * from './cluster'
+    const ingressIPs = ingressNginx
+        .getResource('v1/Service', 'ingress-nginx', 'ingress-nginx')
+        .apply(svc => svc.status.apply(status => status.loadBalancer.ingress.map(i => i.ip)))
+
+    return {
+        ingressIPs,
+        ...cluster,
+    }
+}
diff --git a/package.json b/package.json
@@ -13,15 +13,18 @@
   },
   "devDependencies": {
     "@sourcegraph/prettierrc": "3.0.3",
+    "@types/fs-extra": "^9.0.11",
     "@types/node": "latest",
     "opn-cli": "4.1.0",
     "prettier": "2.0.4",
     "tslint": "5.20.1",
     "tslint-config-prettier": "1.18.0"
   },
   "dependencies": {
-    "@pulumi/gcp": "2.12.0",
-    "@pulumi/kubernetes": "1.6.0",
-    "@pulumi/pulumi": "1.14.0"
+    "@pulumi/gcp": "5.2.0",
+    "@pulumi/kubernetes": "3.1.1",
+    "@pulumi/pulumi": "3.2.1",
+    "fs-extra": "^10.0.0",
+    "simple-git": "^2.38.0"
   }
 }
diff --git a/prettier.config.js b/prettier.config.js
@@ -1 +1 @@
-module.exports = require("@sourcegraph/prettierrc");
+module.exports = require('@sourcegraph/prettierrc')
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,22 +1,17 @@
 {
-    "compilerOptions": {
-        "outDir": "bin",
-        "target": "es6",
-        "lib": [
-            "es6"
-        ],
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "sourceMap": true,
-        "experimentalDecorators": true,
-        "pretty": true,
-        "noFallthroughCasesInSwitch": true,
-        "noImplicitAny": true,
-        "noImplicitReturns": true,
-        "forceConsistentCasingInFileNames": true,
-        "strictNullChecks": true
-    },
-    "files": [
-        "index.ts"
-    ]
+  "compilerOptions": {
+    "outDir": "bin",
+    "target": "es2016",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "experimentalDecorators": true,
+    "pretty": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "forceConsistentCasingInFileNames": true,
+    "strictNullChecks": true,
+  },
+  "files": ["index.ts", "config.ts", "cluster.ts"],
 }
diff --git a/tslint.json b/tslint.json
@@ -1,10 +1,7 @@
 {
-    "defaultSeverity": "error",
-    "extends": [
-        "tslint:recommended",
-        "tslint-config-prettier"
-    ],
-    "jsRules": {},
-    "rules": {},
-    "rulesDirectory": []
-}
+  "defaultSeverity": "error",
+  "extends": ["tslint:recommended", "tslint-config-prettier"],
+  "jsRules": {},
+  "rules": {},
+  "rulesDirectory": []
+}
diff --git a/util.ts b/util.ts
@@ -0,0 +1,38 @@
+import * as path from 'path'
+import * as fs from 'fs-extra'
+
+import simpleGit, { SimpleGit } from 'simple-git'
+
+const localCheckoutDir = path.posix.join(__dirname, '.local-deploy-sourcegraph')
+
+export interface PrepareOptions {
+    skipCleanup?: boolean
+}
+
+export async function cloneLocalDSCheckout(ref: string, options?: PrepareOptions): Promise<string> {
+    const opts: PrepareOptions = {
+        skipCleanup: false,
+        ...options,
+    }
+
+    if (!opts.skipCleanup) {
+        await fs.remove(localCheckoutDir)
+    }
+    await fs.mkdirp(localCheckoutDir)
+
+    const git: SimpleGit = simpleGit({
+        baseDir: localCheckoutDir,
+    })
+
+    const cloneURL = 'https://github.com/sourcegraph/deploy-sourcegraph.git'
+
+    await git
+        .init()
+        .addRemote('upstream', cloneURL)
+        .fetch('upstream', ref, {
+            '--depth': '1',
+        })
+        .checkout('FETCH_HEAD')
+
+    return localCheckoutDir
+}