keptn#2983 added keptn spec version to events sent by shipyard-contro…

…ller (keptn#3294) * keptn#2983 added keptn spec versino to events sent by shipyard-controller Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 added a little unit test Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 get tag name of specification Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 remove gitmodules Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 re-added specification submodule Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 check out submodules Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 removed --exact-match from describe tags command Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 update models in mongodb-datastore Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 update deployment yaml of mongodb-datastore Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 removed duplications Signed-off-by: Florian Bacher <[email protected]> * keptn#2983 reverted changes to deployment.yaml Signed-off-by: Florian Bacher <[email protected]>
odubajDT · Feb 19, 2021 · 8498f60 · 8498f60
1 parent c4f4813
commit 8498f60
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 24 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -46,6 +46,7 @@ jobs:
       BRANCH: ${{ steps.extract_branch.outputs.BRANCH }}
       BRANCH_SLUG: ${{ steps.extract_branch.outputs.BRANCH_SLUG }}
       VERSION: ${{ steps.get_version.outputs.VERSION }}
+      KEPTN_SPEC_VERSION: ${{ steps.get_version.outputs.KEPTN_SPEC_VERSION }}
       DATE: ${{ steps.get_datetime.outputs.DATE }}
       TIME: ${{ steps.get_datetime.outputs.TIME }}
       DATETIME: ${{ steps.get_datetime.outputs.DATETIME }}
@@ -55,6 +56,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0 # need to checkout "all commits" for certain features to work (e.g., get all changed files)
+          submodules: 'true'
 
       - name: Load CI Environemnt from .ci_env
         id: load_ci_env
@@ -229,9 +231,16 @@ jobs:
             fi
           fi
 
+          # determine keptn spec version
+          git submodule update --init
+          cd specification
+          KEPTN_SPEC_VERSION=$(git describe --tags)
+
           echo "VERSION=${VERSION}"
+          echo "KEPTN_SPEC_VERSION=${KEPTN_SPEC_VERSION}"
 
           echo "##[set-output name=VERSION;]$(echo ${VERSION})"
+          echo "##[set-output name=KEPTN_SPEC_VERSION;]$(echo ${KEPTN_SPEC_VERSION})"
       - name: Get current date and time
         id: get_datetime
         run: |
@@ -548,6 +557,7 @@ jobs:
     env:
       BRANCH: ${{ needs.prepare_ci_run.outputs.BRANCH }}
       VERSION: ${{ needs.prepare_ci_run.outputs.VERSION }}
+      KEPTN_SPEC_VERSION: ${{ needs.prepare_ci_run.outputs.KEPTN_SPEC_VERSION }}
       DATETIME: ${{ needs.prepare_ci_run.outputs.DATE }}${{ needs.prepare_ci_run.outputs.TIME }}
       GIT_SHA: ${{ needs.prepare_ci_run.outputs.GIT_SHA }}
     steps:
@@ -565,10 +575,10 @@ jobs:
         run: |
           if [[ "$BRANCH" == "master" ]]; then
             # use VERSION.DATETIME for the image tag (e.g., nightly build)
-            ./gh-actions-scripts/build_installer_helm_chart.sh "${VERSION}" "${VERSION}.${DATETIME}"
+            ./gh-actions-scripts/build_installer_helm_chart.sh "${VERSION}" "${VERSION}.${DATETIME}" "${KEPTN_SPEC_VERSION}"
           else
             # just use VERSION for the image tag
-            ./gh-actions-scripts/build_installer_helm_chart.sh "${VERSION}" "${VERSION}"
+            ./gh-actions-scripts/build_installer_helm_chart.sh "${VERSION}" "${VERSION}" "${KEPTN_SPEC_VERSION}"
           fi
 
       - name: Upload Helm Chart as an artifact

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
+
 [submodule "specification"]
 	path = specification
-	url = https://github.com/keptn/spec.git
+	url = https://github.com/keptn/spec
diff --git a/gh-actions-scripts/build_installer_helm_chart.sh b/gh-actions-scripts/build_installer_helm_chart.sh
@@ -2,6 +2,7 @@
 
 VERSION=$1
 IMAGE_TAG=$2
+KEPTN_SPEC_VERSION=$3
 
 if [ -z "$VERSION" ]; then
   echo "No Version set, exiting..."
@@ -22,6 +23,9 @@ helm dependency build ${BASE_PATH}/keptn/charts/control-plane
 find -name Chart.yaml -exec sed -i -- "s/appVersion: latest/appVersion: ${IMAGE_TAG}/g" {} \;
 find -name Chart.yaml -exec sed -i -- "s/version: latest/version: ${VERSION}/g" {} \;
 
+# replace "keptnSpecVersion: latest" with "keptnSpecVersion: $KEPTN_SPEC_VERSION" in all values.yaml files
+find -name values.yaml -exec sed -i -- "s/keptnSpecVersion: latest/keptnSpecVersion: ${KEPTN_SPEC_VERSION}/g" {} \;
+
 helm package ${BASE_PATH}/keptn --app-version $VERSION --version $VERSION
 if [ $? -ne 0 ]; then
   echo "Error packing installer, exiting..."

diff --git a/installer/manifests/keptn/charts/control-plane/templates/core.yaml b/installer/manifests/keptn/charts/control-plane/templates/core.yaml
@@ -294,6 +294,8 @@ spec:
                   key: password
             - name: MONGO_DB_NAME
               value: 'keptn'
+            - name: KEPTN_SPEC_VERSION
+              value: {{ .Values.keptnSpecVersion }}
           ports:
             - containerPort: 8080
           livenessProbe:

diff --git a/installer/manifests/keptn/charts/control-plane/values.yaml b/installer/manifests/keptn/charts/control-plane/values.yaml
@@ -7,6 +7,8 @@ mongodb:
 
 prefixPath: ""
 
+keptnSpecVersion: latest
+
 nats:
   nameOverride: keptn-nats-cluster
   nats.cluster.replicas: 3

diff --git a/mongodb-datastore/deploy/mongodb-datastore.yaml b/mongodb-datastore/deploy/mongodb-datastore.yaml
@@ -35,11 +35,11 @@ spec:
         - containerPort: 8080
         resources:
           requests:
-            memory: "128Mi"
+            memory: "256Mi"
             cpu: "100m"
           limits:
-            memory: "256Mi"
-            cpu: "1000m"
+            memory: "512Mi"
+            cpu: "5000m"
         env:
         - name: DT_CUSTOM_PROP
           value: 'keptn_service=mongodb-datastore'

diff --git a/mongodb-datastore/models/keptn_context_extended_c_e.go b/mongodb-datastore/models/keptn_context_extended_c_e.go
diff --git a/mongodb-datastore/restapi/embedded_spec.go b/mongodb-datastore/restapi/embedded_spec.go
diff --git a/mongodb-datastore/swagger.yaml b/mongodb-datastore/swagger.yaml
@@ -179,6 +179,8 @@ definitions:
             type: string
           triggeredid:
             type: string
+          shkeptnspecversion:
+            type: string
   error:
     type: object
     required:

diff --git a/shipyard-controller/common/keptn_helpers.go b/shipyard-controller/common/keptn_helpers.go
@@ -14,6 +14,8 @@ import (
 
 const defaultKeptnNamespace = "keptn"
 
+const keptnSpecVersionEnvVar = "KEPTN_SPEC_VERSION"
+
 // GetKeptnNamespace godoc
 func GetKeptnNamespace() string {
 	ns := os.Getenv("POD_NAMESPACE")
@@ -78,6 +80,11 @@ func ValidateShipyardStages(shipyard *keptnv2.Shipyard) error {
 	return nil
 }
 
+// GetKeptnSpecVersion returns the Keptn Spec version the shipyard controller is based on
+func GetKeptnSpecVersion() string {
+	return os.Getenv(keptnSpecVersionEnvVar)
+}
+
 // SendEvent godoc
 func SendEvent(event cloudevents.Event) error {
 	ebEndpoint, err := keptncommon.GetServiceEndpoint("EVENTBROKER")
@@ -90,7 +97,9 @@ func SendEvent(event cloudevents.Event) error {
 	if err != nil {
 		return errors.New("Could not initialize Keptn handler: " + err.Error())
 	}
-
+	if specVersion := GetKeptnSpecVersion(); specVersion != "" {
+		event.SetExtension("shkeptnspecversion", specVersion)
+	}
 	err = k.SendCloudEvent(event)
 	if err != nil {
 		return errors.New("Could not send CloudEvent: " + err.Error())
@@ -101,20 +110,7 @@ func SendEvent(event cloudevents.Event) error {
 // SendEventWithPayload godoc
 // Deprecated will be removed, use functionality from go-utils instead
 func SendEventWithPayload(keptnContext, triggeredID, eventType string, payload interface{}) error {
-	source, _ := url.Parse("shipyard-controller")
-	event := cloudevents.NewEvent()
-	event.SetType(eventType)
-	event.SetSource(source.String())
-	event.SetDataContentType(cloudevents.ApplicationJSON)
-	if keptnContext == "" {
-		event.SetExtension("shkeptncontext", uuid.New().String())
-	} else {
-		event.SetExtension("shkeptncontext", keptnContext)
-	}
-	if triggeredID != "" {
-		event.SetExtension("triggeredid", triggeredID)
-	}
-	event.SetData(cloudevents.ApplicationJSON, payload)
+	event := CreateEventWithPayload(keptnContext, triggeredID, eventType, payload)
 
 	ebEndpoint, err := keptncommon.GetServiceEndpoint("EVENTBROKER")
 	if err != nil {
@@ -148,6 +144,9 @@ func CreateEventWithPayload(keptnContext, triggeredID, eventType string, payload
 	if triggeredID != "" {
 		event.SetExtension("triggeredid", triggeredID)
 	}
+	if specVersion := GetKeptnSpecVersion(); specVersion != "" {
+		event.SetExtension("shkeptnspecversion", specVersion)
+	}
 	event.SetData(cloudevents.ApplicationJSON, payload)
 	return event
 }
diff --git a/shipyard-controller/common/keptn_helpers_test.go b/shipyard-controller/common/keptn_helpers_test.go
@@ -0,0 +1,16 @@
+package common
+
+import (
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
+)
+
+func TestGetKeptnSpecVersion(t *testing.T) {
+	specVersion := GetKeptnSpecVersion()
+	assert.Equal(t, "", specVersion)
+
+	os.Setenv(keptnSpecVersionEnvVar, "0.2.0")
+	specVersion = GetKeptnSpecVersion()
+	assert.Equal(t, "0.2.0", specVersion)
+}
diff --git a/shipyard-controller/deploy/service.yaml b/shipyard-controller/deploy/service.yaml
@@ -55,6 +55,8 @@ spec:
                 key: password
           - name: MONGO_DB_NAME
             value: 'keptn'
+          - name: KEPTN_SPEC_VERSION
+            value: "0.2.0"
         ports:
         - containerPort: 8080
         resources:

diff --git a/specification b/specification