Add node modules and compiled JavaScript from main

Merge branch 'releases/v4' into tmp
v4 new release (#274 )
2026-06-21 18:59:27 +08:00 · 2023-05-17 14:49:42 +00:00 · 2023-05-17 14:49:26 +00:00 · 2022-12-20 12:20:06 -05:00 · 2022-12-06 16:47:10 -05:00 · 2022-11-23 16:30:26 -05:00
17 changed files with 840 additions and 1341 deletions
@@ -1,15 +1,14 @@
-name: release Project
+name: Create release PR

 on:
-   push:
-      branches:
-         - main
-      paths:
-         - CHANGELOG.md
   workflow_dispatch:
+      inputs:
+         release:
+            description: 'Define release version (ex: v1, v2, v3)'
+            required: true

 jobs:
-   release:
-      uses: Azure/action-release-workflows/.github/workflows/release_js_project.yaml@81e6a8ed41ced9d131dea884ecae7b8c6dc4f799
+   release-pr:
+      uses: OliverMKing/javascript-release-workflow/.github/workflows/release-pr.yml@main
      with:
-         changelogPath: ./CHANGELOG.md
+         release: ${{ github.event.inputs.release }}
@@ -38,7 +38,7 @@ jobs:
           name: Setup Minikube
           uses: medyagh/setup-minikube@latest
           with:
-              minikube-version: 1.31.2
+              minikube-version: 1.24.0
              kubernetes-version: 1.22.3
              driver: 'none'
           timeout-minutes: 3
@@ -38,7 +38,7 @@ jobs:
           name: Setup Minikube
           uses: medyagh/setup-minikube@latest
           with:
-              minikube-version: 1.31.2
+              minikube-version: 1.24.0
              kubernetes-version: 1.22.3
              driver: 'none'
           timeout-minutes: 3
@@ -13,7 +13,7 @@ on:
 jobs:
   run-integration-test:
      name: Run Minikube Integration Tests
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-20.04
      env:
         KUBECONFIG: /home/runner/.kube/config
         NAMESPACE: test-${{ github.run_id }}
@@ -1,89 +0,0 @@
-name: Minikube Integration Tests - resource annotation
-on:
-   pull_request:
-      branches:
-         - main
-         - 'releases/*'
-   push:
-      branches:
-         - main
-         - 'releases/*'
-   workflow_dispatch:
-
-jobs:
-   run-integration-test:
-      name: Run Minikube Integration Tests
-      runs-on: ubuntu-latest
-      env:
-         KUBECONFIG: /home/runner/.kube/config
-         NAMESPACE: test-${{ github.run_id }}
-      steps:
-         - uses: actions/checkout@v3
-
-         - name: Install dependencies
-           run: |
-              rm -rf node_modules/
-              npm install
-         - name: Install ncc
-           run: npm i -g @vercel/ncc
-         - name: Install conntrack
-           run: sudo apt-get install -y conntrack
-         - name: Build
-           run: ncc build src/run.ts -o lib
-
-         - uses: Azure/setup-kubectl@v3
-           name: Install Kubectl
-
-         - id: setup-minikube
-           name: Setup Minikube
-           uses: medyagh/setup-minikube@latest
-           with:
-              minikube-version: 1.24.0
-              kubernetes-version: 1.22.3
-              driver: 'none'
-           timeout-minutes: 3
-
-         - name: Create namespace to run tests
-           run: kubectl create ns ${{ env.NAMESPACE }}
-
-         - uses: actions/setup-python@v2
-           name: Install Python
-           with:
-              python-version: '3.x'
-
-         - name: Cleaning any previously created items
-           run: |
-              python test/integration/k8s-deploy-delete.py 'Service' 'all' ${{ env.NAMESPACE }}
-              python test/integration/k8s-deploy-delete.py 'Deployment' 'all' ${{ env.NAMESPACE }}
-              python test/integration/k8s-deploy-delete.py 'Ingress' 'all' ${{ env.NAMESPACE }}
-
-         - name: Executing deploy action for pod with resource annotation enabled by default
-           uses: ./
-           with:
-              namespace: ${{ env.NAMESPACE }}
-              images: nginx:1.14.2
-              manifests: |
-                 test/integration/manifests/test.yml
-              action: deploy
-
-         - name: Checking if deployments is created with additional resource annotation
-           run: |
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 labels=app:nginx,workflow:actions.github.com-k8s-deploy,workflowFriendlyName:Minikube_Integration_Tests_-_resource_annotation selectorLabels=app:nginx annotations=actions.github.com/k8s-deploy,deployment.kubernetes.io/revision,kubectl.kubernetes.io/last-applied-configuration
-
-         - name: Cleaning previously created deployment
-           run: |
-              python test/integration/k8s-deploy-delete.py 'Deployment' 'all' ${{ env.NAMESPACE }}
-
-         - name: Executing deploy action for pod with resource annotation disabled
-           uses: ./
-           with:
-              namespace: ${{ env.NAMESPACE }}
-              images: nginx:1.14.2
-              manifests: |
-                 test/integration/manifests/test.yml
-              action: deploy
-              annotate-resources: false
-
-         - name: Checking if deployment is created without additional resource annotation
-           run: |
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE }} kind=Deployment name=nginx-deployment containerName=nginx:1.14.2 selectorLabels=app:nginx annotations=deployment.kubernetes.io/revision,kubectl.kubernetes.io/last-applied-configuration
@@ -1,11 +0,0 @@
-# Changelog
-
-## [4.10.0] - 2023-10-30
-
-### Added
-
-  #287 Make annotating resources optional
-  #283 Fix “Service” route-method of the Blue-Green strategy with some manifest files
-  #281 bump codeql to node 16
-  #279 upgrade codeql
-  #276 Fixes multiple namespaces bug
@@ -113,13 +113,9 @@ Following are the key capabilities of this action:
    <td>force </br></br>(Optional)</td>
    <td>Deploy when a previous deployment already exists. If true then '--force' argument is added to the apply command. Using '--force' argument is not recommended in production.</td>
  </tr>
