Merge branch 'main' into main

aws · Jan 27, 2023 · c4b09ee · c4b09ee
2 parents cb54c28 + 356a128
commit c4b09ee
Show file tree

Hide file tree

Showing 43 changed files with 482 additions and 370 deletions.
diff --git a/packages/@aws-cdk/aws-eks/lib/kubectl-handler/helm/__init__.py b/packages/@aws-cdk/aws-eks/lib/kubectl-handler/helm/__init__.py
@@ -82,7 +82,7 @@ def helm_handler(event, context):
 
         if repository is not None and repository.startswith('oci://'):
             tmpdir = tempfile.TemporaryDirectory()
-            chart_dir = get_chart_from_oci(tmpdir.name, release, repository, version)
+            chart_dir = get_chart_from_oci(tmpdir.name, repository, version)
             chart = chart_dir
 
         helm('upgrade', release, chart, repository, values_file, namespace, version, wait, timeout, create_namespace)
@@ -123,7 +123,7 @@ def get_oci_cmd(repository, version):
     return cmnd
 
 
-def get_chart_from_oci(tmpdir, release, repository = None, version = None):
+def get_chart_from_oci(tmpdir, repository = None, version = None):
 
     cmnd = get_oci_cmd(repository, version)
 
@@ -135,7 +135,9 @@ def get_chart_from_oci(tmpdir, release, repository = None, version = None):
             output = subprocess.check_output(cmnd, stderr=subprocess.STDOUT, cwd=tmpdir, shell=True)
             logger.info(output)
 
-            return os.path.join(tmpdir, release)
+            # effectively returns "$tmpDir/$lastPartOfOCIUrl", because this is how helm pull saves OCI artifact. 
+            # Eg. if we have oci://9999999999.dkr.ecr.us-east-1.amazonaws.com/foo/bar/pet-service repository, helm saves artifact under $tmpDir/pet-service
+            return os.path.join(tmpdir, repository.rpartition('/')[-1])
         except subprocess.CalledProcessError as exc:
             output = exc.output
             if b'Broken pipe' in output:

diff --git a/...78a86fd5d6fb29ade070a33/apply/__init__.py → ...33d5ae5b9fd14d498e9c5ee/apply/__init__.py b/...78a86fd5d6fb29ade070a33/apply/__init__.py → ...33d5ae5b9fd14d498e9c5ee/apply/__init__.py
diff --git a/...a678a86fd5d6fb29ade070a33/get/__init__.py → ...0033d5ae5b9fd14d498e9c5ee/get/__init__.py b/...a678a86fd5d6fb29ade070a33/get/__init__.py → ...0033d5ae5b9fd14d498e9c5ee/get/__init__.py
diff --git a/...678a86fd5d6fb29ade070a33/helm/__init__.py → ...033d5ae5b9fd14d498e9c5ee/helm/__init__.py b/...678a86fd5d6fb29ade070a33/helm/__init__.py → ...033d5ae5b9fd14d498e9c5ee/helm/__init__.py
@@ -82,7 +82,7 @@ def helm_handler(event, context):
 
         if repository is not None and repository.startswith('oci://'):
             tmpdir = tempfile.TemporaryDirectory()
-            chart_dir = get_chart_from_oci(tmpdir.name, release, repository, version)
+            chart_dir = get_chart_from_oci(tmpdir.name, repository, version)
             chart = chart_dir
 
         helm('upgrade', release, chart, repository, values_file, namespace, version, wait, timeout, create_namespace)
@@ -123,7 +123,7 @@ def get_oci_cmd(repository, version):
     return cmnd
 
 
-def get_chart_from_oci(tmpdir, release, repository = None, version = None):
+def get_chart_from_oci(tmpdir, repository = None, version = None):
 
     cmnd = get_oci_cmd(repository, version)
 
@@ -135,7 +135,7 @@ def get_chart_from_oci(tmpdir, release, repository = None, version = None):
             output = subprocess.check_output(cmnd, stderr=subprocess.STDOUT, cwd=tmpdir, shell=True)
             logger.info(output)
 
-            return os.path.join(tmpdir, release)
+            return os.path.join(tmpdir, repository.rpartition('/')[-1])
         except subprocess.CalledProcessError as exc:
             output = exc.output
             if b'Broken pipe' in output:

diff --git a/...44bbb46a678a86fd5d6fb29ade070a33/index.py → ...f7e56190033d5ae5b9fd14d498e9c5ee/index.py b/...44bbb46a678a86fd5d6fb29ade070a33/index.py → ...f7e56190033d5ae5b9fd14d498e9c5ee/index.py
diff --git a/...78a86fd5d6fb29ade070a33/patch/__init__.py → ...33d5ae5b9fd14d498e9c5ee/patch/__init__.py b/...78a86fd5d6fb29ade070a33/patch/__init__.py → ...33d5ae5b9fd14d498e9c5ee/patch/__init__.py
diff --git a/...et.js.snapshot/asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip b/...et.js.snapshot/asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip
diff --git a/...apshot/asset.7215c88dd3e638d28329d4538b36cdbfb54233a4d972181795814f8b904d1037/outbound.js b/...apshot/asset.7215c88dd3e638d28329d4538b36cdbfb54233a4d972181795814f8b904d1037/outbound.js