[release-4.17] OCPBUGS-44861: Add ARO HCP environment vars to CSI deployment by bryan-cox · Pull Request #541 · openshift/cluster-storage-operator

bryan-cox · 2024-11-21T19:26:46Z

This pull request is the cherry-picks of:

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

openshift-ci-robot · 2024-11-21T19:26:51Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-44627, which is invalid:

expected the bug to target either version "4.17." or "openshift-4.17.", but it targets "4.18.0" instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-44627 to depend on a bug targeting a version in 4.18.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This pull requests is the cherry-picks of:

HOSTEDCP-2033: Add ARO HCP environment vars to CSI deployment #517

HOSTEDCP-2033: Correct ARO HCP environment vars for CSI driver operator deployment #530

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-11-21T19:28:17Z

/jira cherrypick OCPBUGS-44627

openshift-ci-robot · 2024-11-21T19:28:26Z

@bryan-cox: Jira Issue OCPBUGS-44627 has been cloned as Jira Issue OCPBUGS-44861. Will retitle bug to link to clone.
/retitle OCPBUGS-44861: OCPBUGS-44627: Add ARO HCP environment vars to CSI deployment

Details

In response to this:

/jira cherrypick OCPBUGS-44627

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-robot · 2024-11-21T19:29:16Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-44861, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected dependent Jira Issue OCPBUGS-44627 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This pull request is the cherry-picks of:

HOSTEDCP-2033: Add ARO HCP environment vars to CSI deployment #517

HOSTEDCP-2033: Correct ARO HCP environment vars for CSI driver operator deployment #530

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-11-21T21:59:11Z

@bryan-cox: The following tests 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-gcp-manual-oidc	`a508f21`	link	false	`/test e2e-gcp-manual-oidc`
ci/prow/e2e-ibmcloud-csi	`a508f21`	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 · 2025-01-06T16:05:45Z

/jira refresh

openshift-ci-robot · 2025-01-06T16:05:50Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-44861, which is invalid:

expected dependent Jira Issue OCPBUGS-44627 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/jira refresh

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.

jsafrane · 2025-01-07T15:43:33Z

+	// 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.
+	var envVars []corev1.EnvVar
+	if os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK") != "" && requiredCopy.Name == "azure-disk-csi-driver-operator" {
+		envVars = []corev1.EnvVar{
+			{Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_DISK")},
+		}
+	}
+
+	if os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE") != "" && requiredCopy.Name == "azure-file-csi-driver-operator" {
+		envVars = []corev1.EnvVar{
+			{Name: "ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE", Value: os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS_FOR_FILE")},
+		}
+	}


I would prefer a generic function like InjectPassThroughEnvVars with a list (map with operator name?) of env. vars to pass from the upper layer (CVO / hypershift) down to the CSI driver operators. Having a specific code for each env. var looks error prone to me - now it's just two env. vars for ARO, but who knows what comes next.

And you can unit test that function nicely 3:-).

heh, too late, I missed it's a cherry pick

/lgtm
/approve
/label backport-risk-assessed

openshift-ci · 2025-01-07T15:45:38Z

[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

Phaow · 2025-01-09T09:12:20Z

/label cherry-pick-approved

bryan-cox · 2025-01-23T18:21:25Z

/close

Closing for now since it looks like ARO HCP will private preview with 4.18.0 rather than 4.17.z.

openshift-ci · 2025-01-23T18:22:17Z

@bryan-cox: Closed this PR.

Details

In response to this:

/close

Closing for now since it looks like ARO HCP will private preview with 4.18.0 rather than 4.17.z.

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-robot · 2025-01-23T18:22:17Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-44861. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

This pull request is the cherry-picks of:

HOSTEDCP-2033: Add ARO HCP environment vars to CSI deployment #517

HOSTEDCP-2033: Correct ARO HCP environment vars for CSI driver operator deployment #530

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 and others added 3 commits November 21, 2024 14:16

Add ARO HCP environment vars to CSI deployment

af0e14f

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

HOSTEDCP-2033: Correct ARO HCP environment vars to CSI deployment

803310a

Fix: go linter

a508f21

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 21, 2024

openshift-ci Bot changed the title ~~OCPBUGS-44627: Add ARO HCP environment vars to CSI deployment~~ OCPBUGS-44861: OCPBUGS-44627: Add ARO HCP environment vars to CSI deployment Nov 21, 2024

bryan-cox changed the title ~~OCPBUGS-44861: OCPBUGS-44627: Add ARO HCP environment vars to CSI deployment~~ OCPBUGS-44861: Add ARO HCP environment vars to CSI deployment Nov 21, 2024

bryan-cox changed the title ~~OCPBUGS-44861: Add ARO HCP environment vars to CSI deployment~~ [release-4.17] OCPBUGS-44861: Add ARO HCP environment vars to CSI deployment Nov 21, 2024

jsafrane reviewed Jan 7, 2025

View reviewed changes

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 7, 2025

openshift-ci Bot assigned chao007, duanwei33, Phaow, radeore, ropatil010 and jsafrane Jan 7, 2025

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2025

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2025

openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 9, 2025

openshift-ci Bot closed this Jan 23, 2025

Conversation

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

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 21, 2024

Uh oh!

bryan-cox commented Nov 21, 2024

Uh oh!

openshift-ci-robot commented Nov 21, 2024

Uh oh!

openshift-ci-robot commented Nov 21, 2024

Uh oh!

openshift-ci Bot commented Nov 21, 2024

Uh oh!

bryan-cox commented Jan 6, 2025

Uh oh!

openshift-ci-robot commented Jan 6, 2025

Uh oh!

jsafrane Jan 7, 2025

Choose a reason for hiding this comment

Uh oh!

jsafrane Jan 7, 2025

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jan 7, 2025

Uh oh!

Phaow commented Jan 9, 2025

Uh oh!

bryan-cox commented Jan 23, 2025

Uh oh!

openshift-ci Bot commented Jan 23, 2025

Uh oh!

openshift-ci-robot commented Jan 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

bryan-cox commented Nov 21, 2024 •

edited

Loading