Skip to content

Commit 0725370

Browse files
committed
feat(subscription) Config Volume and VolumeMounts
This commit updates the SubscriptionConfig type to include the Volumes and VolumeMounts fields. These fields can be used to set the Volume and VolumeMount fields on operators deployed by OLM. This commit also introduces a number of unit tests and an e2e test that ensures that this feature is working as intended.
1 parent ca90e3e commit 0725370

File tree

19 files changed

+7034
-25
lines changed

19 files changed

+7034
-25
lines changed

deploy/chart/templates/0000_50_olm_05-subscription.crd.yaml

Lines changed: 1279 additions & 0 deletions
Large diffs are not rendered by default.

deploy/ocp/manifests/0.12.0/0000_50_olm_05-subscription.crd.yaml

Lines changed: 1279 additions & 0 deletions
Large diffs are not rendered by default.

deploy/upstream/manifests/0.12.0/0000_50_olm_05-subscription.crd.yaml

Lines changed: 1279 additions & 0 deletions
Large diffs are not rendered by default.

deploy/upstream/quickstart/crds.yaml

Lines changed: 1279 additions & 0 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_05-subscription.crd.yaml

Lines changed: 1279 additions & 0 deletions
Large diffs are not rendered by default.

pkg/api/apis/operators/subscription_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,14 @@ type SubscriptionConfig struct {
7373
// +patchMergeKey=name
7474
// +patchStrategy=merge
7575
Env []corev1.EnvVar `json:"env,omitempty"`
76+
77+
// List of Volumes to set in the podSpec.
78+
// +optional
79+
Volumes []corev1.Volume `json:"volumes,omitempty"`
80+
81+
// List of VolumeMounts to set in the container.
82+
// +optional
83+
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
7684
}
7785

7886
// SubscriptionConditionType indicates an explicit state condition about a Subscription in "abnormal-true"

pkg/api/apis/operators/v1alpha1/subscription_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ type SubscriptionConfig struct {
7676
// +patchStrategy=merge
7777
// +optional
7878
Env []corev1.EnvVar `json:"env,omitempty" patchMergeKey:"name" patchStrategy:"merge"`
79+
80+
// List of Volumes to set in the podSpec.
81+
// +optional
82+
Volumes []corev1.Volume `json:"volumes,omitempty"`
83+
84+
// List of VolumeMounts to set in the container.
85+
// +optional
86+
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
7987
}
8088

8189
// SubscriptionConditionType indicates an explicit state condition about a Subscription in "abnormal-true"

pkg/api/apis/operators/v1alpha1/zz_generated.conversion.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/apis/operators/v1alpha1/zz_generated.deepcopy.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/apis/operators/zz_generated.deepcopy.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)