-  <tr>
-    <td>annotate-resources</br></br>(Optional)</td>
-    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the resources or not. If set to false all annotations are skipped completely.</td>
-  </tr>
  <tr>
    <td>annotate-namespace</br></br>(Optional)</td>
-    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the namespace resources object or not. Ignored when annotate-resources is set to false.</td>
+    <td>Acceptable values: true/false</br>Default value: true</br>Switch whether to annotate the namespace resources object or not</td>
  </tr>
  <tr>
    <td>skip-tls-verify</br></br>(Optional)</td>
@@ -59,12 +59,8 @@ inputs:
      description: 'Github token'
      default: ${{ github.token }}
      required: true
-   annotate-resources:
-      description: 'Annotate the resources. If set to false all annotations are skipped completely.'
-      required: false
-      default: true
   annotate-namespace:
-      description: 'Annotate the target namespace. Ignored when annotate-resources is set to false.'
+      description: 'Annotate the target namespace'
      required: false
      default: true
   private-cluster:
@@ -4,7 +4,7 @@
   "author": "Deepak Sattiraju",
   "license": "MIT",
   "scripts": {
-      "build": "npm i ncc && npx ncc build src/run.ts -o lib",
+      "build": "npx ncc build src/run.ts -o lib",
      "test": "jest",
      "coverage": "jest --coverage=true",
      "format": "prettier --write .",
@@ -18,8 +18,7 @@
      "@octokit/core": "^3.5.1",
      "@octokit/plugin-retry": "^3.0.9",
      "@types/minipass": "^3.1.2",
-      "js-yaml": "3.13.1",
-      "ncc": "^0.3.6"
+      "js-yaml": "3.13.1"
   },
   "devDependencies": {
      "@types/jest": "^26.0.0",
@@ -65,10 +65,17 @@ export async function deploy(

   // annotate resources
   core.startGroup('Annotating resources')
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
   await annotateAndLabelResources(
      deployedManifestFiles,
      kubectl,
-      resourceTypes
+      resourceTypes,
+      allPods
   )
   core.endGroup()
 }
@@ -129,13 +129,19 @@ async function promoteCanary(kubectl: Kubectl, manifests: string[]) {

   // annotate resources
   core.startGroup('Annotating resources')
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
   const resources: Resource[] = getResources(
      filesToAnnotate,
      models.DEPLOYMENT_TYPES.concat([
         models.DiscoveryAndLoadBalancerResource.SERVICE
      ])
   )
-   await annotateAndLabelResources(filesToAnnotate, kubectl, resources)
+   await annotateAndLabelResources(filesToAnnotate, kubectl, resources, allPods)
   core.endGroup()
 }

@@ -213,6 +219,17 @@ async function promoteBlueGreen(kubectl: Kubectl, manifests: string[]) {

   // annotate resources
   core.startGroup('Annotating resources')
-   await annotateAndLabelResources(deployedManifestFiles, kubectl, resources)
+   let allPods
+   try {
+      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
+   } catch (e) {
+      core.debug(`Unable to parse pods: ${e}`)
+   }
+   await annotateAndLabelResources(
+      deployedManifestFiles,
+      kubectl,
+      resources,
+      allPods
+   )
   core.endGroup()
 }
@@ -147,7 +147,8 @@ export async function checkManifestStability(
 export async function annotateAndLabelResources(
   files: string[],
   kubectl: Kubectl,
-   resourceTypes: Resource[]
+   resourceTypes: Resource[],
+   allPods: any
 ) {
   const defaultWorkflowFileName = 'k8s-deploy-failed-workflow-annotation'
   const githubToken = core.getInput('token')
@@ -162,20 +163,15 @@ export async function annotateAndLabelResources(
   const deploymentConfig = await getDeploymentConfig()
   const annotationKeyLabel = getWorkflowAnnotationKeyLabel()

-   const shouldAnnotateResources = !(
-      core.getInput('annotate-resources').toLowerCase() === 'false'
-   )
-
-   if (shouldAnnotateResources) {
-      await annotateResources(
-         files,
-         kubectl,
-         resourceTypes,
-         annotationKeyLabel,
-         workflowFilePath,
-         deploymentConfig
-      ).catch((err) => core.warning(`Failed to annotate resources: ${err} `))
-   }
+   await annotateResources(
+      files,
+      kubectl,
+      resourceTypes,
+      allPods,
+      annotationKeyLabel,
+      workflowFilePath,
+      deploymentConfig
+   ).catch((err) => core.warning(`Failed to annotate resources: ${err} `))

   await labelResources(files, kubectl, annotationKeyLabel).catch((err) =>
      core.warning(`Failed to label resources: ${err}`)
@@ -186,6 +182,7 @@ async function annotateResources(
   files: string[],
   kubectl: Kubectl,
   resourceTypes: Resource[],
+   allPods: any,
   annotationKey: string,
   workflowFilePath: string,
   deploymentConfig: DeploymentConfig
@@ -229,13 +226,11 @@ async function annotateResources(
         )
      )
   }
-
   for (const file of files) {
      try {
         const annotateResult = await kubectl.annotateFiles(
            file,
-            annotationKeyValStr,
-            namespace
+            annotationKeyValStr
         )
         annotateResults.push(annotateResult)
      } catch (e) {
@@ -254,7 +249,8 @@ async function annotateResources(
               resource.type,
               resource.name,
               resource.namespace,
-               annotationKeyValStr
+               annotationKeyValStr,
+               allPods
            )
         ).forEach((execResult) => annotateResults.push(execResult))
      }
@@ -61,7 +61,8 @@ export async function annotateChildPods(
   resourceType: string,
   resourceName: string,
   namespace: string | undefined,
-   annotationKeyValStr: string
+   annotationKeyValStr: string,
+   allPods
 ): Promise<ExecOutput[]> {
   let owner = resourceName
   if (resourceType.toLowerCase().indexOf('deployment') > -1) {
@@ -69,14 +70,6 @@ export async function annotateChildPods(
   }

   const commandExecutionResults = []
-
-   let allPods
-   try {
-      allPods = JSON.parse((await kubectl.getAllPods()).stdout)
-   } catch (e) {
-      core.debug(`Unable to parse pods: ${e}`)
-   }
-
   if (allPods?.items && allPods.items?.length > 0) {
      allPods.items.forEach((pod) => {
         const owners = pod?.metadata?.ownerReferences
@@ -7,7 +7,7 @@ def delete(kind, name, namespace):
        if (name == "all"):
            print('kubectl delete --all' + kind + ' -n ' + namespace)
            deletion = subprocess.Popen(
-                ['kubectl', 'delete', kind, '--all', '--namespace', namespace])
+                ['kubectl', 'delete', kind, name, '--namespace', namespace])
            result, err = deletion.communicate()
        else:
            print('kubectl delete ' + kind + ' ' + name + ' -n ' + namespace)
@@ -21,7 +21,7 @@ def delete(kind, name, namespace):
 def main():
    kind = sys.argv[1]
    name = sys.argv[2]
-    namespace = sys.argv[3]
+    namespace = 'test-' + sys.argv[3]
    delete(kind, name, namespace)


@@ -41,6 +41,10 @@ def parseArgs(sysArgs):
        argsDict[labelsKey] = stringListToDict(
            argsDict[labelsKey].split(","), ":")

+    if annotationsKey in argsDict:
+        argsDict[annotationsKey] = stringListToDict(
+            argsDict[annotationsKey].split(","), ":")
+
    if selectorLabelsKey in argsDict:
        argsDict[selectorLabelsKey] = stringListToDict(
            argsDict[selectorLabelsKey].split(","), ":")
@@ -56,9 +60,6 @@ def parseArgs(sysArgs):
    if ingressServicesKey in argsDict:
        argsDict[ingressServicesKey] = argsDict[ingressServicesKey].split(",")

-    if annotationsKey in argsDict:
-        argsDict[annotationsKey] = argsDict[annotationsKey].split(",")
-
    return argsDict


@@ -97,14 +98,14 @@ def verifyDeployment(deployment, parsedArgs):
            return dictMatch, msg

    if annotationsKey in parsedArgs:
-        if len(parsedArgs[annotationsKey]) != len(deployment['metadata']['annotations']):
-            return False, f"expected {len(parsedArgs[annotationsKey])} annotations but found {len(deployment['metadata']['annotations'])}"
-        keysPresent, msg = validateKeyPresence(
-            deployment['metadata']['annotations'], parsedArgs[annotationsKey])
-        if not keysPresent:
-            return keysPresent, msg
+        dictMatch, msg = compareDicts(
+            deployment['metadata']['annotations'], parsedArgs[annotationsKey], annotationsKey)
+        if not dictMatch:
+            return dictMatch, msg
+
    return True, ""

+
 def verifyService(service, parsedArgs):
    # test selector labels, labels, annotations
    if not selectorLabelsKey in parsedArgs:
@@ -123,10 +124,10 @@ def verifyService(service, parsedArgs):
            return dictMatch, msg

    if annotationsKey in parsedArgs:
-        keysPresent, msg = validateKeyPresence(
-            service['metadata']['annotations'], parsedArgs[annotationsKey])
-        if not keysPresent:
-            return keysPresent, msg
+        dictMatch, msg = compareDicts(
+            service['metadata']['annotations'], parsedArgs[annotationsKey], annotationsKey)
+        if not dictMatch:
+            return dictMatch, msg

    return True, ""

@@ -187,13 +188,6 @@ def compareDicts(actual: dict, expected: dict, paramName=""):

    return True, ""

-def validateKeyPresence(actualDict: dict, expectedKeys: list):
-    actualKeys = actualDict.keys()
-    for key in expectedKeys:
-        if key not in actualKeys:
-            return False, f"expected key {key} not found in actual dict. \n actual dict keys {','.join(actualKeys)}"
-
-    return True, ""

 def main():
    parsedArgs: dict = parseArgs(sys.argv[1:])
@@ -226,7 +220,7 @@ def main():

        if k8_object == None:
            raise ValueError(f"{kind} {name} was not found")
-
+    
    except:
        msg = kind+' '+name+' not created or not found'
        getAllObjectsCmd = azPrefix + 'kubectl get '+kind+' -n '+namespace