Remove unused `accessFrom` field from Bucket v1
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
parent
297b5f1941
commit
2fa8c58d9f
|
@ -21,7 +21,6 @@ import (
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
|
||||||
"github.com/fluxcd/pkg/apis/acl"
|
|
||||||
"github.com/fluxcd/pkg/apis/meta"
|
"github.com/fluxcd/pkg/apis/meta"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -141,12 +140,6 @@ type BucketSpec struct {
|
||||||
// Bucket.
|
// Bucket.
|
||||||
// +optional
|
// +optional
|
||||||
Suspend bool `json:"suspend,omitempty"`
|
Suspend bool `json:"suspend,omitempty"`
|
||||||
|
|
||||||
// AccessFrom specifies an Access Control List for allowing cross-namespace
|
|
||||||
// references to this object.
|
|
||||||
// NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092
|
|
||||||
// +optional
|
|
||||||
AccessFrom *acl.AccessFrom `json:"accessFrom,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// BucketSTSSpec specifies the required configuration to use a Security Token
|
// BucketSTSSpec specifies the required configuration to use a Security Token
|
||||||
|
|
|
@ -173,11 +173,6 @@ func (in *BucketSpec) DeepCopyInto(out *BucketSpec) {
|
||||||
*out = new(string)
|
*out = new(string)
|
||||||
**out = **in
|
**out = **in
|
||||||
}
|
}
|
||||||
if in.AccessFrom != nil {
|
|
||||||
in, out := &in.AccessFrom, &out.AccessFrom
|
|
||||||
*out = new(acl.AccessFrom)
|
|
||||||
(*in).DeepCopyInto(*out)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BucketSpec.
|
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BucketSpec.
|
||||||
|
|
|
@ -33,21 +33,38 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
// BucketProviderGeneric for any S3 API compatible storage Bucket.
|
||||||
|
BucketProviderGeneric string = "generic"
|
||||||
|
// BucketProviderAmazon for an AWS S3 object storage Bucket.
|
||||||
|
// Provides support for retrieving credentials from the AWS EC2 service.
|
||||||
|
BucketProviderAmazon string = "aws"
|
||||||
|
// BucketProviderGoogle for a Google Cloud Storage Bucket.
|
||||||
|
// Provides support for authentication using a workload identity.
|
||||||
|
BucketProviderGoogle string = "gcp"
|
||||||
|
// BucketProviderAzure for an Azure Blob Storage Bucket.
|
||||||
|
// Provides support for authentication using a Service Principal,
|
||||||
|
// Managed Identity or Shared Key.
|
||||||
|
BucketProviderAzure string = "azure"
|
||||||
|
|
||||||
// GenericBucketProvider for any S3 API compatible storage Bucket.
|
// GenericBucketProvider for any S3 API compatible storage Bucket.
|
||||||
// Deprecated: use v1.BucketProviderGeneric.
|
//
|
||||||
|
// Deprecated: use BucketProviderGeneric.
|
||||||
GenericBucketProvider string = apiv1.BucketProviderGeneric
|
GenericBucketProvider string = apiv1.BucketProviderGeneric
|
||||||
// AmazonBucketProvider for an AWS S3 object storage Bucket.
|
// AmazonBucketProvider for an AWS S3 object storage Bucket.
|
||||||
// Provides support for retrieving credentials from the AWS EC2 service.
|
// Provides support for retrieving credentials from the AWS EC2 service.
|
||||||
|
//
|
||||||
// Deprecated: use v1.BucketProviderAmazon.
|
// Deprecated: use v1.BucketProviderAmazon.
|
||||||
AmazonBucketProvider string = apiv1.BucketProviderAmazon
|
AmazonBucketProvider string = apiv1.BucketProviderAmazon
|
||||||
// GoogleBucketProvider for a Google Cloud Storage Bucket.
|
// GoogleBucketProvider for a Google Cloud Storage Bucket.
|
||||||
// Provides support for authentication using a workload identity.
|
// Provides support for authentication using a workload identity.
|
||||||
// Deprecated: use v1.BucketProviderGoogle.
|
//
|
||||||
|
// Deprecated: use BucketProviderGoogle.
|
||||||
GoogleBucketProvider string = apiv1.BucketProviderGoogle
|
GoogleBucketProvider string = apiv1.BucketProviderGoogle
|
||||||
// AzureBucketProvider for an Azure Blob Storage Bucket.
|
// AzureBucketProvider for an Azure Blob Storage Bucket.
|
||||||
// Provides support for authentication using a Service Principal,
|
// Provides support for authentication using a Service Principal,
|
||||||
// Managed Identity or Shared Key.
|
// Managed Identity or Shared Key.
|
||||||
// Deprecated: use v1.BucketProviderAzure.
|
//
|
||||||
|
// Deprecated: use BucketProviderAzure.
|
||||||
AzureBucketProvider string = apiv1.BucketProviderAzure
|
AzureBucketProvider string = apiv1.BucketProviderAzure
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -54,34 +54,6 @@ spec:
|
||||||
BucketSpec specifies the required configuration to produce an Artifact for
|
BucketSpec specifies the required configuration to produce an Artifact for
|
||||||
an object storage bucket.
|
an object storage bucket.
|
||||||
properties:
|
properties:
|
||||||
accessFrom:
|
|
||||||
description: |-
|
|
||||||
AccessFrom specifies an Access Control List for allowing cross-namespace
|
|
||||||
references to this object.
|
|
||||||
NOTE: Not implemented, provisional as of https://github.com/fluxcd/flux2/pull/2092
|
|
||||||
properties:
|
|
||||||
namespaceSelectors:
|
|
||||||
description: |-
|
|
||||||
NamespaceSelectors is the list of namespace selectors to which this ACL applies.
|
|
||||||
Items in this list are evaluated using a logical OR operation.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
NamespaceSelector selects the namespaces to which this ACL applies.
|
|
||||||
An empty map of MatchLabels matches all namespaces in a cluster.
|
|
||||||
properties:
|
|
||||||
matchLabels:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
description: |-
|
|
||||||
MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
|
|
||||||
map is equivalent to an element of matchExpressions, whose key field is "key", the
|
|
||||||
operator is "In", and the values array contains only "value". The requirements are ANDed.
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- namespaceSelectors
|
|
||||||
type: object
|
|
||||||
bucketName:
|
bucketName:
|
||||||
description: BucketName is the name of the object storage bucket.
|
description: BucketName is the name of the object storage bucket.
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -275,22 +275,6 @@ bool
|
||||||
Bucket.</p>
|
Bucket.</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<code>accessFrom</code><br>
|
|
||||||
<em>
|
|
||||||
<a href="https://pkg.go.dev/github.com/fluxcd/pkg/apis/acl#AccessFrom">
|
|
||||||
github.com/fluxcd/pkg/apis/acl.AccessFrom
|
|
||||||
</a>
|
|
||||||
</em>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<em>(Optional)</em>
|
|
||||||
<p>AccessFrom specifies an Access Control List for allowing cross-namespace
|
|
||||||
references to this object.
|
|
||||||
NOTE: Not implemented, provisional as of <a href="https://github.com/fluxcd/flux2/pull/2092">https://github.com/fluxcd/flux2/pull/2092</a></p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -1421,22 +1405,6 @@ bool
|
||||||
Bucket.</p>
|
Bucket.</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<code>accessFrom</code><br>
|
|
||||||
<em>
|
|
||||||
<a href="https://pkg.go.dev/github.com/fluxcd/pkg/apis/acl#AccessFrom">
|
|
||||||
github.com/fluxcd/pkg/apis/acl.AccessFrom
|
|
||||||
</a>
|
|
||||||
</em>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<em>(Optional)</em>
|
|
||||||
<p>AccessFrom specifies an Access Control List for allowing cross-namespace
|
|
||||||
references to this object.
|
|
||||||
NOTE: Not implemented, provisional as of <a href="https://github.com/fluxcd/flux2/pull/2092">https://github.com/fluxcd/flux2/pull/2092</a></p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue