Revert "Add -latest suffix to release tags (#1172)" (#1188)

* Revert "Add -latest suffix to release tags (#1172)"

This reverts commit 750406d.

Signed-off-by: Fiachra Corcoran <[email protected]>

* Update VERSIONING.md

Signed-off-by: Fiachra Corcoran <[email protected]>

* Amend Invocation ex

Signed-off-by: Fiachra Corcoran <[email protected]>

* Fix failing e2e tests

Signed-off-by: Fiachra Corcoran <[email protected]>

---------

Signed-off-by: Fiachra Corcoran <[email protected]>

Author: efiacor

RELEASING.md

@@ -6,21 +6,16 @@ krm-functions-catalog repo.
 
 1. Checking the [CI status](https://github.com/kptdev/krm-functions-catalog/actions/workflows/ci.yaml) of the master branch. 
    If the CI is failing on the master, we need to fix it before doing a release.
-2. Go to the [releases pages] in your browser.
-3. Click `Draft a new release` to create a new release for a function. The tag
+1. Go to the [releases pages] in your browser.
+1. Click `Draft a new release` to create a new release for a function. The tag
    version format should be `functions/{language}/{function-name}/{semver}`. e.g.
-   `functions/go/set-namespace/v1.2.3` and `functions/ts/kubeval/v2.3.4`. The release name should be
+   `functions/go/set-namespace/v1.2.3`. The release name should be
    `{funtion-name} {semver}`. The release notes for this function should be in
    the body. 
-4. Click `Publish release` button.
-5. Verify the new functions are released in ghcr.io/kptdev/krm-functions-catalog/{funtion-name}/{semver} or, if using the GitHub based CD flow, check
+1. Click `Publish release` button.
+1. Verify the new functions are released in ghcr.io/kptdev/krm-functions-catalog/{funtion-name}/{semver} or, if using the GitHub based CD flow, check
    the relevant [GitHub packages section](https://github.com/orgs/kptdev/packages?repo_name=krm-functions-catalog)
-   The example above will push the following tags to the registry:
-   * v1.2.3
-   * v1.2-latest
-   * v1-latest
-
-6. Send an announcement on the [kpt slack channel]
+1. Send an announcement on the [kpt slack channel]
 
 > ⚠️ **Warning:**  The update docs section is currently being revised. DO NOT USE!!
 ## Updating function docs

VERSIONING.md

@@ -18,9 +18,9 @@ The shorter version of semantic versioning is going to be floating tags:
   released, `v1` now points to `v1.3.0`. After `v1.3.1` is released, `v1` now
   points to `v1.3.1`.
 
-Note: We do NOT support the `latest` tag, since we cannot provide any
+Note: We do NOT officially support the `latest` tag, since we cannot provide any
 compatibility guarantee for it, and the pipeline won’t produce deterministic
-results.
+results. The `latest` tag should only be used for testing and development.
 
 ## User-facing Surfaces
 
@@ -105,7 +105,7 @@ There are 2 ways to specify your desired version:
   are less maintenance toil, since it automatically pick up the security and bug
   fixes.
 
-Don't use `latest` tag if you use your own function images, since
+Avoid using the `latest` tag for your own function images, since
 it’s [not a best practice] for production and also it
 is [not recommended by kubernetes].
 

examples/enable-gcp-services-advanced/.expected/diff.patch

@@ -15,38 +15,38 @@ index 42300cc..0000000
 -  projectRef:
 -    external: proj1
 diff --git a/service_proj1-service-compute.yaml b/service_proj1-service-compute.yaml
-index a0e4c9b..6635edf 100644
+index a0e4c9b..339b364 100644
 --- a/service_proj1-service-compute.yaml
 +++ b/service_proj1-service-compute.yaml
 @@ -4,6 +4,7 @@ metadata:
    name: proj1-service-compute
    annotations:
      blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
  spec:
    resourceID: compute.googleapis.com
    projectRef:
 diff --git a/service_proj1-service-redis.yaml b/service_proj1-service-redis.yaml
-index 2da01b0..888327c 100644
+index 2da01b0..2d4f6ac 100644
 --- a/service_proj1-service-redis.yaml
 +++ b/service_proj1-service-redis.yaml
 @@ -4,6 +4,7 @@ metadata:
    name: proj1-service-redis
    annotations:
      blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
  spec:
    resourceID: redis.googleapis.com
    projectRef:
 diff --git a/service_proj2-service-redis.yaml b/service_proj2-service-redis.yaml
-index 6c5cfd8..66ed59c 100644
+index 6c5cfd8..cfce9e1 100644
 --- a/service_proj2-service-redis.yaml
 +++ b/service_proj2-service-redis.yaml
 @@ -4,6 +4,7 @@ metadata:
    name: proj2-service-redis
    annotations:
      blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj2-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
  spec:
    resourceID: redis.googleapis.com
    projectRef:

examples/enable-gcp-services-simple/.expected/diff.patch

@@ -1,6 +1,6 @@
 diff --git a/service_proj1-service-compute.yaml b/service_proj1-service-compute.yaml
 new file mode 100644
-index 0000000..6635edf
+index 0000000..339b364
 --- /dev/null
 +++ b/service_proj1-service-compute.yaml
 @@ -0,0 +1,11 @@
@@ -10,14 +10,14 @@ index 0000000..6635edf
 +  name: proj1-service-compute
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: compute.googleapis.com
 +  projectRef:
 +    external: proj1
 diff --git a/service_proj1-service-redis.yaml b/service_proj1-service-redis.yaml
 new file mode 100644
-index 0000000..888327c
+index 0000000..2d4f6ac
 --- /dev/null
 +++ b/service_proj1-service-redis.yaml
 @@ -0,0 +1,11 @@
@@ -27,7 +27,7 @@ index 0000000..888327c
 +  name: proj1-service-redis
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: redis.googleapis.com
 +  projectRef:

functions/go/kubeconform/kubeconform_test.go

@@ -16,12 +16,12 @@ package main
 
 import (
 	"fmt"
+	"github.com/kptdev/krm-functions-sdk/go/fn"
+	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
 	"reflect"
 	"testing"
-	"github.com/kptdev/krm-functions-sdk/go/fn"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestExtractConfig(t *testing.T) {

scripts/git-tag-parser.sh

@@ -17,11 +17,11 @@
 VERNUM='0|[1-9][0-9]*'
 SEMVER_REGEX="^[vV]?($VERNUM)\\.($VERNUM)\\.($VERNUM)$"
 
-# get_versions return versions: vX.Y.Z, vX.Y-latest and vX-latest if the input matches
+# get_versions return versions: vX.Y.Z, vX.Y and vX if the input matches
 # SEMVER_REGEX. Otherwise, it returns the input.
 # example 1:
 # Invocation: get_versions v1.2.3
-# Return: v1.2.3 v1.2-latest v1-latest
+# Return: v1.2.3 v1.2 v1
 # example 2:
 # Invocation: get_versions latest
 # Return: latest
@@ -33,8 +33,8 @@ function get_versions {
     local patch=${BASH_REMATCH[3]}
 
     echo v"${major}"."${minor}"."${patch}"
-    echo v"${major}"."${minor}"-latest
-    echo v"${major}"-latest
+    echo v"${major}"."${minor}"
+    echo v"${major}"
   else
     echo "${version}"
   fi

tests/enable-gcp-services/nested-packages/.expected/diff.patch

@@ -1,6 +1,6 @@
 diff --git a/bar-project/service_bar-service-cloudbuild.yaml b/bar-project/service_bar-service-cloudbuild.yaml
 new file mode 100644
-index 0000000..14cfd13
+index 0000000..5336e67
 --- /dev/null
 +++ b/bar-project/service_bar-service-cloudbuild.yaml
 @@ -0,0 +1,11 @@
@@ -10,14 +10,14 @@ index 0000000..14cfd13
 +  name: bar-service-cloudbuild
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/bar-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: cloudbuild.googleapis.com
 +  projectRef:
 +    external: bar
 diff --git a/foo-project/service_foo-service-compute.yaml b/foo-project/service_foo-service-compute.yaml
 new file mode 100644
-index 0000000..fed5ef5
+index 0000000..cc0f0f2
 --- /dev/null
 +++ b/foo-project/service_foo-service-compute.yaml
 @@ -0,0 +1,11 @@
@@ -27,14 +27,14 @@ index 0000000..fed5ef5
 +  name: foo-service-compute
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/foo-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: compute.googleapis.com
 +  projectRef:
 +    external: foo
 diff --git a/foo-project/service_foo-service-redis.yaml b/foo-project/service_foo-service-redis.yaml
 new file mode 100644
-index 0000000..160a34c
+index 0000000..8a1e355
 --- /dev/null
 +++ b/foo-project/service_foo-service-redis.yaml
 @@ -0,0 +1,11 @@
@@ -44,14 +44,14 @@ index 0000000..160a34c
 +  name: foo-service-redis
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/foo-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: redis.googleapis.com
 +  projectRef:
 +    external: foo
 diff --git a/foo-project/service_foo-service-storage.yaml b/foo-project/service_foo-service-storage.yaml
 new file mode 100644
-index 0000000..dfcf6e3
+index 0000000..07acdd4
 --- /dev/null
 +++ b/foo-project/service_foo-service-storage.yaml
 @@ -0,0 +1,11 @@
@@ -61,14 +61,14 @@ index 0000000..dfcf6e3
 +  name: foo-service-storage
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/foo-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: storage.googleapis.com
 +  projectRef:
 +    external: foo
 diff --git a/service_proj1-service-compute.yaml b/service_proj1-service-compute.yaml
 new file mode 100644
-index 0000000..6635edf
+index 0000000..339b364
 --- /dev/null
 +++ b/service_proj1-service-compute.yaml
 @@ -0,0 +1,11 @@
@@ -78,14 +78,14 @@ index 0000000..6635edf
 +  name: proj1-service-compute
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: compute.googleapis.com
 +  projectRef:
 +    external: proj1
 diff --git a/service_proj1-service-redis.yaml b/service_proj1-service-redis.yaml
 new file mode 100644
-index 0000000..888327c
+index 0000000..2d4f6ac
 --- /dev/null
 +++ b/service_proj1-service-redis.yaml
 @@ -0,0 +1,11 @@
@@ -95,7 +95,7 @@ index 0000000..888327c
 +  name: proj1-service-redis
 +  annotations:
 +    blueprints.cloud.google.com/ownerReference: 'blueprints.cloud.google.com/ProjectServiceSet/proj1-service'
-+    cnrm.cloud.google.com/blueprint: 'kpt-fn'
++    cnrm.cloud.google.com/blueprint: 'krm-fn'
 +spec:
 +  resourceID: redis.googleapis.com
 +  projectRef: