Skip to content

Commit

Permalink
Moved StorageAccount and ResourceGroup props in volumes
Browse files Browse the repository at this point in the history
  • Loading branch information
@satr
satr committed Jan 29, 2025
1 parent d6c3503 commit 3cfebf7
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 105 deletions.
12 changes: 12 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,19 @@ generate: bootstrap code-gen crds mocks
verify-generate: bootstrap generate
git diff --exit-code

.PHONY: apply-ra
apply-ra: bootstrap
kubectl apply -f ./charts/radix-operator/templates/radixapplication.yaml

.PHONY: apply-rd
apply-rd: bootstrap
kubectl apply -f ./charts/radix-operator/templates/radixdeployment.yaml

HAS_GOLANGCI_LINT := $(shell command -v golangci-lint;)
HAS_MOCKGEN := $(shell command -v mockgen;)
HAS_CONTROLLER_GEN := $(shell command -v controller-gen;)
HAS_YQ := $(shell command -v yq;)
HAS_KUBECTL := $(shell command -v kubectl;)

.PHONY: bootstrap
bootstrap: vendor
Expand All @@ -189,3 +198,6 @@ endif
ifndef HAS_YQ
go install github.com/mikefarah/yq/v4@latest
endif
ifndef HAS_KUBECTL
go install k8s.io/kubernetes/cmd/kubectl@latest
endif
82 changes: 40 additions & 42 deletions charts/radix-operator/templates/radixapplication.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1432,10 +1432,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account.
Applicable when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -1447,13 +1443,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is
mandatory when using a workload identity.
It is optional when using Access Key, if it
is not defined, it will be configured in a
secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -1549,6 +1538,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account.
Applicable when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -1559,6 +1552,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional
when using Access Key, if it is not defined, it
will be configured in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down Expand Up @@ -2636,10 +2635,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -2651,12 +2646,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will
be configured in a secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -2749,6 +2738,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -2759,6 +2752,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will be configured
in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down Expand Up @@ -3526,10 +3525,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account.
Applicable when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -3541,13 +3536,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is
mandatory when using a workload identity.
It is optional when using Access Key, if it
is not defined, it will be configured in a
secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -3643,6 +3631,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account.
Applicable when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -3653,6 +3645,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional
when using Access Key, if it is not defined, it
will be configured in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down Expand Up @@ -4110,10 +4108,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -4125,12 +4119,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will
be configured in a secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -4223,6 +4211,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -4233,6 +4225,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will be configured
in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down
40 changes: 20 additions & 20 deletions charts/radix-operator/templates/radixdeployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,10 +1233,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -1248,12 +1244,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will
be configured in a secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -1346,6 +1336,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -1356,6 +1350,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will be configured
in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down Expand Up @@ -1848,10 +1848,6 @@ spec:
Requested size (opens new window)of allocated mounted volume. Default value is set to "1Mi" (1 megabyte). Current version of the driver does not affect mounted volume size
More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-persistent-volume-storage/#create-a-persistentvolumeclaim
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
SKU Type of Azure storage.
Expand All @@ -1863,12 +1859,6 @@ spec:
- Standard_RAGRS
- ""
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will
be configured in a secret.
type: string
streaming:
description: |-
Configure Streaming mode. Used for blobfuse2.
Expand Down Expand Up @@ -1961,6 +1951,10 @@ spec:
Deprecated: use BlobFuse2 instead.
More info: https://www.radix.equinor.com/guides/volume-mounts/optional-settings/
type: string
resourceGroup:
description: ResourceGroup of a storage account. Applicable
when using a workload identity.
type: string
skuName:
description: |-
Deprecated: use BlobFuse2 instead.
Expand All @@ -1971,6 +1965,12 @@ spec:
Deprecated: use BlobFuse2 instead.
Storage defines the name of the container in the external storage resource.
type: string
storageAccount:
description: Name of a storage account. It is mandatory
when using a workload identity. It is optional when
using Access Key, if it is not defined, it will be configured
in a secret.
type: string
type:
description: |-
Deprecated: use BlobFuse2 instead.
Expand Down
Loading

0 comments on commit 3cfebf7

Please sign in to comment.