Fix runtime tags in 2.0.0 branch (#5473)

* Fix runtime tags in 2.0.0 branch * Use nodejs-v20 image for standalone tests Co-authored-by: David Grove <[email protected]> * Use nodejs-v20 image for standalone tests Co-authored-by: David Grove <[email protected]> * Use the fixed tag for the openwhisk/example image * Change the api-gateway tag to 1.0.0 * Change the nodejs runtime tag to 1.22.0 --------- Co-authored-by: David Grove <[email protected]>
apache · Mar 27, 2024 · c377ce9 · c377ce9
1 parent 44755a4
commit c377ce9
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 35 deletions.
diff --git a/ansible/files/runtimes-nodeonly.json b/ansible/files/runtimes-nodeonly.json
@@ -21,7 +21,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-nodejs-v20",
-                    "tag": "nightly"
+                    "tag": "1.22.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -40,7 +40,7 @@
         {
             "prefix": "openwhisk",
             "name": "dockerskeleton",
-            "tag": "nightly"
+            "tag": "1.15.0"
         }
     ]
 }
diff --git a/ansible/files/runtimes.json b/ansible/files/runtimes.json
@@ -20,7 +20,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-nodejs-v18",
-                    "tag": "nightly"
+                    "tag": "1.22.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -34,7 +34,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-nodejs-v20",
-                    "tag": "nightly"
+                    "tag": "1.22.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -63,7 +63,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-python-v3.10",
-                    "tag": "nightly"
+                    "tag": "1.19.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -77,7 +77,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-python-v3.11",
-                    "tag": "nightly"
+                    "tag": "1.19.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -93,7 +93,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-swift-v5.3",
-                    "tag": "nightly"
+                    "tag": "1.18.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -107,7 +107,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-swift-v5.7",
-                    "tag": "nightly"
+                    "tag": "1.18.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -123,7 +123,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "java8action",
-                    "tag": "nightly"
+                    "tag": "1.19.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -141,7 +141,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-php-v8.1",
-                    "tag": "nightly"
+                    "tag": "1.20.0"
                 },
                 "attached": {
                     "attachmentName": "codefile",
@@ -161,7 +161,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-ruby-v2.5",
-                    "tag": "nightly"
+                    "tag": "1.17.0"
                 }
             }
         ],
@@ -177,7 +177,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-golang-v1.20",
-                    "tag": "nightly"
+                    "tag": "1.24.0"
                 }
             }
         ],
@@ -190,7 +190,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-dotnet-v3.1",
-                    "tag": "nightly"
+                    "tag": "1.17.0"
                 },
                 "attached": {
                     "attachmentName": "codefile",
@@ -205,7 +205,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-dotnet-v6.0",
-                    "tag": "nightly"
+                    "tag": "1.17.0"
                 },
                 "attached": {
                     "attachmentName": "codefile",
@@ -220,7 +220,7 @@
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-rust-v1.34",
-                    "tag": "nightly"
+                    "tag": "1.3.0"
                 },
                 "deprecated": false,
                 "attached": {
@@ -234,7 +234,7 @@
         {
             "prefix": "openwhisk",
             "name": "dockerskeleton",
-            "tag": "nightly"
+            "tag": "1.15.0"
         }
     ]
 }
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -335,8 +335,7 @@ apigateway:
   port:
     api: 9000
     mgmt: 9001
-  # Default to 'nightly', which tracks the head revision of the master branch of apigateway's gitrepo
-  version: nightly
+  version: 1.0.0
 
 redis:
   version: 4.0

diff --git a/core/standalone/README.md b/core/standalone/README.md
@@ -394,7 +394,7 @@ If you have docker and bash installed, you can launch the standalone openwhisk f
 
 The script will start the standalone controller with Docker, and will also try to open the playground. It was tested on Linux, OSX and Windows with Git Bash. If a browser does not automatically open the OpenWhisk playground, you can access it at `http://localhost:3232`.
 
-The default standalone controller image is published as `openwhisk/standalone:nightly` for convenience.
+The default standalone controller image is published as `openwhisk/standalone:2.0.0` for convenience.
 
 If you do not want to execute arbitrary code straight from the net, you can look at [this script](start.sh), check it and run it when you feel safe.
 
@@ -414,7 +414,7 @@ You can specify a different image to this script and/or pass additional paramete
 
 e.g.
 
