10 小時之前 · 856eeb19d1
--- a/argocd/rook-manifest/buckets/ceph-objectstore-ec-user-jibby.yaml
+++ b/argocd/rook-manifest/buckets/ceph-objectstore-ec-user-jibby.yaml
--- a/argocd/rook-manifest/buckets/ingress.yaml
+++ b/argocd/rook-manifest/buckets/ingress.yaml
--- a/argocd/rook-manifest/buckets/s3-bucket-listing.html
+++ b/argocd/rook-manifest/buckets/s3-bucket-listing.html
@@ -1,3 +1,4 @@
 
				+<!-- Source: https://github.com/rufuspollock/s3-bucket-listing -->
			
 
				 <!DOCTYPE html>
			
 
				 <html>
			
 
				 <head>
			
--- a/argocd/rook-manifest/builtin-mgr.yaml
+++ b/argocd/rook-manifest/builtin-mgr.yaml
--- a/argocd/rook-manifest/ceph-object-store-ec.yaml
+++ b/argocd/rook-manifest/ceph-object-store-ec.yaml
--- a/argocd/rook-manifest/data-ec/data-ec-filesystem.yaml
+++ b/argocd/rook-manifest/data-ec/data-ec-filesystem.yaml
--- a/argocd/rook-manifest/data-ec/data-ec-pvc.yaml
+++ b/argocd/rook-manifest/data-ec/data-ec-pvc.yaml
--- a/argocd/rook-manifest/data-ec/data-ec-sc.yaml
+++ b/argocd/rook-manifest/data-ec/data-ec-sc.yaml
--- a/argocd/rook-manifest/data-ec/data-ec-static-pv.yaml
+++ b/argocd/rook-manifest/data-ec/data-ec-static-pv.yaml
--- a/argocd/rook-manifest/ingress.yaml
+++ b/argocd/rook-manifest/ingress.yaml
--- a/argocd/rook-manifest/media2/media2-filesystem.yaml
+++ b/argocd/rook-manifest/media2/media2-filesystem.yaml
--- a/argocd/rook-manifest/media2/media2-sc.yaml
+++ b/argocd/rook-manifest/media2/media2-sc.yaml
--- a/argocd/rook-manifest/media2/media2-static-pv.yaml
+++ b/argocd/rook-manifest/media2/media2-static-pv.yaml
--- a/argocd/rook-manifest/osd-purge-example.yaml
+++ b/argocd/rook-manifest/osd-purge-example.yaml
--- a/argocd/rook-manifest/plex/plex-filesystem.yaml
+++ b/argocd/rook-manifest/plex/plex-filesystem.yaml
--- a/argocd/rook-manifest/plex/plex-metadata-sc.yaml
+++ b/argocd/rook-manifest/plex/plex-metadata-sc.yaml
--- a/argocd/rook-manifest/plex/plex-metadata-static-pv.yaml
+++ b/argocd/rook-manifest/plex/plex-metadata-static-pv.yaml
--- a/argocd/rook-manifest/plex/plex-sc.yaml
+++ b/argocd/rook-manifest/plex/plex-sc.yaml
--- a/argocd/rook-manifest/plex/plex-static-pv.yaml
+++ b/argocd/rook-manifest/plex/plex-static-pv.yaml
--- a/argocd/rook-manifest/proxmox/proxmox-blockpool.yaml
+++ b/argocd/rook-manifest/proxmox/proxmox-blockpool.yaml
@@ -1,4 +1,4 @@
 
				-# TODO move to the main helm values? or remove? or start using?
			
 
				+# TODO move to the main helm values
			
 
				 apiVersion: ceph.rook.io/v1
			
 
				 kind: CephBlockPool
			
 
				 metadata:
			
--- a/argocd/rook-manifest/seedbox/seedbox-filesystem.yaml
+++ b/argocd/rook-manifest/seedbox/seedbox-filesystem.yaml
@@ -1,4 +1,4 @@
 
				-# TODO move to the main helm values
			
 
				+# TODO redeploy this, then move to the main helm values. See if operator makes any changes during this transition
			
 
				 apiVersion: ceph.rook.io/v1
			
 
				 kind: CephFilesystem
			
 
				 metadata:
			
--- a/argocd/rook-manifest/seedbox/seedbox-pv.yaml
+++ b/argocd/rook-manifest/seedbox/seedbox-pv.yaml
--- a/argocd/rook-manifest/seedbox/seedbox-sc.yaml
+++ b/argocd/rook-manifest/seedbox/seedbox-sc.yaml
--- a/rook/buckets/bucket.py
+++ b/rook/buckets/bucket.py
@@ -1,37 +0,0 @@
 
				-import boto3
			
 
				-import json
			
 
				-import os
			
 
				-
			
 
				-def connect():
			
 
				-    access_key = os.environ["AWS_ACCESS_KEY_ID"]
			
 
				-    secret_key = os.environ["AWS_SECRET_ACCESS_KEY"]
			
 
				-
			
 
				-    return boto3.client('s3', 'us-east-1',
			
 
				-                        endpoint_url="https://s3.jibby.org",
			
 
				-                        aws_access_key_id = access_key,
			
 
				-                        aws_secret_access_key = secret_key)
			
 
				-
			
 
				-def create_bucket(bucket_name):
			
 
				-    conn = connect()
			
 
				-    conn.create_bucket(Bucket=bucket_name)
			
 
				-
			
 
				-def set_public_read_policy(bucket_name):
			
 
				-    bucket_policy = {
			
 
				-    "Version":"2012-10-17",
			
 
				-    "Statement":[
			
 
				-        {
			
 
				-        "Sid":"AddPerm",
			
 
				-        "Effect":"Allow",
			
 
				-        "Principal": "*",
			
 
				-        "Action":["s3:GetObject", "s3:ListBucket"],
			
 
				-        "Resource":[
			
 
				-            "arn:aws:s3:::{0}/*".format(bucket_name),
			
 
				-            "arn:aws:s3:::{0}".format(bucket_name),
			
 
				-            ]
			
 
				-        }
			
 
				-    ]
			
 
				-    }
			
 
				-
			
 
				-    bucket_policy = json.dumps(bucket_policy)
			
 
				-    conn = connect()
			
 
				-    conn.put_bucket_policy(Bucket=bucket_name, Policy=bucket_policy)