diff --git a/.github/scripts/ceph/Dockerfile b/.github/scripts/ceph/Dockerfile deleted file mode 100644 index 06b81754bd..0000000000 --- a/.github/scripts/ceph/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM ceph/daemon:v3.2.1-stable-3.2-mimic-centos-7 - -ENV CEPH_DAEMON demo -ENV CEPH_DEMO_DAEMONS mon,mgr,osd,rgw - -ENV CEPH_DEMO_UID zenko -ENV CEPH_DEMO_ACCESS_KEY accessKey1 -ENV CEPH_DEMO_SECRET_KEY verySecretKey1 -ENV CEPH_DEMO_BUCKET zenkobucket - -ENV CEPH_PUBLIC_NETWORK 0.0.0.0/0 -ENV MON_IP 0.0.0.0 -ENV NETWORK_AUTO_DETECT 0 -ENV RGW_CIVETWEB_PORT 8001 - -RUN rm /etc/yum.repos.d/tcmu-runner.repo - -ADD ./entrypoint-wrapper.sh / -RUN chmod +x /entrypoint-wrapper.sh && \ - rm /etc/yum.repos.d/python-rtslib.repo && \ - yum install -y python-pip && \ - yum clean all && \ - pip install awscli && \ - rm -rf /root/.cache/pip && \ - mkdir /artifacts - -ENTRYPOINT [ "/entrypoint-wrapper.sh" ] diff --git a/.github/scripts/ceph/chart/Chart.yaml b/.github/scripts/ceph/chart/Chart.yaml deleted file mode 100644 index 29d3251ee2..0000000000 --- a/.github/scripts/ceph/chart/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes -name: ceph-in-a-box -version: 0.0.1 diff --git a/.github/scripts/ceph/chart/templates/_helpers.tpl b/.github/scripts/ceph/chart/templates/_helpers.tpl deleted file mode 100644 index 7238c6e836..0000000000 --- a/.github/scripts/ceph/chart/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "ceph.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "ceph.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "ceph.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/.github/scripts/ceph/chart/templates/deployment.yaml b/.github/scripts/ceph/chart/templates/deployment.yaml deleted file mode 100644 index 3c640aec29..0000000000 --- a/.github/scripts/ceph/chart/templates/deployment.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "ceph.fullname" . }} - labels: - app: {{ template "ceph.name" . }} - chart: {{ template "ceph.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: 1 - selector: - matchLabels: - app: {{ template "ceph.name" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ template "ceph.name" . }} - release: {{ .Release.Name }} - spec: - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.ceph.image.repository }}:{{ .Values.ceph.image.tag }}" - imagePullPolicy: {{ .Values.ceph.image.pullPolicy }} - ports: - - containerPort: {{ .Values.ceph.service.internalPort }} - resources: - requests: - cpu: 500m - memory: 1Gi - limits: - cpu: 500m - memory: 1Gi diff --git a/.github/scripts/ceph/chart/templates/service.yaml b/.github/scripts/ceph/chart/templates/service.yaml deleted file mode 100644 index ceb81a1497..0000000000 --- a/.github/scripts/ceph/chart/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "ceph.fullname" . }} - labels: - app: {{ template "ceph.name" . }} - chart: {{ template "ceph.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.ceph.service.type }} - ports: - - port: {{ .Values.ceph.service.externalPort }} - targetPort: {{ .Values.ceph.service.internalPort }} - protocol: TCP - name: {{ .Values.ceph.service.name }} - selector: - app: {{ template "ceph.name" . }} - release: {{ .Release.Name }} diff --git a/.github/scripts/ceph/chart/values.yaml b/.github/scripts/ceph/chart/values.yaml deleted file mode 100644 index d841c6944e..0000000000 --- a/.github/scripts/ceph/chart/values.yaml +++ /dev/null @@ -1,10 +0,0 @@ -ceph: - name: ceph-in-a-box - image: - repository: docker.io/zenko/ceph-ci - tag: latest - pullPolicy: Always - service: - externalPort: 80 - internalPort: 8001 - type: ClusterIP diff --git a/.github/scripts/ceph/entrypoint-wrapper.sh b/.github/scripts/ceph/entrypoint-wrapper.sh deleted file mode 100644 index b8b170f762..0000000000 --- a/.github/scripts/ceph/entrypoint-wrapper.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -function get_ip { - local nic=$1 - # IPv4 is the default unless we specify it - local ip_version=${2:-4} - # We should avoid reporting any IPv6 "scope local" interface that would make the ceph bind() call to fail - ip -"$ip_version" -o a s "$nic" | grep "scope global" | awk '{ sub ("/..", "", $4); print $4 }' || true -} - -# Do this manually as the setup script breaks somehow -MON_IP=$(get_ip "eth0" "4") -export MON_IP - -# Strip this line from the setup script to prevent vHost style buckets from being used -sed -i -e '/rgw dns name = ${RGW_NAME}/d' /demo.sh - -touch /artifacts/ceph.log -mkfifo /tmp/entrypoint_output -# We run this in the background so that we can tail the RGW log after init, -# because entrypoint.sh never returns -bash entrypoint.sh > /tmp/entrypoint_output & -entrypoint_pid="$!" -echo "Starting CEPH...." -while read -r line; do - echo $line - # When we find this line server has started - if [ -n "$(echo $line | grep 'Creating bucket')" ]; then - break - fi -done < /tmp/entrypoint_output - -# Remove the :8001 from the generated .s3cfg -sed -i -e 's/zenko-ceph-ceph-in-a-box:8001/zenko-ceph-ceph-in-a-box/g' /root/.s3cfg - -# Make our buckets - CEPH_DEMO_BUCKET is set to force the "Creating bucket" message, but unused -s3cmd mb s3://ci-zenko-ceph-target-bucket s3://ci-zenko-ceph-crr-target-bucket - -mkdir /root/.aws -cat > /root/.aws/credentials <` for advice on sizing, cluster configuration, and other preparations. @@ -55,7 +51,7 @@ private cloud storage solution. Except as noted, you can integrate to S3 Connector exactly as you would integrate to any of the other S3-based cloud services, such as AWS, DigitalOcean -Spaces, Wasabi Hot Cloud, or Ceph RADOS Gateway. See the S3 Connector and RING +Spaces or Wasabi Hot Cloud. See the S3 Connector and RING documentation at https://documentation.scality.com/ for more details on deploying and configuring S3 Connector with the RING. diff --git a/solution/zenkoversion.yaml b/solution/zenkoversion.yaml index 63b79ad0af..9ad67f99ef 100644 --- a/solution/zenkoversion.yaml +++ b/solution/zenkoversion.yaml @@ -149,7 +149,6 @@ spec: - Transition - NoncurrentVersionTransition locationTypeAzure: true - locationTypeCephRadosGW: true locationTypeCold: true locationTypeDigitalOcean: true locationTypeGCP: true @@ -168,7 +167,6 @@ spec: - location-scality-sproxyd-v1 - location-scality-hdclient-v1 - location-scality-hdclient-v2 - - location-ceph-radosgw-s3-v1 - location-nfs-mount-v1 - location-dmf-v1 - location-miria-v1