Merge pull request #10778 from olemarkus/managed-file-public

Add support for creating world-readable managedFiles
kubernetes · Feb 11, 2021 · 9b7ed55 · 9b7ed55
2 parents c00e561 + e0c3490
commit 9b7ed55
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -46,6 +46,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-events
+Public: null
 ---
 Base: memfs://clusters.example.com/minimal.example.com/backups/etcd-main
 Contents: |-
@@ -55,6 +56,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-main
+Public: null
 ---
 Base: null
 Contents: |
@@ -112,6 +114,7 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/events.yaml
 Name: manifests-etcdmanager-events
+Public: null
 ---
 Base: null
 Contents: |
@@ -169,3 +172,4 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/main.yaml
 Name: manifests-etcdmanager-main
+Public: null
diff --git a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml
@@ -46,6 +46,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-events
+Public: null
 ---
 Base: memfs://clusters.example.com/minimal.example.com/backups/etcd-main
 Contents: |-
@@ -55,6 +56,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-main
+Public: null
 ---
 Base: null
 Contents: |
@@ -118,6 +120,7 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/events.yaml
 Name: manifests-etcdmanager-events
+Public: null
 ---
 Base: null
 Contents: |
@@ -181,3 +184,4 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/main.yaml
 Name: manifests-etcdmanager-main
+Public: null
diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -46,6 +46,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-events
+Public: null
 ---
 Base: memfs://clusters.example.com/minimal.example.com/backups/etcd-main
 Contents: |-
@@ -55,6 +56,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-main
+Public: null
 ---
 Base: null
 Contents: |
@@ -115,6 +117,7 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/events.yaml
 Name: manifests-etcdmanager-events
+Public: null
 ---
 Base: null
 Contents: |
@@ -175,3 +178,4 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/main.yaml
 Name: manifests-etcdmanager-main
+Public: null
diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -46,6 +46,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-events
+Public: null
 ---
 Base: memfs://clusters.example.com/minimal.example.com/backups/etcd-main
 Contents: |-
@@ -55,6 +56,7 @@ Contents: |-
 Lifecycle: null
 Location: /control/etcd-cluster-spec
 Name: etcd-cluster-spec-main
+Public: null
 ---
 Base: null
 Contents: |
@@ -127,6 +129,7 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/events.yaml
 Name: manifests-etcdmanager-events
+Public: null
 ---
 Base: null
 Contents: |
@@ -199,3 +202,4 @@ Contents: |
 Lifecycle: null
 Location: manifests/etcd/main.yaml
 Name: manifests-etcdmanager-main
+Public: null
diff --git a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
@@ -35,3 +35,4 @@ Contents: |
 Lifecycle: null
 Location: manifests/static/kube-apiserver-healthcheck.yaml
 Name: manifests-static-kube-apiserver-healthcheck
+Public: null
diff --git a/upup/pkg/fi/fitasks/managedfile.go b/upup/pkg/fi/fitasks/managedfile.go
@@ -35,6 +35,7 @@ type ManagedFile struct {
 	Base     *string
 	Location *string
 	Contents fi.Resource
+	Public   *bool
 }
 
 func (e *ManagedFile) Find(c *fi.Context) (*ManagedFile, error) {
@@ -102,9 +103,23 @@ func (_ *ManagedFile) Render(c *fi.Context, a, e, changes *ManagedFile) error {
 	}
 	p = p.Join(location)
 
-	acl, err := acls.GetACL(p, c.Cluster)
-	if err != nil {
-		return err
+	var acl vfs.ACL
+	if fi.BoolValue(e.Public) {
+		switch p.(type) {
+		case *vfs.S3Path:
+			acl = vfs.S3Acl{
+				RequestACL: fi.String("public-read"),
+			}
+		default:
+			return fmt.Errorf("the %q path does not support public ACL", p.Path())
+		}
+
+	} else {
+
+		acl, err = acls.GetACL(p, c.Cluster)
+		if err != nil {
+			return err
+		}
 	}
 
 	err = p.WriteFile(bytes.NewReader(data), acl)