diff --git a/apps/base/ceph-system/certificate.yaml b/apps/base/ceph-system/certificate.yaml new file mode 100644 index 0000000..8a7729c --- /dev/null +++ b/apps/base/ceph-system/certificate.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: rgw-tls + namespace: ceph-system + labels: + app.kubernetes.io/name: rgw +spec: + secretName: rgw-tls + issuerRef: + kind: ClusterIssuer + name: vault-issuer + commonName: s3.ceph.unkin.net + dnsNames: + - s3.ceph.unkin.net + - rgw.k8s.syd1.au.unkin.net + - radosgw.service.consul + - radosgw.query.consul + - radosgw.service.au-syd1.consul + - radosgw.main.unkin.net + ipAddresses: + - 198.18.200.11 + privateKey: + algorithm: RSA + size: 4096 diff --git a/apps/base/ceph-system/configmap.yaml b/apps/base/ceph-system/configmap.yaml index 52a1dff..bb553ee 100644 --- a/apps/base/ceph-system/configmap.yaml +++ b/apps/base/ceph-system/configmap.yaml @@ -19,7 +19,7 @@ data: rgw_realm = unkin rgw_zonegroup = au rgw_zone = syd1 - rgw_frontends = beast port=7480 + rgw_frontends = beast port=7480 ssl_port=7443 ssl_certificate=/etc/rgw/tls/tls.crt ssl_private_key=/etc/rgw/tls/tls.key keyring = /var/lib/ceph/radosgw/ceph-rgw.syd1/keyring log_to_file = false log_to_stderr = true diff --git a/apps/base/ceph-system/deployment.yaml b/apps/base/ceph-system/deployment.yaml index 32ebbd6..a688327 100644 --- a/apps/base/ceph-system/deployment.yaml +++ b/apps/base/ceph-system/deployment.yaml @@ -64,6 +64,8 @@ spec: ports: - name: http containerPort: 7480 + - name: https + containerPort: 7443 startupProbe: httpGet: path: / @@ -98,6 +100,9 @@ spec: - name: ceph-conf mountPath: /etc/ceph readOnly: true + - name: tls + mountPath: /etc/rgw/tls + readOnly: true - name: keyring mountPath: /var/lib/ceph/radosgw/ceph-rgw.syd1 readOnly: true @@ -111,6 +116,9 @@ spec: - name: ceph-conf configMap: name: ceph-conf + - name: tls + secret: + secretName: rgw-tls - name: keyring secret: secretName: rgw-keyring diff --git a/apps/base/ceph-system/kustomization.yaml b/apps/base/ceph-system/kustomization.yaml index e8ab320..f04fbd9 100644 --- a/apps/base/ceph-system/kustomization.yaml +++ b/apps/base/ceph-system/kustomization.yaml @@ -9,5 +9,7 @@ resources: - vaultstaticsecret.yaml - deployment.yaml - service.yaml + - service-external.yaml + - certificate.yaml - pdb.yaml - vpa.yaml diff --git a/apps/base/ceph-system/service-external.yaml b/apps/base/ceph-system/service-external.yaml new file mode 100644 index 0000000..86dad37 --- /dev/null +++ b/apps/base/ceph-system/service-external.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: rgw-external + namespace: ceph-system + labels: + app.kubernetes.io/name: rgw + annotations: + purelb.io/service-group: common + purelb.io/addresses: 198.18.200.11 + external-dns.alpha.kubernetes.io/hostname: rgw.k8s.syd1.au.unkin.net +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app.kubernetes.io/name: rgw + ports: + - name: https + port: 443 + targetPort: https