Skip to content

fix: remove trailing newline from connection detail output files #799

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

Merged
adrianriobo merged 1 commit into from
May 14, 2026
Merged

fix: remove trailing newline from connection detail output files #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tkn/infra-aws-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/infra-aws-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ "$(params.airgap)" == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-aws-kind.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/infra-aws-mac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ $(params.airgap) == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-aws-ocp-snc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/infra-aws-rhel-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/infra-aws-rhel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ "$(params.airgap)" == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
12 changes: 6 additions & 6 deletions tkn/infra-aws-windows-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ $(params.airgap) == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/infra-azure-aks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/infra-azure-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/infra-azure-rhel-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/infra-azure-rhel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/infra-azure-windows-desktop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,12 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
userpassword: $(cat /opt/host-info/userpassword | base64 -w0)
adminusername: $(cat /opt/host-info/adminusername | base64 -w0)
adminuserpassword: $(cat /opt/host-info/adminuserpassword | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
userpassword: $(cat /opt/host-info/userpassword | tr -d '\n\r' | base64 -w0)
adminusername: $(cat /opt/host-info/adminusername | tr -d '\n\r' | base64 -w0)
adminuserpassword: $(cat /opt/host-info/adminuserpassword | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-aws-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/template/infra-aws-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ "$(params.airgap)" == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-aws-kind.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/template/infra-aws-mac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
Copy link
Copy Markdown
Collaborator

@adrianriobo adrianriobo May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not affect host?, that file should have now a new line too

Copy link
Copy Markdown
Contributor Author

@jangel97 jangel97 May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, host is also affected `output.go appends '\n' to all values written (host, username, id_rsa, etc.), so both need the trim. wdyt?

Copy link
Copy Markdown
Collaborator

@adrianriobo adrianriobo May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah basically you wanna ensure any base64 encoding is trim..so basically any line that | base64 needs to be trimmed

id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ $(params.airgap) == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-aws-ocp-snc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/template/infra-aws-rhel-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/template/infra-aws-rhel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ "$(params.airgap)" == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
12 changes: 6 additions & 6 deletions tkn/template/infra-aws-windows-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,15 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF
if [[ $(params.airgap) == "true" ]]; then
cat <<EOF >> host-info.yaml
bastion-host: $(cat /opt/host-info/bastion_host | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | base64 -w0)
bastion-host: $(cat /opt/host-info/bastion_host | tr -d '\n\r' | base64 -w0)
bastion-username: $(cat /opt/host-info/bastion_username | tr -d '\n\r' | base64 -w0)
bastion-id_rsa: $(cat /opt/host-info/bastion_id_rsa | tr -d '\n\r' | base64 -w0)
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion tkn/template/infra-azure-aks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ spec:
cat <<EOF >> cluster-info.yaml
type: Opaque
data:
kubeconfig: $(cat /opt/cluster-info/kubeconfig | base64 -w0)
kubeconfig: $(cat /opt/cluster-info/kubeconfig | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/template/infra-azure-fedora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/template/infra-azure-rhel-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions tkn/template/infra-azure-rhel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,9 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
EOF

if [[ "$(params.debug)" == "true" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions tkn/template/infra-azure-windows-desktop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,12 @@ spec:
cat <<EOF >> host-info.yaml
type: Opaque
data:
host: $(cat /opt/host-info/host | base64 -w0)
username: $(cat /opt/host-info/username | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | base64 -w0)
userpassword: $(cat /opt/host-info/userpassword | base64 -w0)
adminusername: $(cat /opt/host-info/adminusername | base64 -w0)
adminuserpassword: $(cat /opt/host-info/adminuserpassword | base64 -w0)
host: $(cat /opt/host-info/host | tr -d '\n\r' | base64 -w0)
username: $(cat /opt/host-info/username | tr -d '\n\r' | base64 -w0)
id_rsa: $(cat /opt/host-info/id_rsa | tr -d '\n\r' | base64 -w0)
userpassword: $(cat /opt/host-info/userpassword | tr -d '\n\r' | base64 -w0)
adminusername: $(cat /opt/host-info/adminusername | tr -d '\n\r' | base64 -w0)
adminuserpassword: $(cat /opt/host-info/adminuserpassword | tr -d '\n\r' | base64 -w0)
EOF

if [[ $(params.debug) == "true" ]]; then
Expand Down