HOSTEDCP-2033: Add ARO HCP environment vars to CSI deployment by bryan-cox · Pull Request #517 · openshift/cluster-storage-operator

bryan-cox · 2024-10-07T20:27:47Z

This commit adds environment variables needed by a CSI deployment for ARO HCP.

openshift-ci · 2024-10-07T20:27:51Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

bryan-cox · 2024-10-10T18:48:59Z

/retest

This commit adds environment variables needed by a CSI deployment for ARO HCP. Signed-off-by: Bryan Cox <brcox@redhat.com>

bryan-cox · 2024-10-17T11:43:51Z

/test hypershift-aws-e2e-external

openshift-ci-robot · 2024-10-19T18:10:17Z

@bryan-cox: This pull request references HOSTEDCP-2033 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target only the "4.18.0" version, but multiple target versions were set.

Details

In response to this:

This commit adds environment variables needed by a CSI deployment for ARO HCP.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

bryan-cox · 2024-10-19T18:15:30Z

/retest

jsafrane · 2024-10-23T14:03:38Z

+	// The existence of the environment variable, ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE, means this is an ARO HCP
+	// deployment. We need to pass along additional environment variables for ARO HCP in order to mount the backing
+	// certificates, related to the client IDs, in a volume on the azure-disk-csi-controller and
+	// azure-file-csi-controller deployments.
+	if os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE") != "" {
+		envVars := []corev1.EnvVar{
+			{Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE")},
+			{Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK")},
+		}
+
+		required.Spec.Template.Spec.Containers[0].Env = append(required.Spec.Template.Spec.Containers[0].Env, envVars...)
+	}


I would prefer a new Azure specific hook in the operator config.

When creating the operator config here, add a new DeploymentHook on HyperShift.

cfg.DeploymentHooks = append(cfg.DeploymentHooks, withAROSecretEnvVars())

And then put the hook func somewhere

func withAROSecretEnvVars() dc.DeploymentHookFunc { hook := func(_ *opv1.OperatorSpec, deployment *appsV1.Deployment) error { if os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE") != "" { envVars := []corev1.EnvVar{ {Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE")}, {Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK")}, } deployment.Spec.Template.Spec.Containers[0].Env = append(deployment.Spec.Template.Spec.Containers[0].Env, envVars...) } return hook }

And use the same hook in azure_file.go

sorry, I thought it's CSI driver operator PR
This is OK for CSO

/lgtm
/approve
/label px-approved
/label docs-approved
/label qe-approved
There will be another PR in azure CSI driver operators to use these env. vars. We should test those.

Discussed offline, this PR is just to pass the HyperShift environment variables on to the CSI operator. Updating the azure-file and azure-disk-csi-operators in the CSI operator repo will be done in a follow up PR.

openshift-ci-robot · 2024-10-23T14:35:33Z

@bryan-cox: This pull request references HOSTEDCP-2033 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target only the "4.18.0" version, but multiple target versions were set.

Details

In response to this:

This commit adds environment variables needed by a CSI deployment for ARO HCP.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2024-10-23T14:35:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, jsafrane

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [jsafrane]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2024-10-23T15:15:22Z

/retest-required

Remaining retests: 0 against base HEAD 595d468 and 2 for PR HEAD 759166b in total

openshift-ci · 2024-10-23T17:58:33Z

@bryan-cox: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ibmcloud-csi	`759166b`	link	false	`/test e2e-ibmcloud-csi`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

bryan-cox · 2024-10-23T18:08:23Z

/test e2e-azure-csi

openshift-bot · 2024-10-23T23:08:50Z

[ART PR BUILD NOTIFIER]

Distgit: cluster-storage-operator
This PR has been included in build ose-cluster-storage-operator-container-v4.18.0-202410232239.p0.g3dfadbf.assembly.stream.el9.
All builds following this will include this PR.

bryan-cox · 2024-11-21T18:37:44Z

/cherry-pick release-4.17

openshift-cherrypick-robot · 2024-11-21T18:38:28Z

@bryan-cox: new pull request created: #540

Details

In response to this:

/cherry-pick release-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 7, 2024

bryan-cox mentioned this pull request Oct 7, 2024

Enable Authenticating with Azure with Certificates using Azure SDK for Go's Generic NewDefaultAzureCredential openshift/enhancements#1694

Closed

jsafrane reviewed Oct 8, 2024

View reviewed changes

Comment thread pkg/operator/csidriveroperator/hypershift_deployment_controller.go Outdated

bryan-cox force-pushed the HOSTEDCP-1994 branch from ed2ec88 to fa8c521 Compare October 9, 2024 23:51

bryan-cox marked this pull request as ready for review October 9, 2024 23:52

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2024

openshift-ci Bot requested review from gnufied and tsmetana October 9, 2024 23:52

bryan-cox commented Oct 10, 2024

View reviewed changes

Comment thread pkg/operator/csidriveroperator/hypershift_deployment_controller.go Outdated

bryan-cox force-pushed the HOSTEDCP-1994 branch from fa8c521 to dd4cefe Compare October 10, 2024 16:24

Add ARO HCP environment vars to CSI deployment

759166b

This commit adds environment variables needed by a CSI deployment for ARO HCP. Signed-off-by: Bryan Cox <brcox@redhat.com>

bryan-cox force-pushed the HOSTEDCP-1994 branch from dd4cefe to 759166b Compare October 11, 2024 17:39

bryan-cox changed the title ~~Add ARO HCP environment vars to CSI deployment~~ HOSTEDCP-2033: Add ARO HCP environment vars to CSI deployment Oct 19, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 19, 2024

bryan-cox mentioned this pull request Oct 22, 2024

OCPBUGS-44968: Reconcile SecretProvider for CSO on ARO HCP openshift/hypershift#4904

Merged

4 tasks

jsafrane reviewed Oct 23, 2024

View reviewed changes

openshift-ci Bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR qe-approved Signifies that QE has signed off on this PR labels Oct 23, 2024

openshift-ci Bot assigned jsafrane Oct 23, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2024

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2024

openshift-merge-bot Bot merged commit 3dfadbf into openshift:master Oct 23, 2024

bryan-cox deleted the HOSTEDCP-1994 branch October 24, 2024 10:53

openshift-cherrypick-robot mentioned this pull request Nov 21, 2024

[release-4.17] OCPBUGS-44627: Add ARO HCP environment vars to CSI deployment #540

Closed

bryan-cox mentioned this pull request Nov 21, 2024

[release-4.17] OCPBUGS-44861: Add ARO HCP environment vars to CSI deployment #541

Closed

Conversation

bryan-cox commented Oct 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Oct 7, 2024

Uh oh!

Uh oh!

Uh oh!

bryan-cox commented Oct 10, 2024

Uh oh!

bryan-cox commented Oct 17, 2024

Uh oh!

openshift-ci-robot commented Oct 19, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bryan-cox commented Oct 19, 2024

Uh oh!

jsafrane Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jsafrane Oct 23, 2024

Choose a reason for hiding this comment

Uh oh!

bryan-cox Oct 23, 2024

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Oct 23, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Oct 23, 2024

Uh oh!

openshift-ci-robot commented Oct 23, 2024

Uh oh!

openshift-ci Bot commented Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bryan-cox commented Oct 23, 2024

Uh oh!

openshift-bot commented Oct 23, 2024

Uh oh!

bryan-cox commented Nov 21, 2024

Uh oh!

openshift-cherrypick-robot commented Nov 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bryan-cox commented Oct 7, 2024 •

edited

Loading

openshift-ci-robot commented Oct 19, 2024 •

edited by openshift-ci Bot

Loading

jsafrane Oct 23, 2024 •

edited

Loading

openshift-ci-robot commented Oct 23, 2024 •

edited by openshift-ci Bot

Loading

openshift-ci Bot commented Oct 23, 2024 •

edited

Loading