chore(ci): use new replicated vm create --ssh-public-key flag (#2141)

Author: emosbaugh

.github/actions/e2e-cmx-setup/action.yml

@@ -4,9 +4,6 @@ inputs:
   github-token:
     description: 'the ci github token used to install the replicated cli'
     required: true
-  cmx-ssh-private-key:
-    description: 'the private key used to access the cmx nodes'
-    required: true
 
 runs:
   using: composite
@@ -23,5 +20,5 @@ runs:
     shell: bash
     run: |
       mkdir -p ~/.ssh
-      echo "${{ inputs.cmx-ssh-private-key }}" > ~/.ssh/id_ed25519
-      chmod 600 ~/.ssh/id_ed25519 
+      ssh-keygen -t rsa -b 4096 -C "[email protected]" -f ~/.ssh/id_rsa -N ""
+      chmod 600 ~/.ssh/id_rsa

.github/actions/e2e/action.yml

@@ -32,9 +32,6 @@ inputs:
   cmx-api-token:
     description: 'the token used to access the replicated api for cmx'
     required: false # this is only needed for cmx-based tests
-  cmx-ssh-private-key:
-    description: 'the private key used to access the cmx nodes'
-    required: false # this is only needed for cmx-based tests
   upgrade-target-ec-version:
     description: 'the embedded cluster version to expect after upgrades complete'
     required: false # this is only set by post-release testing
@@ -51,7 +48,6 @@ runs:
     uses: ./.github/actions/e2e-cmx-setup
     with:
       github-token: ${{ inputs.github-token }}
-      cmx-ssh-private-key: ${{ inputs.cmx-ssh-private-key }}
 
   - name: Setup Go
     uses: actions/setup-go@v5
@@ -76,6 +72,7 @@ runs:
       export EXPECT_K0S_VERSION_PREVIOUS=${{ inputs.k0s-version-previous }}
       export EXPECT_K0S_VERSION_PREVIOUS_STABLE=${{ inputs.k0s-version-previous-stable }}
       export EXPECT_EMBEDDED_CLUSTER_UPGRADE_TARGET_VERSION=${{ inputs.upgrade-target-ec-version }}
+      export CMX_SSH_PUBLIC_KEY="$HOME/.ssh/id_rsa.pub"
       export SKIP_LXD_CLEANUP=true
       make e2e-test TEST_NAME=${{ inputs.test-name }}
 

.github/workflows/ci.yaml

@@ -778,7 +778,6 @@ jobs:
           version-specifier: ${{ needs.export-version-specifier.outputs.version_specifier }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cmx-api-token: ${{ secrets.CMX_REPLICATED_API_TOKEN }}
-          cmx-ssh-private-key: ${{ secrets.CMX_SSH_PRIVATE_KEY }}
 
   e2e-main:
     name: E2E (on merge)
@@ -816,7 +815,6 @@ jobs:
           version-specifier: ${{ needs.export-version-specifier.outputs.version_specifier }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cmx-api-token: ${{ secrets.CMX_REPLICATED_API_TOKEN }}
-          cmx-ssh-private-key: ${{ secrets.CMX_SSH_PRIVATE_KEY }}
 
   # this job will validate that all the tests passed
   # it is used for the github branch protection rule

.github/workflows/release-prod.yaml

@@ -601,7 +601,6 @@ jobs:
           version-specifier: ${{ github.ref_name }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cmx-api-token: ${{ secrets.CMX_REPLICATED_API_TOKEN }}
-          cmx-ssh-private-key: ${{ secrets.CMX_SSH_PRIVATE_KEY }}
           upgrade-target-ec-version: ${{ github.ref_name }}
 
   # this job will validate that all the tests passed

e2e/cluster/cmx/cluster.go

@@ -129,6 +129,9 @@ func NewNode(in *ClusterInput, index int, networkID string) (*Node, error) {
 	if in.DiskSize != 0 {
 		args = append(args, "--disk", strconv.Itoa(in.DiskSize))
 	}
+	if key := os.Getenv("CMX_SSH_PUBLIC_KEY"); key != "" {
+		args = append(args, "--ssh-public-key", key)
+	}
 
 	output, err := exec.Command("replicated", args...).Output() // stderr can break json parsing
 	if err != nil {