-`bash <(curl -sL https://s.apache.org/openwhisk.sh) -e SOME_DOCKER_ENV=a openwhisk/standalone:nightly --no-ui`
+`bash <(curl -sL https://s.apache.org/openwhisk.sh) -e SOME_DOCKER_ENV=a openwhisk/standalone:2.0.0 --no-ui`
 
 Extra args are useful to configure the JVM running OpenWhisk and to propagate additional environment variables to containers running images. This feature is useful for example to enable debugging for actions.
 

diff --git a/core/standalone/src/main/resources/standalone.conf b/core/standalone/src/main/resources/standalone.conf
@@ -121,7 +121,7 @@ whisk {
     }
 
     user-events {
-      image = "openwhisk/user-events:nightly"
+      image = "openwhisk/user-events:2.0.0"
       prometheus-image = "prom/prometheus:v2.5.0"
       grafana-image = "grafana/grafana:6.1.6"
     }

diff --git a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala
@@ -148,12 +148,12 @@ object StandaloneDockerSupport {
   }
 
   def prePullImage(imageName: String)(implicit logging: Logging): Unit = {
-    //docker images openwhisk/action-nodejs-v14:nightly
+    //docker images openwhisk/action-nodejs-v14:1.22.0
     //REPOSITORY                    TAG                 IMAGE ID            CREATED             SIZE
-    //openwhisk/action-nodejs-v14   nightly             dbb0f8e1a050        5 days ago          967MB
+    //openwhisk/action-nodejs-v14   1.22.0             dbb0f8e1a050        5 days ago          967MB
     val imageResult = s"$dockerCmd images $imageName".!!
     val imageExist = imageResult.linesIterator.toList.size > 1
-    if (!imageExist || imageName.contains(":nightly")) {
+    if (!imageExist || imageName.contains(":1.22.0")) {
       logging.info(this, s"Docker Pre pulling $imageName")
       s"$dockerCmd pull $imageName".!!
     }

diff --git a/core/standalone/start.sh b/core/standalone/start.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-IMAGE="${1:-openwhisk/standalone:nightly}"
+IMAGE="${1:-openwhisk/standalone:2.0.0}"
 shift
 docker run --rm -d \
   -h openwhisk --name openwhisk \

diff --git a/docs/actions.md b/docs/actions.md
@@ -91,7 +91,7 @@ Prewarmed containers are created when an invoker starts, they are created accord
     "image": {
         "prefix": "openwhisk",
         "name": "action-nodejs-v20",
-        "tag": "nightly"
+        "tag": "1.22.0"
     },
     "deprecated": false,
     "attached": {
@@ -122,7 +122,7 @@ With a reactive configuration, the number of prewarm containers is dynamically c
     "image": {
         "prefix": "openwhisk",
         "name": "action-nodejs-v20",
-        "tag": "nightly"
+        "tag": "1.22.0"
     },
     "deprecated": false,
     "attached": {

diff --git a/tools/github/runStandaloneTests.sh b/tools/github/runStandaloneTests.sh
@@ -45,9 +45,9 @@ export KUBECONFIG="$(kind get kubeconfig-path)"
 kubectl config set-context --current --namespace=default
 
 # This is required because it is timed out to pull the image during the test.
-docker pull openwhisk/action-nodejs-v14:nightly
-docker pull openwhisk/dockerskeleton:nightly
-docker pull openwhisk/example:nightly
+docker pull openwhisk/action-nodejs-v20:1.22.0
+docker pull openwhisk/dockerskeleton:1.15.0
+docker pull openwhisk/example:1.15.0
 docker pull openwhisk/apigateway:0.11.0
 
 cd $ROOTDIR

diff --git a/tools/jenkins/apache/dockerhub.groovy b/tools/jenkins/apache/dockerhub.groovy
@@ -34,8 +34,7 @@ node('ubuntu') {
       def gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
       def shortCommit = gitCommit.take(7)
       sh "./gradlew clean"
-      sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=nightly"
-      sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=${shortCommit}"
+      sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=2.0.0"
     }
   }
 

diff --git a/tools/travis/runStandaloneTests.sh b/tools/travis/runStandaloneTests.sh
@@ -45,9 +45,9 @@ export KUBECONFIG="$(kind get kubeconfig-path)"
 kubectl config set-context --current --namespace=default
 
 # This is required because it is timed out to pull the image during the test.
-docker pull openwhisk/action-nodejs-v14:nightly
-docker pull openwhisk/dockerskeleton:nightly
-docker pull openwhisk/example:nightly
+docker pull openwhisk/action-nodejs-v20:1.22.0
+docker pull openwhisk/dockerskeleton:1.15.0
+docker pull openwhisk/example:1.15.0
 docker pull openwhisk/apigateway:0.11.0
 
 cd $ROOTDIR