Merge pull request #2496 from markheger/master

edgeConfig update
IBMStreams · Jun 25, 2020 · 47f5c3c · 47f5c3c
2 parents cbc2a48 + d30f8ac
commit 47f5c3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/com.ibm.streamsx.topology/CHANGELOG.md b/com.ibm.streamsx.topology/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changes
 ==========
 
+## master latest
+* [#2495](https://github.com/IBMStreams/streamsx.topology/issues/2495) edgeConfig: `condaPackages` parameter is not supported anymore
+
 ## v1.15.4
 * [#2488](https://github.com/IBMStreams/streamsx.topology/issues/2488) execution context: Make submission time parameters available without serializing the parameter callable
 

diff --git a/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py b/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py
@@ -1140,7 +1140,7 @@ class ContextTypes(object):
         topo = Topology()
         ...
         jc = JobConfig()
-        jc.raw_overlay = {'edgeConfig': {'imageName':'py-sample-app', 'imageTag':'v1.0', 'baseImage':'streams-base-edge-conda-el7:5.3.0.0'}}
+        jc.raw_overlay = {'edgeConfig': {'imageName':'py-sample-app', 'imageTag':'v1.0', 'baseImage':'streams-base-edge-python-el7:5.3.0.0'}}
         jc.add(cfg)
 
         submit(ContextTypes.EDGE, topo, cfg)
@@ -1153,7 +1153,6 @@ class ContextTypes(object):
         * **imageTag** - [str] name of the image tag
         * **baseImage** - [str] identify the name of the base image
         * **pipPackages** - [list] identify one or more Python install packages that are to be included in the image.
-        * **condaPackages** - [list] identify one or more anaconda packages that are to be included in the image.
         * **rpms** - [list] identify one or more linux RPMs that are to be included in the image
         * **locales** - [list] identify one or more locales that are to be included in the image. The first item in the list is the "default" locale. The locales are identified in the java format  <language>_<county>_<variant>. Example: "en_US"
 

diff --git a/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java b/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java
@@ -52,7 +52,7 @@ public Type getType() {
     private String edgeConfigBaseImage = null;
     private JsonArray edgeConfigPipPackages = null;
     private JsonArray edgeConfigRpms = null;
-    private JsonArray edgeConfigCondaPackages = null;
+//    private JsonArray edgeConfigCondaPackages = null;
     private JsonArray edgeConfigLocales = null;
 
     public Instance instance() { return instance;}
@@ -80,7 +80,7 @@ private void parseEdgeConfig(JsonObject jco) {
                     edgeConfigBaseImage = (edgeConfig.has("baseImage")) ? edgeConfig.get("baseImage").getAsString() : null;
                     edgeConfigPipPackages = (edgeConfig.has("pipPackages")) ? GsonUtilities.array(edgeConfig, "pipPackages") : null;
                     edgeConfigRpms = (edgeConfig.has("rpms")) ? GsonUtilities.array(edgeConfig, "rpms") : null;
-                    edgeConfigCondaPackages = (edgeConfig.has("condaPackages")) ? GsonUtilities.array(edgeConfig, "condaPackages") : null;
+//                    edgeConfigCondaPackages = (edgeConfig.has("condaPackages")) ? GsonUtilities.array(edgeConfig, "condaPackages") : null;
                     edgeConfigLocales = (edgeConfig.has("locales")) ? GsonUtilities.array(edgeConfig, "locales") : null;
                 }
             }
@@ -202,9 +202,9 @@ protected void postBuildAction(JsonObject deploy, JsonObject jco, JsonObject res
         if (edgeConfigRpms != null) {
         	buildConfigOverrides.add("rpms", edgeConfigRpms);
         }
-        if (edgeConfigCondaPackages != null) {
-        	buildConfigOverrides.add("condaPackages", edgeConfigCondaPackages);
-        }
+//        if (edgeConfigCondaPackages != null) {
+//        	buildConfigOverrides.add("condaPackages", edgeConfigCondaPackages);
+//        }
         if (edgeConfigLocales != null) {
         	buildConfigOverrides.add("locales", edgeConfigLocales);
         }