From f85a423dd0a132d6cddd1325651d7be19eea9a98 Mon Sep 17 00:00:00 2001 From: James Pace Date: Sun, 2 Apr 2023 10:51:25 -0400 Subject: [PATCH] Grab host keys in the tasks not from the secret like before. --- generic-tasks/j7s-ansible-build.yaml | 2 ++ generic-tasks/j7s-git-clone-hash.yaml | 1 + generic-tasks/j7s-git-clone.yaml | 1 + generic-tasks/j7s-ros-clone.yaml | 1 + j7s-os/j7s-os-k8s-deploy.yaml | 1 + 5 files changed, 6 insertions(+) diff --git a/generic-tasks/j7s-ansible-build.yaml b/generic-tasks/j7s-ansible-build.yaml index d63a623..1c56cfd 100644 --- a/generic-tasks/j7s-ansible-build.yaml +++ b/generic-tasks/j7s-ansible-build.yaml @@ -19,6 +19,8 @@ spec: cp -r $(workspaces.ssh-directory.path) ~/.ssh chmod 700 ~/.ssh chmod -R 400 ~/.ssh/* + ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts + ssh-keyscan -H packages.jpace121.net >> ~/.ssh/known_hosts cd $(workspaces.source.path) ansible-playbook -vvvv --skip-tags deploy -i $(params.ansible-file-path)/inventory.yaml $(params.ansible-file-path)/build.yaml diff --git a/generic-tasks/j7s-git-clone-hash.yaml b/generic-tasks/j7s-git-clone-hash.yaml index eea4608..7c486e6 100644 --- a/generic-tasks/j7s-git-clone-hash.yaml +++ b/generic-tasks/j7s-git-clone-hash.yaml @@ -16,6 +16,7 @@ spec: cp -r $(workspaces.ssh-directory.path) ~/.ssh chmod 700 ~/.ssh chmod -R 400 ~/.ssh/* + ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts git clone $(params.url) $(workspaces.output.path) cd $(workspaces.output.path) diff --git a/generic-tasks/j7s-git-clone.yaml b/generic-tasks/j7s-git-clone.yaml index 5fb2b43..d18a8e6 100644 --- a/generic-tasks/j7s-git-clone.yaml +++ b/generic-tasks/j7s-git-clone.yaml @@ -16,5 +16,6 @@ spec: cp -r $(workspaces.ssh-directory.path) ~/.ssh chmod 700 ~/.ssh chmod -R 400 ~/.ssh/* + ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts git clone --single-branch --branch $(params.branch) $(params.url) $(workspaces.output.path) \ No newline at end of file diff --git a/generic-tasks/j7s-ros-clone.yaml b/generic-tasks/j7s-ros-clone.yaml index bf50edc..d17569f 100644 --- a/generic-tasks/j7s-ros-clone.yaml +++ b/generic-tasks/j7s-ros-clone.yaml @@ -17,6 +17,7 @@ spec: cp -r $(workspaces.ssh-directory.path) ~/.ssh chmod 700 ~/.ssh chmod -R 400 ~/.ssh/* + ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts git clone --single-branch --branch $(params.branch) $(params.url) $(workspaces.output.path) cd $(workspaces.output.path) diff --git a/j7s-os/j7s-os-k8s-deploy.yaml b/j7s-os/j7s-os-k8s-deploy.yaml index 17d8b5a..e5cc623 100644 --- a/j7s-os/j7s-os-k8s-deploy.yaml +++ b/j7s-os/j7s-os-k8s-deploy.yaml @@ -19,6 +19,7 @@ spec: cp -r $(workspaces.ssh-directory.path) ~/.ssh chmod 700 ~/.ssh chmod -R 400 ~/.ssh/* + ssh-keyscan -H -p 2222 git.jpace121.net >> ~/.ssh/known_hosts git config --global user.name tekton git config --global user.email tekton@internal.jpace121.net