Merge branch 'kubeflow:master' into master

sefgsefg · Sep 11, 2024 · 4dcc2de · 4dcc2de
2 parents f956dc6 + 1cded35
commit 4dcc2de
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 66 deletions.
diff --git a/api/v2alpha1/python/setup.py b/api/v2alpha1/python/setup.py
@@ -15,7 +15,7 @@
 import setuptools
 
 NAME = 'kfp-pipeline-spec'
-VERSION = '0.3.0'
+VERSION = '0.4.0'
 
 setuptools.setup(
     name=NAME,

diff --git a/docs/versions.json b/docs/versions.json
@@ -1,12 +1,17 @@
 [
     {
-        "version": "https://kubeflow-pipelines.readthedocs.io/en/sdk-2.8.0/",
-        "title": "2.8.0",
+        "version": "https://kubeflow-pipelines.readthedocs.io/en/sdk-2.9.0/",
+        "title": "2.9.0",
         "aliases": [
             "stable",
             "latest"
         ]
     },
+    {
+        "version": "https://kubeflow-pipelines.readthedocs.io/en/sdk-2.8.0/",
+        "title": "2.8.0",
+        "aliases": []
+    },
     {
         "version": "https://kubeflow-pipelines.readthedocs.io/en/sdk-2.7.0/",
         "title": "2.7.0",

diff --git a/kubernetes_platform/python/RELEASE.md b/kubernetes_platform/python/RELEASE.md
@@ -21,8 +21,7 @@ Some steps require elevated permissions to push branches, publish the package, a
     Follow the instructions printed out by the script in Step 2, which explain how to push the branch to upstream.
 
     By the end, you
-    should have pushed a modified `__init__.py`, `conf.py`, `.gitignore`, and
-    two modified `.readthedocs.yml` files to the release branch.
+    should have pushed a modified `__init__.py`, `conf.py` (from Step 1), and `.gitignore`, `kubernetes_executor_config_pb2.py` and two modified `.readthedocs.yml` files (from Step 2) to the release branch.
 
 4.  [Requires credentials] Go to
     [readthedocs.org/projects/kfp-kubernetes/](https://readthedocs.org/projects/kfp-kubernetes/),

diff --git a/kubernetes_platform/python/create_release_branch.sh b/kubernetes_platform/python/create_release_branch.sh
@@ -48,6 +48,12 @@ else
     mv $PKG_ROOT/docs/.readthedocs.yml $REPO_ROOT/.readthedocs.yml
     rm $REPO_ROOT/kubernetes_platform/.gitignore
 
-
-    echo "\nNext steps:\n\tPush branch using 'git push --set-upstream upstream $BRANCH_NAME'"
+    git add $PKG_ROOT/docs/.readthedocs.yml
+    git add $REPO_ROOT/.readthedocs.yml
+    git add $REPO_ROOT/kubernetes_platform/.gitignore
+    git add $REPO_ROOT/*_pb2.py
+
+    echo "Next steps:"
+    echo "1. Inspect and commit the modified files."
+    echo "2. Push branch using 'git push --set-upstream upstream $BRANCH_NAME'"
 fi
diff --git a/kubernetes_platform/python/docs/conf.py b/kubernetes_platform/python/docs/conf.py
@@ -138,12 +138,19 @@ def decorator(func):
     'version_dropdown':
         True,
     'version_info': [
+        {
+            'version':
+                'https://kfp-kubernetes.readthedocs.io/en/kfp-kubernetes-1.3.0/',
+            'title':
+                '1.3.0',
+            'aliases': ['stable'],
+        },
         {
             'version':
                 'https://kfp-kubernetes.readthedocs.io/en/kfp-kubernetes-1.2.0/',
             'title':
                 '1.2.0',
-            'aliases': ['stable'],
+            'aliases': [],
         },
         {
             'version':

diff --git a/kubernetes_platform/python/kfp/kubernetes/__init__.py b/kubernetes_platform/python/kfp/kubernetes/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.2.0'
+__version__ = '1.3.0'
 
 __all__ = [
     'add_ephemeral_volume',
@@ -36,6 +36,7 @@
 
 from kfp.kubernetes.config_map import use_config_map_as_env
 from kfp.kubernetes.config_map import use_config_map_as_volume
+from kfp.kubernetes.empty_dir import empty_dir_mount
 from kfp.kubernetes.field import use_field_path_as_env
 from kfp.kubernetes.image import set_image_pull_policy
 from kfp.kubernetes.image import set_image_pull_secrets
@@ -50,4 +51,3 @@
 from kfp.kubernetes.volume import CreatePVC
 from kfp.kubernetes.volume import DeletePVC
 from kfp.kubernetes.volume import mount_pvc
-from kfp.kubernetes.empty_dir import empty_dir_mount
diff --git a/kubernetes_platform/python/release.sh b/kubernetes_platform/python/release.sh
@@ -43,7 +43,7 @@ else
     echo "Created package."
 
     echo "Testing install"
-    pip install $TARGET_TAR_FILE
+    pip install $TARGET_TAR_FILE --break-system-packages
     INSTALLED_VERSION=$(pip list | grep kfp-kubernetes | awk '{print $2}')
     if [[ "$INSTALLED_VERSION" != "$KFP_KUBERNETES_VERSION" ]]
     then

diff --git a/sdk/RELEASE.md b/sdk/RELEASE.md
@@ -10,6 +10,24 @@
 
 ## Documentation updates
 
+# 2.9.0
+
+## Features
+* Kfp support for pip trusted host [#11151](https://github.com/kubeflow/pipelines/pull/11151)
+
+## Breaking changes
+
+* Pin kfp-pipeline-spec==0.4.0, kfp-server-api>=2.1.0,<2.4.0 [#11192](https://github.com/kubeflow/pipelines/pull/11192)
+
+## Deprecations
+
+## Bug fixes and other changes
+
+* Loosening kubernetes dependency constraint [#11079](https://github.com/kubeflow/pipelines/pull/11079)
+* Throw 'exit_task cannot depend on any other tasks.' error when an ExitHandler has a parameter dependent on other task [#11005](https://github.com/kubeflow/pipelines/pull/11005)
+
+## Documentation updates
+
 # 2.8.0
 
 ## Features

diff --git a/sdk/python/kfp/__init__.py b/sdk/python/kfp/__init__.py
@@ -16,7 +16,7 @@
 # https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
-__version__ = '2.8.0'
+__version__ = '2.9.0'
 
 import sys
 import warnings