Skip to content

HIVE-2548: backport AWS STS fixes #2332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
celebdor wants to merge 3 commits into from
Closed

HIVE-2548: backport AWS STS fixes #2332

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7a33ab
Fix AWS STS for RHEL8/9 transition
2uasimojo Jun 21, 2024
77b7367
HIVE-2551: AWS deprov job compliant with cred proc
celebdor Jun 24, 2024
a076091
HIVE-2550: /output/hiveutil hard link to symlink
celebdor Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions pkg/install/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func CopyAWSServiceProviderSecret(client client.Client, destNamespace string, en
// AWSAssumeRoleCLIConfig creates a secret that can assume the role using the hiveutil
// credential_process helper.
func AWSAssumeRoleCLIConfig(client client.Client, role *hivev1aws.AssumeRole, secretName, secretNamespace string, owner metav1.Object, scheme *runtime.Scheme) error {
cmd := "/usr/bin/hiveutil"
cmd := "/output/hiveutil"
args := []string{"install-manager", "aws-credentials"}
args = append(args, []string{"--namespace", secretNamespace}...)
args = append(args, []string{"--role-arn", role.RoleARN}...)
Expand Down Expand Up @@ -352,7 +352,7 @@ func InstallerPodSpec(
Command: []string{"/bin/sh", "-c"},
// Large file copy here has shown to cause problems in clusters under load, safer to copy then rename to the file the install manager is waiting for
// so it doesn't try to run a partially copied binary.
Args: []string{fmt.Sprintf("cp -v /bin/openshift-install /output/openshift-install && major_version=$(sed -n 's/.*release \\([0-9]*\\).*/\\1/p' /etc/redhat-release) && /output/hiveutil.rhel${major_version} install-manager --work-dir /output --log-level debug %s %s", cd.Namespace, provisionName)},
Args: []string{fmt.Sprintf("cp -v /bin/openshift-install /output/openshift-install.tmp && mv /output/openshift-install.tmp /output/openshift-install && major_version=$(sed -n 's/.*release \\([0-9]*\\).*/\\1/p' /etc/redhat-release) && ln -s /output/hiveutil.rhel${major_version} /output/hiveutil && /output/hiveutil install-manager --work-dir /output --log-level debug %s %s", cd.Namespace, provisionName)},
VolumeMounts: volumeMounts,
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
Expand Down Expand Up @@ -627,6 +627,30 @@ func completeAWSDeprovisionJob(req *hivev1.ClusterDeprovision, job *batchv1.Job)
fmt.Sprintf("sigs.k8s.io/cluster-api-provider-aws/cluster/%s=owned", req.Spec.InfraID),
)

// Set up /output emptydir and copy hiveutil there for credential_process compatibility with provisioning
volumes = append(volumes, corev1.Volume{
Name: "output",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
})
mounts = append(mounts, corev1.VolumeMount{
Name: "output",
MountPath: "/output",
})

initContainers := []corev1.Container{
{
Name: "hive",
Image: images.GetHiveImage(),
ImagePullPolicy: corev1.PullAlways,
Env: env,
Command: []string{"/bin/sh", "-c"},
Args: []string{"cp /usr/bin/hiveutil /output/hiveutil.tmp && mv /output/hiveutil.tmp /output/hiveutil"},
VolumeMounts: mounts,
},
}

containers := []corev1.Container{
{
Name: "deprovision",
Expand All @@ -642,6 +666,7 @@ func completeAWSDeprovisionJob(req *hivev1.ClusterDeprovision, job *batchv1.Job)
// Also cleanup anything with the tag for the legacy cluster ID (credentials still using this for example)
containers[0].Args = append(containers[0].Args, fmt.Sprintf("openshiftClusterID=%s", req.Spec.ClusterID))
}
job.Spec.Template.Spec.InitContainers = initContainers
job.Spec.Template.Spec.Containers = containers
job.Spec.Template.Spec.Volumes = volumes
}
Expand Down