diff --git a/deployments/apps/forecastle/apps.yaml b/deployments/apps/forecastle/apps.yaml index 3aa8e93..0eeb418 100644 --- a/deployments/apps/forecastle/apps.yaml +++ b/deployments/apps/forecastle/apps.yaml @@ -176,17 +176,3 @@ spec: ingressRef: name: jenkins --- -apiVersion: forecastle.stakater.com/v1alpha1 -kind: ForecastleApp -metadata: - name: minio - namespace: infra -spec: - name: Minio - group: Storage - icon: https://blog.alexellis.io/content/images/2017/01/minio_light_cir_sm-1.png - networkRestricted: false - urlFrom: - ingressRef: - name: minio ---- diff --git a/setup/.env.sample b/setup/.env.sample index 39c155d..80dc03e 100644 --- a/setup/.env.sample +++ b/setup/.env.sample @@ -15,6 +15,3 @@ VAULT_UNSEAL_KEY_4="" VAULT_UNSEAL_KEY_5="" SLACK_URL="" - -S3_ACCESS_KEY="" -S3_SECRET_KEY="" diff --git a/setup/bin/bootstrap-secrets.sh b/setup/bin/bootstrap-secrets.sh index ef59cb8..c0e22ab 100755 --- a/setup/bin/bootstrap-secrets.sh +++ b/setup/bin/bootstrap-secrets.sh @@ -21,7 +21,3 @@ kubectl -n vault create secret generic vault-unseal-keys --from-literal="VAULT_U kubectl -n flux create secret generic fluxcloud --from-literal="slack_url=$SLACK_URL" kubectl -n monitoring create secret generic alertmanager --from-literal="slack_url=$SLACK_URL" - - -kubectl -n infra create secret generic minio --from-literal="accesskey=$S3_ACCESS_KEY" \ - --from-literal="secretkey=$S3_SECRET_KEY" diff --git a/unused/deployments/apps/forecastle/apps.yaml b/unused/deployments/apps/forecastle/apps.yaml index ebccad0..704182e 100644 --- a/unused/deployments/apps/forecastle/apps.yaml +++ b/unused/deployments/apps/forecastle/apps.yaml @@ -14,4 +14,18 @@ spec: urlFrom: ingressRef: name: chronograf ---- \ No newline at end of file +--- +apiVersion: forecastle.stakater.com/v1alpha1 +kind: ForecastleApp +metadata: + name: minio + namespace: infra +spec: + name: Minio + group: Storage + icon: https://blog.alexellis.io/content/images/2017/01/minio_light_cir_sm-1.png + networkRestricted: false + urlFrom: + ingressRef: + name: minio +--- diff --git a/deployments/infra/minio/minio.yaml b/unused/deployments/infra/minio/minio.yaml similarity index 100% rename from deployments/infra/minio/minio.yaml rename to unused/deployments/infra/minio/minio.yaml diff --git a/unused/deployments/velero/namespace.yaml b/unused/deployments/velero/namespace.yaml new file mode 100644 index 0000000..8cd52fd --- /dev/null +++ b/unused/deployments/velero/namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: velero \ No newline at end of file diff --git a/unused/deployments/velero/velero/crd.yaml b/unused/deployments/velero/velero/crd.yaml new file mode 100644 index 0000000..3b01cca --- /dev/null +++ b/unused/deployments/velero/velero/crd.yaml @@ -0,0 +1,153 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: backups.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: backups + kind: Backup +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: backupstoragelocations.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: backupstoragelocations + kind: BackupStorageLocation +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: deletebackuprequests.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: deletebackuprequests + kind: DeleteBackupRequest +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: downloadrequests.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: downloadrequests + kind: DownloadRequest +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: podvolumebackups.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: podvolumebackups + kind: PodVolumeBackup +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: podvolumerestores.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: podvolumerestores + kind: PodVolumeRestore +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: resticrepositories.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: resticrepositories + kind: ResticRepository +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: restores.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: restores + kind: Restore +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: schedules.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: schedules + kind: Schedule +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: serverstatusrequests.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: serverstatusrequests + kind: ServerStatusRequest +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: volumesnapshotlocations.velero.io + labels: + app.kubernetes.io/name: velero +spec: + group: velero.io + version: v1 + scope: Namespaced + names: + plural: volumesnapshotlocations + kind: VolumeSnapshotLocation diff --git a/unused/docker/velero/Dockerfile b/unused/docker/velero/Dockerfile new file mode 100644 index 0000000..4fa522a --- /dev/null +++ b/unused/docker/velero/Dockerfile @@ -0,0 +1,20 @@ +FROM arm32v7/alpine:3.10 + +WORKDIR /tmp + +RUN apk add --no-cache ca-certificates \ + && apk add --no-cache --virtual build-dependencies bzip2 curl \ + && curl -k -sSfL -o ./restic_0.9.5_linux_arm.bz2 https://github.com/restic/restic/releases/download/v0.9.5/restic_0.9.5_linux_arm.bz2 \ + && bunzip2 restic_0.9.5_linux_arm.bz2 \ + && mv restic_0.9.5_linux_arm /usr/bin/restic \ + && chmod +x /usr/bin/restic \ + && curl -k -sSfL -o ./velero-v1.2.0-linux-arm.tar.gz https://github.com/vmware-tanzu/velero/releases/download/v1.2.0/velero-v1.2.0-linux-arm.tar.gz \ + && tar -xvf ./velero-v1.2.0-linux-arm.tar.gz \ + && mv velero-v1.2.0-linux-arm/velero /velero \ + && chmod +x /velero \ + && rm -rf /tmp/* \ + && apk del build-dependencies + +WORKDIR / + +ENTRYPOINT ["/velero"] \ No newline at end of file diff --git a/unused/secrets.sh b/unused/secrets.sh new file mode 100644 index 0000000..f5d49b7 --- /dev/null +++ b/unused/secrets.sh @@ -0,0 +1,2 @@ +kubectl -n infra create secret generic minio --from-literal="accesskey=$S3_ACCESS_KEY" \ + --from-literal="secretkey=$S3_SECRET_KEY" \ No newline at end of file