diff --git a/clusters/cl01tl/helm/s3-exporter/templates/external-secret.yaml b/clusters/cl01tl/helm/s3-exporter/templates/external-secret.yaml index 20dc701d4..83a73342e 100644 --- a/clusters/cl01tl/helm/s3-exporter/templates/external-secret.yaml +++ b/clusters/cl01tl/helm/s3-exporter/templates/external-secret.yaml @@ -34,43 +34,6 @@ spec: metadataPolicy: None property: AWS_REGION ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: s3-ceph-directus-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: s3-ceph-directus-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: AWS_ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/directus/ceph - metadataPolicy: None - property: AWS_ACCESS_KEY_ID - - secretKey: AWS_SECRET_ACCESS_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/directus/ceph - metadataPolicy: None - property: AWS_SECRET_ACCESS_KEY - - secretKey: BUCKET_HOST - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/directus/ceph - metadataPolicy: None - property: BUCKET_HOST - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/helm/s3-exporter/values.yaml b/clusters/cl01tl/helm/s3-exporter/values.yaml index 5fe138ab8..3375b3057 100644 --- a/clusters/cl01tl/helm/s3-exporter/values.yaml +++ b/clusters/cl01tl/helm/s3-exporter/values.yaml @@ -39,45 +39,6 @@ s3-exporter: requests: cpu: 10m memory: 64Mi - ceph-directus: - type: deployment - replicas: 1 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - main: - image: - repository: molu8bits/s3bucket_exporter - tag: 1.0.2 - pullPolicy: IfNotPresent - env: - - name: S3_NAME - value: ceph-directus - - name: S3_ENDPOINT - valueFrom: - secretKeyRef: - name: s3-ceph-directus-secret - key: BUCKET_HOST - - name: S3_ACCESS_KEY - valueFrom: - secretKeyRef: - name: s3-ceph-directus-secret - key: AWS_ACCESS_KEY_ID - - name: S3_SECRET_KEY - valueFrom: - secretKeyRef: - name: s3-ceph-directus-secret - key: AWS_SECRET_ACCESS_KEY - - name: S3_REGION - value: us-east-1 - - name: LOG_LEVEL - value: info - - name: S3_FORCE_PATH_STYLE - value: true - resources: - requests: - cpu: 10m - memory: 64Mi garage-local: type: deployment replicas: 1 @@ -158,13 +119,6 @@ s3-exporter: port: 9655 targetPort: 9655 protocol: TCP - ceph-directus: - controller: ceph-directus - ports: - metrics: - port: 9655 - targetPort: 9655 - protocol: TCP garage-local: controller: garage-local ports: @@ -192,18 +146,6 @@ s3-exporter: interval: 5m scrapeTimeout: 120s path: /metrics - ceph-directus: - selector: - matchLabels: - app.kubernetes.io/name: s3-exporter - app.kubernetes.io/instance: s3-exporter - app.kubernetes.io/service: s3-exporter-ceph-directus - serviceName: s3-exporter-ceph-directus - endpoints: - - port: metrics - interval: 5m - scrapeTimeout: 120s - path: /metrics garage-local: selector: matchLabels: