chore: adapt examples to use v1beta1 API resources (#2868)

Signed-off-by: odubajDT <[email protected]>

examples/sample-app/Makefile

@@ -24,10 +24,6 @@ deploy-version-1:
 deploy-version-2:
 	kubectl apply -k version-2
 
-.PHONY: deploy-version-3
-deploy-version-3:
-	kubectl apply -k version-3
-
 .PHONY: undeploy-podtatohead
 undeploy-podtatohead:
 	kubectl delete ns "$(PODTATO_NAMESPACE)" --ignore-not-found=true

examples/sample-app/README.md

@@ -30,7 +30,7 @@ kubectl create secret generic slack-secret --from-literal=SECURE_DATA='{"slack_h
 ### Enable post deployment task
 
 To enable Slack notification add `post-deployment-notification` in as a postDeploymentTasks in the
-[app.yaml](base/app.yaml) file as shown below.
+[appcontext.yaml](base/appcontext.yaml) file as shown below.
 
 ```yaml
   postDeploymentTasks:
@@ -60,17 +60,10 @@ You could also open up a browser and watch the progress in Jaeger.
 You can find the Context ID in the "TraceId" Field of
 the KeptnAppVersion
 
-The deployment should fail because of too few cpu resources
+After some time, you should see that everything is successful
 
-## Deploy Version 2 of the PodTatoHead
+## Deploy Version 2
 
 ```make deploy-version-2```
 
-* Watch the progress of the deployments
-* After some time, you should see that everything is successful
-
-## Deploy Version 3
-
-```make deploy-version-3```
-
 * This should only change one service, you can see that only this changed in the trace

examples/sample-app/base/app-post-deploy.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: post-deployment-notification

examples/sample-app/base/appcontext.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: lifecycle.keptn.sh/v1beta1
+kind: KeptnAppContext
+metadata:
+  name: podtato-head
+  namespace: podtato-kubectl

examples/sample-app/base/container-task.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: container-sleep

examples/sample-app/base/kustomization.yaml

@@ -1,7 +1,7 @@
 resources:
   - https://github.com/podtato-head/podtato-head-app/releases/download/v0.3.1/manifest.yaml
-  - app.yaml
   - app-post-deploy.yaml
+  - appcontext.yaml
   - provider.yaml
   - metric.yaml
   - container-task.yaml

examples/sample-app/base/python-task.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: python-secret

examples/sample-app/version-1/app-pre-deploy-eval.yaml

@@ -1,11 +1,11 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnEvaluationDefinition
 metadata:
-  name: app-pre-deploy-eval-1
+  name: app-pre-deploy-eval-2
   namespace: podtato-kubectl
 spec:
   objectives:
     - keptnMetricRef:
         name: available-cpus
         namespace: podtato-kubectl
-      evaluationTarget: ">100"
+      evaluationTarget: ">1"

examples/sample-app/version-1/app-pre-deploy.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: pre-deployment-check-frontend

examples/sample-app/version-1/appcontext.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: lifecycle.keptn.sh/v1beta1
+kind: KeptnAppContext
+metadata:
+  name: podtato-head
+  namespace: podtato-kubectl
+spec:
+  preDeploymentEvaluations:
+    - app-pre-deploy-eval-2
+  preDeploymentTasks:
+    - container-sleep
+    - python-secret

examples/sample-app/version-1/kustomization.yaml

@@ -6,5 +6,5 @@ resources:
   - app-pre-deploy-eval.yaml
 
 patchesStrategicMerge:
-  - app.yaml
+  - appcontext.yaml
   - manifest.yaml

examples/sample-app/version-2/app-pre-deploy-eval.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnEvaluationDefinition
 metadata:
   name: app-pre-deploy-eval-2

examples/sample-app/version-2/app-pre-deploy.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha3
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: pre-deployment-check-frontend

examples/sample-app/version-2/appcontext.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: lifecycle.keptn.sh/v1beta1
+kind: KeptnAppContext
+metadata:
+  name: podtato-head
+  namespace: podtato-kubectl
+spec:
+  preDeploymentTasks:
+    - container-sleep
+    - python-secret

examples/sample-app/version-2/kustomization.yaml

@@ -6,5 +6,5 @@ resources:
   - app-pre-deploy-eval.yaml
 
 patchesStrategicMerge:
-  - app.yaml
+  - appcontext.yaml
   - manifest.yaml

examples/sample-app/version-2/manifest.yaml

@@ -17,7 +17,7 @@ spec:
     metadata:
       labels:
         keptn.sh/pre-deployment-tasks: pre-deployment-check-frontend
-        app.kubernetes.io/version: 0.1.1
+        app.kubernetes.io/version: 0.1.2
 
 ---
 apiVersion: apps/v1

examples/support/observability/assets/podtatohead-deployment-evaluation/appcontext.yaml

@@ -0,0 +1,12 @@
+apiVersion: lifecycle.keptn.sh/v1beta1
+kind: KeptnAppContext
+metadata:
+  name: podtato-head
+  namespace: podtato-kubectl
+spec:
+  postDeploymentTasks:
+    - post-deployment-hello
+  preDeploymentEvaluations: # Comment out this four lines if you do not have a prometheus installation
+    - my-prometheus-definition1
+  postDeploymentEvaluations:
+    - my-prometheus-definition2

examples/support/observability/assets/podtatohead-deployment-evaluation/check_entry.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha2
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: check-entry-service

examples/support/observability/assets/podtatohead-deployment-evaluation/post-deployment-tasks.yaml

@@ -1,4 +1,4 @@
-apiVersion: lifecycle.keptn.sh/v1alpha2
+apiVersion: lifecycle.keptn.sh/v1beta1
 kind: KeptnTaskDefinition
 metadata:
   name: post-deployment-hello