Fixes and upgrades (#2198)

packages/@uppy/companion/infra/kube/companion/companion-redis.yaml

@@ -1,106 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: uppy-redis
-  namespace: companion
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Gi
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: uppy-redis
-    release: uppy
-  name: uppy-redis
-  namespace: companion
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: uppy-redis
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: uppy-redis
-    spec:
-      containers:
-      - env:
-        - name: REDIS_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              key: redis-password
-              name: uppy-redis
-        image: bitnami/redis:4.0.2-r1
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          exec:
-            command:
-            - redis-cli
-            - ping
-          failureThreshold: 3
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 5
-        name: uppy-redis
-        ports:
-        - containerPort: 6379
-          name: redis
-          protocol: TCP
-        readinessProbe:
-          exec:
-            command:
-            - redis-cli
-            - ping
-          failureThreshold: 3
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 100m
-            memory: 256Mi
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: File
-        volumeMounts:
-        - mountPath: /bitnami
-          name: redis-data
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      securityContext:
-        fsGroup: 1001
-        runAsUser: 1001
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: redis-data
-        persistentVolumeClaim:
-          claimName: uppy-redis
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: uppy-redis
-  name: uppy-redis
-  namespace: companion
-spec:
-  ports:
-  - name: redis
-    port: 6379
-    protocol: TCP
-    targetPort: redis
-  selector:
-    app: uppy-redis
-  sessionAffinity: None
-  type: ClusterIP

packages/@uppy/companion/infra/kube/gcloud-deploy.sh

@@ -9,7 +9,7 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 __kube="${__dir}"
 __companion="$(dirname "$(dirname "${__kube}")")"
 # Install kubectl
-curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.2/bin/linux/amd64/kubectl
+curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.1/bin/linux/amd64/kubectl
 chmod +x ./kubectl
 mkdir -p ${HOME}/.local/bin/
 export PATH="${HOME}/.local/bin/:$PATH"
@@ -36,7 +36,6 @@ echo $KUBECONFIGVAR | python -m base64 -d > ${HOME}/.kube/config
 echo "KUBECONFIG file written"
 
 sleep 10s # This cost me some precious debugging time.
-kubectl apply -f "${__kube}/companion/companion-redis.yaml"
 kubectl set image statefulset companion --namespace=companion companion=docker.io/transloadit/companion:$TRAVIS_COMMIT
 sleep 10s
 

packages/@uppy/companion/package.json

@@ -55,7 +55,7 @@
     "node-schedule": "1.3.2",
     "prom-client": "11.5.3",
     "purest": "3.1.0",
-    "redis": "2.8.0",
+    "redis": "3.0.2",
     "request": "2.88.0",
     "semver": "6.3.0",
     "serialize-error": "^2.1.0",