From cf2a889e4d568bf9151a8545d007e2a81a2fae31 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Tue, 25 Aug 2020 15:25:01 +0100 Subject: [PATCH] Removed SCP archives --- manifests/scp-archives.yaml | 97 ------------------------------------- terraform/bucket.tf | 9 ---- 2 files changed, 106 deletions(-) delete mode 100644 manifests/scp-archives.yaml diff --git a/manifests/scp-archives.yaml b/manifests/scp-archives.yaml deleted file mode 100644 index 18b677d..0000000 --- a/manifests/scp-archives.yaml +++ /dev/null @@ -1,97 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: scp ---- -apiVersion: v1 -kind: Secret -metadata: - name: scp-s3 - namespace: scp - annotations: - kube-1password: d5dgclm3qrxd4fntivv26ec3ee - kube-1password/vault: Kubernetes -type: Opaque ---- -apiVersion: v1 -kind: Service -metadata: - name: scp - namespace: scp -spec: - type: ClusterIP - ports: - - port: 80 - targetPort: 80 - name: web - selector: - app: scp ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: scp - namespace: scp -spec: - replicas: 2 - selector: - matchLabels: - app: scp - template: - metadata: - labels: - app: scp - spec: - containers: - - name: web - image: pottava/s3-proxy:2.0 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 80 - name: web - env: - - name: AWS_REGION - value: fr-par - - name: AWS_S3_BUCKET - value: scp-archives - - name: AWS_API_ENDPOINT - value: https://s3.fr-par.scw.cloud - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: scp-s3 - key: username - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: scp-s3 - key: password - resources: - limits: - memory: 200Mi - requests: - memory: 200Mi ---- -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: scp - namespace: scp - annotations: - cert-manager.io/cluster-issuer: letsencrypt - traefik.ingress.kubernetes.io/frontend-entry-points: http,https - traefik.ingress.kubernetes.io/redirect-entry-point: https - traefik.ingress.kubernetes.io/redirect-permanent: "true" -spec: - tls: - - hosts: - - scp-archives.cluster.fun - secretName: scp-ingress - rules: - - host: scp-archives.cluster.fun - http: - paths: - - path: / - backend: - serviceName: scp - servicePort: 80 diff --git a/terraform/bucket.tf b/terraform/bucket.tf index 86f706f..f9ec84f 100644 --- a/terraform/bucket.tf +++ b/terraform/bucket.tf @@ -24,12 +24,3 @@ resource "scaleway_object_bucket" "outline" { output "outline-bucket_id" { value = scaleway_object_bucket.outline.id } - -resource "scaleway_object_bucket" "scp-archives" { - name = "scp-archives" - acl = "public-read" -} - -output "scp-bucket_id" { - value = scaleway_object_bucket.scp-archives.id -}