@rancher/shell 1.2.2 → 1.2.5-rc.1

package/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster.ts

@@ -0,0 +1,386 @@
+export const PROV_CLUSTER = {
+  id:         'fleet-default/test-args',
+  type:       'provisioning.cattle.io.cluster',
+  apiVersion: 'provisioning.cattle.io/v1',
+  kind:       'Cluster',
+  metadata:   {
+    annotations:       { 'field.cattle.io/creatorId': 'user' },
+    creationTimestamp: '2024-01-14T10:03:39Z',
+    generation:        3,
+    name:              'test-args',
+    namespace:         'fleet-default',
+    state:             {
+      error:         false,
+      message:       'Resource is Ready',
+      name:          'active',
+      transitioning: false
+    },
+    uid:    'eab4ed52-c339-4d61-8dc2-804d09f36425',
+    labels: {}
+  },
+  spec: {
+    kubernetesVersion:        'v1.27.8+rke2r1',
+    localClusterAuthEndpoint: {
+      enabled: false,
+      caCerts: '',
+      fqdn:    ''
+    },
+    rkeConfig: {
+      chartValues: { 'rke2-calico': {} },
+      etcd:        {
+        snapshotRetention:    5,
+        snapshotScheduleCron: '0 */5 * * *',
+        disableSnapshots:     false
+      },
+      machineGlobalConfig: {
+        cni:                   'calico',
+        'disable-kube-proxy':  false,
+        'etcd-expose-metrics': false
+      },
+      machinePoolDefaults: {},
+      machinePools:        [
+        {
+          controlPlaneRole:  true,
+          drainBeforeDelete: true,
+          etcdRole:          true,
+          machineConfigRef:  {
+            kind: 'DigitaloceanConfig',
+            name: 'nc-test-args-pool1-dfvbh'
+          },
+          name:                 'pool1',
+          quantity:             1,
+          unhealthyNodeTimeout: '0s',
+          workerRole:           true
+        }
+      ],
+      machineSelectorConfig: [
+        { config: { 'protect-kernel-defaults': false } }
+      ],
+      registries: {
+        configs: {},
+        mirrors: {}
+      },
+    },
+    defaultPodSecurityAdmissionConfigurationTemplateName: '',
+  },
+  status: {
+    agentDeployed:      true,
+    clientSecretName:   'test-args-kubeconfig',
+    clusterName:        'c-m-qk7hvstl',
+    fleetWorkspaceName: 'fleet-default',
+    observedGeneration: 3,
+    ready:              true
+  }
+};
+
+export const VERSION_CLUSTER = {
+  label:      'v1.27.8+rke2r1',
+  value:      'v1.27.8+rke2r1',
+  sort:       '0000000001.0000000027.0000000008.rke0000000002r0000000001',
+  serverArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-dns': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cluster-domain': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    cni: {
+      type:    'array',
+      default: 'calico',
+      create:  false,
+      update:  false,
+      options: [
+        'canal',
+        'cilium',
+        'calico',
+        'multus,canal',
+        'multus,cilium',
+        'multus,calico'
+      ]
+    },
+    'container-runtime-endpoint': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    disable: {
+      type:    'array',
+      create:  false,
+      update:  false,
+      options: [
+        'rke2-coredns',
+        'rke2-ingress-nginx',
+        'rke2-metrics-server'
+      ]
+    },
+    'disable-cloud-controller': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'disable-kube-proxy': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'disable-scheduler': {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'egress-selector-mode': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-expose-metrics': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'etcd-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-cloud-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'kubelet-path': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'pause-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'runtime-image': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-cidr': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'service-node-port-range': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    snapshotter: {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'tls-san': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'tls-san-security': {
+      type:   'boolean',
+      create: false,
+      update: false
+    }
+  },
+  agentArgs: {
+    'audit-policy-file': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'cloud-provider-config': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'cloud-provider-name': {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'aws',
+        'azure',
+        'gcp',
+        'rancher-vsphere',
+        'harvester',
+        'external'
+      ]
+    },
+    'control-plane-resource-limits': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'control-plane-resource-requests': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    'etcd-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'etcd-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-apiserver-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-controller-manager-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-proxy-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-env': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kube-scheduler-extra-mount': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    'kubelet-arg': {
+      type:   'array',
+      create: false,
+      update: false
+    },
+    profile: {
+      type:     'enum',
+      nullable: true,
+      create:   false,
+      update:   false,
+      options:  [
+        'cis',
+        'cis-1.23'
+      ]
+    },
+    'protect-kernel-defaults': {
+      type:    'boolean',
+      default: false,
+      create:  false,
+      update:  false
+    },
+    'resolv-conf': {
+      type:   'string',
+      create: false,
+      update: false
+    },
+    selinux: {
+      type:   'bool',
+      create: false,
+      update: false
+    },
+    'system-default-registry': {
+      type:   'string',
+      create: false,
+      update: false
+    }
+  },
+  disabled: false
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "1.2.2",
+  "version": "1.2.5-rc.1",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/plugins/dashboard-store/actions.js

@@ -8,6 +8,7 @@ import { normalizeType } from './normalize';
 import garbageCollect from '@shell/utils/gc/gc';
 import { addSchemaIndexFields } from '@shell/plugins/steve/schema.utils';
 import { addParam } from '@shell/utils/url';
+import { conditionalDepaginate } from '@shell/store/type-map.utils';
 
 export const _ALL = 'all';
 export const _MERGE = 'merge';
@@ -188,7 +189,7 @@ export default {
     opt = opt || {};
     opt.url = getters.urlFor(type, null, opt);
     opt.stream = opt.stream !== false && load !== _NONE;
-    opt.depaginate = typeOptions?.depaginate;
+    opt.depaginate = conditionalDepaginate(typeOptions?.depaginate, { ctx, args: { type, opt } });
 
     let skipHaveAll = false;
 
@@ -367,7 +368,7 @@ export default {
     opt = opt || {};
     opt.labelSelector = selector;
     opt.url = getters.urlFor(type, null, opt);
-    opt.depaginate = typeOptions?.depaginate;
+    opt.depaginate = conditionalDepaginate(typeOptions?.depaginate, { ctx, args: { type, opt } });
 
     const res = await dispatch('request', { opt, type });
 

package/scripts/publish-shell.sh

@@ -6,8 +6,15 @@ BASE_DIR="$(
   pwd
 )"
 SHELL_DIR=$BASE_DIR/shell/
-TMP_DIR=$BASE_DIR/tmp
-PUBLISH_ARGS="--no-git-tag-version --access public $PUBLISH_ARGS"
+CREATORS_DIR=$BASE_DIR/creators/extension
+FORCE_PUBLISH_TO_NPM="false"
+DEFAULT_NPM_REGISTRY="https://registry.npmjs.org"
+
+# if TAG doesn't exist, we can exit as it's needed for any type of publish.
+if [ -z "$TAG" ]; then
+  echo "You need to set the TAG variable first!"
+  exit 1
+fi
 
 if [ ! -d "${BASE_DIR}/node_modules" ]; then
   echo "You need to run 'yarn install' first"
@@ -16,41 +23,30 @@ fi
 
 echo "Publishing Shell Packages"
 
-# We use the version from the shell package for the creator packages
-# Need to copy them to a temporary location, so we can patch the version number
-# before publishing
+if [ "$1" == "--npm" ]; then
+  FORCE_PUBLISH_TO_NPM="true"
+fi
 
-# To set a token for NPM registry auth: `npm config set //registry.npmjs.org/:_authToken <TOKEN>``
+if [ "$FORCE_PUBLISH_TO_NPM" == "true" ]; then
+  export NPM_REGISTRY=$DEFAULT_NPM_REGISTRY
+fi
 
-PKG_DIST=$BASE_DIR/dist-pkg/creators
-mkdir -p ${PKG_DIST}
-rm -rf ${PKG_DIST}/app
-rm -rf ${PKG_DIST}/pkg
-rm -rf ${PKG_DIST}/update
+PUBLISH_ARGS="--no-git-tag-version --access public --registry $NPM_REGISTRY"
 
 pushd ${SHELL_DIR} >/dev/null
 
-PKG_VERSION=$(node -p "require('./package.json').version")
-popd >/dev/null
-
-echo "Publishing version: $PKG_VERSION"
-
-cp -R ${SHELL_DIR}/creators/app ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/pkg ${PKG_DIST}
-cp -R ${SHELL_DIR}/creators/update ${PKG_DIST}
-
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/app/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/pkg/package.json
-sed -i.bak -e "s/\"0.0.0/"\"$PKG_VERSION"/g" ${PKG_DIST}/update/package.json
-
-rm ${PKG_DIST}/app/package.json.bak
-rm ${PKG_DIST}/pkg/package.json.bak
-rm ${PKG_DIST}/update/package.json.bak
-
 function publish() {
   NAME=$1
   FOLDER=$2
 
+  # if we pass a third arg, that is the version number
+  # that we want to actually publish on NPM
+  # they should match with the package.json version stated 
+  # because of the check in the "Check Tags Version Matching" step in the workflow
+  if [ -n "$3" ]; then
+    PKG_VERSION=$3
+  fi
+
   echo "Publishing ${NAME} from ${FOLDER}"
   pushd ${FOLDER} >/dev/null
 
@@ -61,25 +57,20 @@ function publish() {
     cp -R ${BASE_DIR}/pkg/rancher-components/src/components ./rancher-components/
   fi
 
-  if [ "$NAME" == "Update" ]; then
-    # Add files from the app and pkg creators to the update package
-    mkdir -p ./app
-    mkdir -p ./pkg
-    cp -R ${BASE_DIR}/shell/creators/app/* ./app
-    cp -R ${BASE_DIR}/shell/creators/pkg/* ./pkg
-    # Remove index.ts from pkg files, as we don't want to replace that
-    rm -f ./pkg/files/index.ts
-
-    # Update the package.json for the app
-    cd app
-    node ${SCRIPT_DIR}/record-deps.js
-    cd ..
+  # if the PKG_VERSION has a - it means it will be a pre-release of legacy-v1
+  if [[ $PKG_VERSION == *"-"* ]]; then
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v1-pre-release"
+  else
+    # If we need to release shell, we tag it as legacy-v1
+    PUBLISH_ARGS="$PUBLISH_ARGS --tag legacy-v1"
   fi
 
   # Make a note of dependency versions, if required
   node ${SCRIPT_DIR}/record-deps.js
 
-  yarn publish . --new-version ${PKG_VERSION} ${PUBLISH_ARGS} --tag v1.2
+  echo "Publishing to registry: $NPM_REGISTRY with args: $PUBLISH_ARGS"
+
+  npm publish ${PUBLISH_ARGS}
   RET=$?
 
   popd >/dev/null
@@ -90,15 +81,32 @@ function publish() {
   fi
 }
 
-# Generate the type definitions for the shell
-${SCRIPT_DIR}/typegen.sh
-
-# Publish the packages - don't tag the git repo and don't auto-increment the version number
-publish "Shell" ${SHELL_DIR}
-publish "Application creator" ${PKG_DIST}/app/
-publish "Package creator" ${PKG_DIST}/pkg/
-publish "Update" ${PKG_DIST}/update/
+echo "TAG ${TAG}"
+  
+  # let's get the package name and version from the tag
+PKG_NAME=$(sed 's/-pkg-v.*//' <<< "$TAG")
+PKG_V=$(sed 's/.*-pkg-v//'<<< "$TAG")
 
-echo "Done"
+echo "PKG_NAME ${PKG_NAME}"
+echo "PKG_V ${PKG_V}"
 
+# Generate the type definitions for the shell
+if [ ${PKG_NAME} == "shell" ]; then
+  ${SCRIPT_DIR}/typegen.sh
+fi
 
+# version comparison checks
+case $PKG_NAME in
+  "shell")
+    echo "Publishing only Shell pkg via tagged release"
+    publish "Shell" ${SHELL_DIR} ${PKG_V}
+    ;;
+  "creators")
+    echo "Publishing only Creators pkg via tagged release"
+    publish "Extension creator" ${CREATORS_DIR} ${PKG_V}
+    ;;
+  *)
+    echo "something went wrong with the tagging name => TAG: ${TAG} , PKG_NAME: ${PKG_NAME}. Admissable names are 'shell' and 'creator'"
+    exit 1
+    ;;
+esac