V3

.github/workflows/port-pr.yaml

@@ -0,0 +1,101 @@
+name: Port PR
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  port-pr:
+    runs-on: ubuntu-latest
+    if: (startsWith(github.event.comment.body, '/backport') || startsWith(github.event.comment.body, '/forwardport')) && github.event.issue.pull_request
+    steps:
+      - name: Check org membership
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if gh api orgs/${GITHUB_REPOSITORY_OWNER}/members --paginate | jq -e --arg GITHUB_ACTOR "$GITHUB_ACTOR" '.[] | select(.login == $GITHUB_ACTOR)' > /dev/null; then
+              echo "${GITHUB_ACTOR} is a member"
+              echo "is_member=true" >> $GITHUB_ENV
+          else
+              echo "${GITHUB_ACTOR} is not a member" >> $GITHUB_STEP_SUMMARY
+              echo "is_member=false" >> $GITHUB_ENV
+          fi
+      - name: Check milestone
+        if: ${{ env.is_member == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORIGINAL_ISSUE_NUMBER: ${{ github.event.issue.number }}
+          COMMENT_BODY: ${{ github.event.comment.body }}
+        run: |
+          BODY_MILESTONE=$(echo "${COMMENT_BODY}" | awk '{ print $2 }')
+          # Sanitize input
+          MILESTONE=${BODY_MILESTONE//[^a-zA-Z0-9\-\.]/}
+          if gh api repos/${GITHUB_REPOSITORY}/milestones --paginate | jq -e --arg MILESTONE "$MILESTONE" '.[] | select(.title == $MILESTONE)' > /dev/null; then
+              echo "Milestone exists"
+              echo "milestone_exists=true" >> $GITHUB_ENV
+              echo "milestone=${MILESTONE}" >> $GITHUB_ENV
+           else
+              echo "Milestone ${MILESTONE} does not exist" >> $GITHUB_STEP_SUMMARY
+              gh issue comment -R ${GITHUB_REPOSITORY} ${ORIGINAL_ISSUE_NUMBER} --body "Not creating port issue, milestone ${MILESTONE} does not exist or is not an open milestone"
+              echo "milestone_exists=false" >> $GITHUB_ENV
+           fi
+      - name: Get target branch
+        if: ${{ env.is_member == 'true' }} && ${{ env.milestone_exists == 'true' }}
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TYPE=$(echo "${COMMENT_BODY}" | awk '{ print $1 }' | sed -e 's_/__')
+          echo "Type: ${TYPE}" >> $GITHUB_STEP_SUMMARY
+          echo "type=${TYPE}" >> $GITHUB_ENV
+          TARGET_BRANCH=$(echo "${COMMENT_BODY}" | awk '{ print $3 }')
+          echo "Target brach: ${TARGET_BRANCH}" >> $GITHUB_STEP_SUMMARY
+          echo "target_branch=${TARGET_BRANCH}" >> $GITHUB_ENV
+          if gh api repos/${GITHUB_REPOSITORY}/branches --paginate | jq -e --arg TARGET_BRANCH "$TARGET_BRANCH" '.[] | select(.name == $TARGET_BRANCH)' > /dev/null; then
+              echo "target_branch_exists=true" >> $GITHUB_ENV
+          else
+              echo "target_branch_exists=false" >> $GITHUB_ENV
+          fi
+      - name: Checkout
+        if: ${{ env.is_member == 'true' }} && ${{ env.milestone_exists == 'true' }} && ${{ env.target_branch_exists == 'true' }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.target_branch }}
+          fetch-depth: '0'
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Port PR
+        if: ${{ env.is_member == 'true' }} && ${{ env.milestone_exists == 'true' }} && ${{ env.target_branch_exists == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORIGINAL_ISSUE_NUMBER: ${{ github.event.issue.number }}
+          TYPE: ${{ env.type }}
+          TARGET_BRANCH: ${{ env.target_branch }}
+          MILESTONE: ${{ env.milestone }}
+        run: |
+          PATCH_FILE=$(mktemp)
+          gh pr diff $ORIGINAL_ISSUE_NUMBER --patch > $PATCH_FILE
+          BRANCH="gha-portpr-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          echo "branch=${BRANCH}" >> $GITHUB_ENV
+          git config --global user.email "[email protected]"
+          git config --global user.name "Rancher Dashboard Port Bot"
+          git checkout -b $BRANCH
+          git am -3 "$PATCH_FILE" 2> error.log
+          GIT_AM_EXIT_CODE=$?
+
+          if [ "$GIT_AM_EXIT_CODE" -ne 0 ]; then
+            ERROR_MESSAGE=$(cat error.log)
+            FORMATTED_ERROR_MESSAGE=$(printf "\n```\n%s\n```" "$ERROR_MESSAGE")
+            gh issue comment ${ORIGINAL_ISSUE_NUMBER} --body "Not creating port PR, there was an error running git am -3: $FORMATTED_ERROR_MESSAGE"
+          else
+              git push origin $BRANCH
+              ORIGINAL_PR=$(gh pr view ${ORIGINAL_ISSUE_NUMBER} --json title,body,assignee)
+              ORIGINAL_TITLE=$(echo "${ORIGINAL_PR}" | jq -r .title)
+              ORIGINAL_ASSIGNEE=$(echo "${ORIGINAL_PR}" | jq -r '.assignee.login // empty')
+              BODY=$(mktemp)
+              echo -e "This is an automated request to port PR #${ORIGINAL_ISSUE_NUMBER} by @${GITHUB_ACTOR}\n\n" > $BODY
+              echo -e "Original PR body:\n\n" >> $BODY
+              echo "${ORIGINAL_PR}" | jq -r .body >> $BODY
+              NEW_PR=$(gh pr create --title="[${TYPE} ${MILESTONE}] ${ORIGINAL_TITLE}" --body-file="${BODY}" --head "${BRANCH}" --base "${TARGET_BRANCH}" --milestone "${MILESTONE}" --assignee "${ORIGINAL_ASSIGNEE}")
+              echo "Port PR created: ${NEW_PR}" >> $GITHUB_STEP_SUMMARY
+          fi

cypress/e2e/po/components/checkbox-input.po.ts

@@ -48,6 +48,10 @@ export default class CheckboxInputPo extends ComponentPo {
     return this.input().find('span.checkbox-custom').should('not.have.attr', 'aria-checked', 'true');
   }
 
+  getCheckboxLabel(): Cypress.Chainable {
+    return this.input().find('.checkbox-label').invoke('text');
+  }
+
   isDisabled(): Cypress.Chainable {
     return this.input().then((el) => {
       expect(el).attr('class').to.include('disabled');

cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create.po.ts

@@ -31,6 +31,14 @@ export default class ClusterManagerCreatePagePo extends ClusterManagerCreateImpo
     return new ToggleSwitchPo('.toggle-container', this.self());
   }
 
+  rkeToggleExistance(assertion: string) {
+    this.self().find('.toggle-container').should(assertion);
+  }
+
+  gridElementExistance(groupIndex = 0, itemIndex = 0, assertion: string) {
+    this.self().find(`[data-testid="cluster-manager-create-grid-${ groupIndex }-${ itemIndex }"]`).should(assertion);
+  }
+
   selectKubeProvider(index: number) {
     return this.resourceDetail().cruResource().selectSubType(0, index).click();
   }

cypress/e2e/po/pages/preferences.po.ts

@@ -77,6 +77,10 @@ export default class PreferencesPagePo extends PagePo {
     return new CheckboxInputPo('[data-testid="prefs__hideDescriptions"]');
   }
 
+  verifyHideDescriptionsCheckboxLabel() {
+    return this.hideDescriptionsCheckbox().getCheckboxLabel().should('equal', 'Hide Type Description banners above resource lists ');
+  }
+
   landingPageRadioBtn(): RadioGroupInputPo {
     return new RadioGroupInputPo('[data-testid="prefs__landingPagePreference"]');
   }

cypress/e2e/po/side-bars/product-side-nav.po.ts

@@ -42,4 +42,11 @@ export default class ProductNavPo extends ComponentPo {
     return this.self().should('exist').find('.child.nav-type a .label').contains(label)
       .click({ force: true });
   }
+
+  /**
+   * Check existance of menu group by label
+   */
+  navToSideMenuGroupByLabelExistance(label: string, assertion: string): Cypress.Chainable {
+    return this.self().should('exist').contains('.accordion.has-children', label).should(assertion);
+  }
 }

cypress/e2e/tests/pages/manager/cloud-credentials.spec.ts

@@ -8,6 +8,9 @@ describe('Cloud Credentials', { testIsolation: 'off', tags: ['@manager', '@jenki
 
   before(() => {
     cy.login();
+  });
+
+  beforeEach(() => {
     cy.createE2EResourceName('cloudCredential').as('cloudCredentialName');
   });
 

cypress/e2e/tests/pages/manager/cluster-manager.spec.ts

@@ -21,6 +21,7 @@ import { snapshot } from '@/cypress/e2e/blueprints/manager/cluster-snapshots';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 import { nodeDriveResponse } from '@/cypress/e2e/tests/pages/manager/mock-responses';
 import LabeledSelectPo from '@/cypress/e2e/po/components/labeled-select.po';
+import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 
 // At some point these will come from somewhere central, then we can make tools to remove resources from this or all runs
 const runTimestamp = +new Date();
@@ -43,6 +44,43 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     cy.login();
   });
 
+  // testing https://github.com/rancher/dashboard/issues/9823
+  it('Toggling the user preference "rke1-ui" to false should not display RKE toggle on cluster creation screen and hide RKE1 resources from nav', () => {
+    cy.intercept('GET', 'v1/management.cattle.io.features?*', {
+      type:         'collection',
+      resourceType: 'management.cattle.io.feature',
+      data:         [
+        {
+          id:     'rke1-ui',
+          type:   'management.cattle.io.feature',
+          kind:   'Feature',
+          spec:   { value: false },
+          status: {
+            default:     true,
+            description: 'Disable RKE1 provisioning',
+            dynamic:     false,
+            lockedValue: false
+          }
+        }
+      ]
+    }).as('featuresGet');
+
+    const clusterCreate = new ClusterManagerCreatePagePo();
+
+    clusterCreate.goTo();
+    clusterCreate.waitForPage();
+
+    // seems like the waitForPage does await for full DOM render, so let's wait for a simple assertion
+    // like "gridElementExists" to make sure we aren't creating a fake assertion with the toggle
+    clusterCreate.gridElementExistance(0, 0, 'exist');
+    clusterCreate.rkeToggleExistance('not.exist');
+
+    const sideNav = new ProductNavPo();
+
+    // check that the nav group isn't visible anymore
+    sideNav.navToSideMenuGroupByLabelExistance('RKE1 Configuration', 'not.exist');
+  });
+
   describe('All providers', () => {
     providersList.forEach((prov) => {
       prov.conditions.forEach((condition) => {
@@ -91,6 +129,15 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
         clusterList.createCluster();
 
         createRKE2ClusterPage.waitForPage();
+
+        // Test for https://github.com/rancher/dashboard/issues/9823 (default is feature flag 'rke1-ui' = true)
+        createRKE2ClusterPage.rkeToggleExistance('exist');
+
+        const sideNav = new ProductNavPo();
+
+        sideNav.navToSideMenuGroupByLabelExistance('RKE1 Configuration', 'exist');
+        // EO test for https://github.com/rancher/dashboard/issues/9823
+
         createRKE2ClusterPage.rkeToggle().set('RKE2/K3s');
 
         createRKE2ClusterPage.selectCustom(0);
@@ -165,13 +212,15 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
 
       it('can download KubeConfig', () => {
         clusterList.goTo();
+        cy.intercept('POST', '/v3/clusters/**').as('generateKubeconfig');
         clusterList.list().actionMenu(rke2CustomName).getMenuItem('Download KubeConfig').click();
+        cy.wait('@generateKubeconfig').its('response.statusCode').should('eq', 200);
 
         const downloadedFilename = path.join(downloadsFolder, `${ rke2CustomName }.yaml`);
 
         cy.readFile(downloadedFilename).then((buffer) => {
           // This will throw an exception which will fail the test if not valid yaml
-          const obj = jsyaml.load(buffer);
+          const obj: any = jsyaml.load(buffer);
 
           // Basic checks on the downloaded YAML
           expect(obj.clusters.length).to.equal(1);
@@ -392,7 +441,7 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
         editImportedClusterPage.waitForPage('mode=edit');
       });
 
-      it('can delete cluster by bulk actions', { viewportHeight: 1000, viewportWidth: 660 }, () => {
+      it('can delete cluster by bulk actions', () => {
         clusterList.goTo();
         clusterList.sortableTable().rowElementWithName(importGenericName).should('exist', { timeout: 15000 });
         clusterList.sortableTable().rowSelectCtlWithName(importGenericName).set();
@@ -445,7 +494,7 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     clusterList.list().resourceTable().sortableTable().rowElementWithName('local')
       .click();
     clusterList.list().openBulkActionDropdown();
-    clusterList.list().bulkActionButton('Download YAML').click();
+    clusterList.list().bulkActionButton('Download YAML').click({ force: true });
     const downloadedFilename = path.join(downloadsFolder, `local.yaml`);
 
     cy.readFile(downloadedFilename).then((buffer) => {
@@ -465,8 +514,9 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     ClusterManagerListPagePo.navTo();
     clusterList.list().resourceTable().sortableTable().rowElementWithName('local')
       .click();
-    clusterList.list().openBulkActionDropdown();
-    clusterList.list().bulkActionButton('Download KubeConfig').click();
+    cy.intercept('POST', '/v3/clusters/local?action=generateKubeconfig').as('generateKubeConfig');
+    clusterList.list().downloadKubeConfig().click({ force: true });
+    cy.wait('@generateKubeConfig').its('response.statusCode').should('eq', 200);
     const downloadedFilename = path.join(downloadsFolder, 'local.yaml');
 
     cy.readFile(downloadedFilename).then((buffer) => {

cypress/e2e/tests/pages/manager/cluster-provisioning-amazon-ec2-rke2.spec.ts

@@ -14,6 +14,24 @@ describe('Provision Node driver RKE2 cluster', { testIsolation: 'off', tags: ['@
   before(() => {
     cy.login();
     HomePagePo.goTo();
+
+    // clean up cloud credentials
+    cy.getRancherResource('v3', 'cloudcredentials', null, null).then((resp: Cypress.Response<any>) => {
+      const body = resp.body;
+
+      if (body.pagination['total'] > 0) {
+        for (const i in body.data) {
+          const id = body.data[i]['id'];
+
+          cy.deleteRancherResource('v3', 'cloudcredentials', id);
+        }
+      } else {
+        cy.log('There are no existing cloud credentials to delete');
+      }
+    });
+  });
+
+  beforeEach(() => {
     cy.createE2EResourceName('rke2ec2cluster').as('rke2Ec2ClusterName');
     cy.createE2EResourceName('ec2cloudcredential').as('ec2CloudCredentialName');
   });
@@ -36,7 +54,9 @@ describe('Provision Node driver RKE2 cluster', { testIsolation: 'off', tags: ['@
     cloudCredForm.accessKey().set(Cypress.env('awsAccessKey'));
     cloudCredForm.secretKey().set(Cypress.env('awsSecretKey'), true);
     cloudCredForm.defaultRegion().toggle();
-    cloudCredForm.defaultRegion().clickOptionWithLabel('us-west-2');
+    cloudCredForm.defaultRegion().clickOptionWithLabel('us-west-1');
+
+    cy.intercept('GET', '/v1/management.cattle.io.users?exclude=metadata.managedFields').as('pageLoad');
     cloudCredForm.saveCreateForm().cruResource().saveAndWaitForRequests('POST', '/v3/cloudcredentials').then((req) => {
       expect(req.response?.statusCode).to.equal(201);
       cloudcredentialId = req.response?.body.id;
@@ -45,6 +65,7 @@ describe('Provision Node driver RKE2 cluster', { testIsolation: 'off', tags: ['@
 
     const loadingPo = new LoadingPo('.loading-indicator');
 
+    cy.wait('@pageLoad').its('response.statusCode').should('eq', 200);
     loadingPo.checkNotExists();
     createRKE2ClusterPage.nameNsDescription().name().set(this.rke2Ec2ClusterName);
     createRKE2ClusterPage.nameNsDescription().description().set(`${ this.rke2Ec2ClusterName }-description`);
@@ -57,7 +78,7 @@ describe('Provision Node driver RKE2 cluster', { testIsolation: 'off', tags: ['@
     createRKE2ClusterPage.basicsTab().kubernetesVersions().clickOption(1);
 
     createRKE2ClusterPage.machinePoolTab().networks().toggle();
-    createRKE2ClusterPage.machinePoolTab().networks().clickOption(3);
+    createRKE2ClusterPage.machinePoolTab().networks().clickOptionWithLabel('maxdualstack-vpc');
 
     cy.intercept('POST', 'v1/provisioning.cattle.io.clusters').as('createRke2Cluster');
     createRKE2ClusterPage.create();

cypress/e2e/tests/pages/manager/drivers.spec.ts

@@ -27,6 +27,7 @@ describe('Drivers', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
       const downloadUrl = 'https://github.com/rancher-plugins/kontainer-engine-driver-example/releases/download/v0.2.3/kontainer-engine-driver-example-copy1-linux-amd64';
 
       RkeDriversPagePo.navTo();
+      driversPage.waitForPage();
       driversPage.addClusterDriver().click();
       driversPage.createEditClusterDriver().formInput(2).set(downloadUrl);
       cy.intercept('POST', '/v3/kontainerdriver').as('createDriver');
@@ -40,6 +41,7 @@ describe('Drivers', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
       const downloadUrl = 'https://github.com/rancher-plugins/kontainer-engine-driver-example/releases/download/v0.2.3/kontainer-engine-driver-example-copy2-linux-amd64';
 
       RkeDriversPagePo.navTo();
+      driversPage.waitForPage();
       driversPage.list().rowActionMenuOpen(`Example`);
       driversPage.actionMenu().selectMenuItemByLabel(`Edit`);
       driversPage.createEditClusterDriver().formInput(2).set(downloadUrl);
@@ -51,6 +53,7 @@ describe('Drivers', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
 
     it('can deactivate a cluster driver', () => {
       RkeDriversPagePo.navTo();
+      driversPage.waitForPage();
       driversPage.list().rowActionMenuOpen(`Example`);
       driversPage.actionMenu().selectMenuItemByLabel(`Deactivate`);
       cy.intercept('POST', '/v3/kontainerDrivers/*').as('deactivateDriver');
@@ -61,6 +64,7 @@ describe('Drivers', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
 
     it('can activate a cluster driver', () => {
       RkeDriversPagePo.navTo();
+      driversPage.waitForPage();
       driversPage.list().rowActionMenuOpen(`Example`);
       cy.intercept('POST', '/v3/kontainerDrivers/*').as('activateDriver');
       driversPage.actionMenu().selectMenuItemByLabel(`Activate`);
@@ -70,6 +74,7 @@ describe('Drivers', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
 
     it('can delete a cluster driver', () => {
       RkeDriversPagePo.navTo();
+      driversPage.waitForPage();
       driversPage.list().rowActionMenuOpen(`Example`);
       driversPage.actionMenu().selectMenuItemByLabel(`Delete`);
       cy.intercept('DELETE', '/v3/kontainerDrivers/*').as('deleteDriver');

cypress/e2e/tests/pages/manager/machine-deployments.spec.ts

@@ -15,6 +15,9 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
 
   before(() => {
     cy.login();
+  });
+
+  beforeEach(() => {
     cy.createE2EResourceName('machinedeployments').as('machineDeploymentsName');
   });
 
@@ -103,7 +106,7 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
 
   it('can download YAML', function() {
     MachineDeploymentsPagePo.navTo();
-    machineDeploymentsPage.list().actionMenu(this.machineDeploymentsName).getMenuItem('Download YAML').click();
+    machineDeploymentsPage.list().actionMenu(this.machineDeploymentsName).getMenuItem('Download YAML').click({ force: true });
 
     const downloadedFilename = path.join(downloadsFolder, `${ this.machineDeploymentsName }.yaml`);