Merge branch 'main' into svc-binding

keptn · Mar 4, 2024 · d0c3f6d · d0c3f6d
2 parents 3225b76 + 781ab47
commit d0c3f6d
Show file tree

Hide file tree

Showing 65 changed files with 788 additions and 147 deletions.
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -7040,6 +7040,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7125,6 +7126,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7310,14 +7312,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7807,14 +7801,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -6986,6 +6986,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7071,6 +7072,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7256,14 +7258,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7753,14 +7747,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -7020,6 +7020,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7105,6 +7106,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7290,14 +7292,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7788,14 +7782,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              observabilityTimeout:
-                default: 5m
-                description: |-
-                  ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
-                  If the workload does not deploy successfully within this time frame, it will be
-                  considered as failed.
-                pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
-                type: string
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,9 +1,9 @@
 {
   ".": "0.10.0",
-  "keptn-cert-manager": "2.0.0",
+  "keptn-cert-manager": "2.1.0",
   "runtimes/python-runtime": "1.0.3",
   "runtimes/deno-runtime": "2.0.2",
-  "lifecycle-operator": "0.9.0",
-  "scheduler": "0.9.0",
-  "metrics-operator": "0.9.1"
+  "lifecycle-operator": "0.9.1",
+  "scheduler": "0.9.1",
+  "metrics-operator": "0.9.2"
 }
diff --git a/Makefile b/Makefile
@@ -34,6 +34,7 @@ integration-test:
 	chainsaw test --test-dir ./test/chainsaw/testanalysis/
 	chainsaw test --test-dir ./test/chainsaw/testcertificate/
 	chainsaw test --test-dir ./test/chainsaw/non-blocking-deployment/
+	chainsaw test --test-dir ./test/chainsaw/timeout-failure-deployment/
 
 .PHONY: integration-test-local #these tests should run on a real cluster!
 integration-test-local:

diff --git a/docs/docs/components/lifecycle-operator/deployment-flow.md b/docs/docs/components/lifecycle-operator/deployment-flow.md
@@ -122,6 +122,17 @@ If any of these activities fail,
 the `KeptnApp` issues the `AppDeployErrored` event
 and terminates the deployment.
 
+> **Note**
+By default Keptn observes the state of the Kubernetes workloads
+for 5 minutes.
+After this timeout is exceeded, the deployment phase (from Keptn
+viewpoint) is considered as `Failed` and Keptn does not proceed
+with post-deployment phases (tasks, evaluations or promotion phase).
+This timeout can be modified for the cluster by changing the value
+of the `observabilityTimeout` field in the
+[KeptnConfig](../../reference/crd-reference/config.md)
+resource.
+
 ```shell
 AppDeploy
   AppDeployStarted

diff --git a/docs/docs/components/lifecycle-operator/keptn-apps.md b/docs/docs/components/lifecycle-operator/keptn-apps.md
@@ -28,6 +28,17 @@ The `KeptnWorkload` resources are created automatically
 and without delay by the mutating webhook
 as soon as the workload manifest is applied.
 
+> **Note**
+By default Keptn observes the state of the Kubernetes workloads
+for 5 minutes.
+After this timeout is exceeded, the deployment phase (from Keptn
+viewpoint) is considered as `Failed` and Keptn does not proceed
+with post-deployment phases (tasks, evaluations or promotion phase).
+This timeout can be modified for the cluster by changing the value
+of the `observabilityTimeout` field in the
+[KeptnConfig](../../reference/crd-reference/config.md)
+resource.
+
 ## Keptn Applications
 
 A [KeptnApp](../../reference/crd-reference/app.md)

diff --git a/docs/docs/contribute/general/release-checklist.md b/docs/docs/contribute/general/release-checklist.md
@@ -12,16 +12,20 @@ This page should be used to document the current process to create a full releas
 1. release deno runtime
 1. update helm tests and helm chart docs with new deno runtime version in renovate PR
 1. merge deno runtime renovate PRs
-1. re-generate cert-manager Helm chart docs bump cert-manager chart version in main chart
-1. release cert-manager by merging pr in charts
-1. manually updates the cert manager library inside metrics and lifecycle operator with current commit hash from master
+1. re-generate cert-manager Helm chart docs
+1. release cert-manager
+1. bump cert-manager chart version in charts repo and merge chart release PR
+1. bump cert-manager chart version in main chart
+1. manually update the cert manager library inside metrics and lifecycle operator with current commit hash from master
 1. re-generate metrics-operator Helm chart docs
-1. release metrics operator bump metrics operator chart version in main chart
-1. release metrics-operator helm chart
+1. release metrics operator
+1. bump metrics operator chart version in charts repo and merge chart release PR
+1. bump metrics operator chart version in main chart
 1. release scheduler
 1. fix scheduler pr conflicts re-generate lifecycle-operator Helm chart docs
-1. release lifecycle operator bump lifecycle-operator chart version in main chart
-1. release lifecycle-operator helm chart
+1. release lifecycle operator
+1. bump lifecycle operator chart version in charts repo and merge chart release PR
+1. bump lifecycle-operator chart version in main chart
 1. helm dep update to fix Chart.lock files
 1. klt release bump umbrella chart version in main chart
 1. release the Keptn chart

diff --git a/docs/docs/getting-started/observability.md b/docs/docs/getting-started/observability.md
@@ -74,6 +74,7 @@ metadata:
 spec:
   OTelCollectorUrl: 'jaeger-collector.keptn-system.svc.cluster.local:4317'
   keptnAppCreationRequestTimeoutSeconds: 30
+  observabilityTimeout: 5m
 ```
 
 Apply the file and wait for Keptn to pick up the new configuration:

diff --git a/docs/docs/guides/otel.md b/docs/docs/guides/otel.md
@@ -161,6 +161,20 @@ kubectl port-forward deployment/metrics-operator 9999 -n keptn-system
 
 You can access the metrics from your browser at: `http://localhost:9999`
 
+## Define timeout for workload observability
+
+There are situations when the deployment of the application fails due to
+various reasons (e.g. container image not found).
+By default Keptn observes the state of the Kubernetes workloads
+for 5 minutes.
+After this timeout is exceeded, the deployment phase (from Keptn
+viewpoint) is considered as `Failed` and Keptn does not proceed
+with post-deployment phases (tasks, evaluations or promotion phase).
+This timeout can be modified for the cluster by changing the value
+of the `observabilityTimeout` field in the
+[KeptnConfig](../reference/crd-reference/config.md)
+resource.
+
 ## Advanced tracing configurations in Keptn: Linking traces
 
 In Keptn you can connect multiple traces, for instance to connect deployments

diff --git a/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md b/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md
@@ -862,7 +862,6 @@ _Appears in:_
 | `postDeploymentEvaluations` _string array_ | PostDeploymentEvaluations is a list of all evaluations to be performed during the post-deployment phase of the KeptnWorkload. The items of this list refer to the names of KeptnEvaluationDefinitions located in the same namespace as the KeptnWorkload, or in the Keptn namespace. || ✓ |
 | `resourceReference` _[ResourceReference](#resourcereference)_ | ResourceReference is a reference to the Kubernetes resource (Deployment, DaemonSet, StatefulSet or ReplicaSet) the KeptnWorkload is representing. || x |
 | `metadata` _object (keys:string, values:string)_ | Metadata contains additional key-value pairs for contextual information. || ✓ |
-| `observabilityTimeout` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#duration-v1-meta)_ | ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload. If the workload does not deploy successfully within this time frame, it will be considered as failed. |5m| ✓ |
 
 
 #### KeptnWorkloadStatus
@@ -932,7 +931,6 @@ _Appears in:_
 | `postDeploymentEvaluations` _string array_ | PostDeploymentEvaluations is a list of all evaluations to be performed during the post-deployment phase of the KeptnWorkload. The items of this list refer to the names of KeptnEvaluationDefinitions located in the same namespace as the KeptnWorkload, or in the Keptn namespace. || ✓ |
 | `resourceReference` _[ResourceReference](#resourcereference)_ | ResourceReference is a reference to the Kubernetes resource (Deployment, DaemonSet, StatefulSet or ReplicaSet) the KeptnWorkload is representing. || x |
 | `metadata` _object (keys:string, values:string)_ | Metadata contains additional key-value pairs for contextual information. || ✓ |
-| `observabilityTimeout` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#duration-v1-meta)_ | ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload. If the workload does not deploy successfully within this time frame, it will be considered as failed. |5m| ✓ |
 | `workloadName` _string_ | WorkloadName is the name of the KeptnWorkload. || x |
 | `previousVersion` _string_ | PreviousVersion is the version of the KeptnWorkload that has been deployed prior to this version. || ✓ |
 | `traceId` _object (keys:string, values:string)_ | TraceId contains the OpenTelemetry trace ID. || ✓ |

diff --git a/keptn-cert-manager/CHANGELOG.md b/keptn-cert-manager/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## [2.1.0](https://github.com/keptn/lifecycle-toolkit/compare/cert-manager-v2.0.0...cert-manager-v2.1.0) (2024-03-04)
+
+
+### Features
+
+* add global value for imagePullPolicy ([#2807](https://github.com/keptn/lifecycle-toolkit/issues/2807)) ([5596d12](https://github.com/keptn/lifecycle-toolkit/commit/5596d1252b164e469aa122c0ebda8526ccbca888))
+
+
+### Other
+
+* bump go version to 1.21 ([#3006](https://github.com/keptn/lifecycle-toolkit/issues/3006)) ([8236c25](https://github.com/keptn/lifecycle-toolkit/commit/8236c25da7ec3768e76d12eb2e8f5765a005ecfa))
+* bump helm chart dependencies ([#2991](https://github.com/keptn/lifecycle-toolkit/issues/2991)) ([49ee351](https://github.com/keptn/lifecycle-toolkit/commit/49ee3511fd6e425ac095bd7f16ecd1dae6258eb0))
+
+
+### Dependency Updates
+
+* update helm release common to v0.1.4 ([#3114](https://github.com/keptn/lifecycle-toolkit/issues/3114)) ([12b2e58](https://github.com/keptn/lifecycle-toolkit/commit/12b2e58e085fd40cf5c04ca0e5eb071823777701))
+* update kubernetes packages to v0.28.7 (patch) ([#3062](https://github.com/keptn/lifecycle-toolkit/issues/3062)) ([8698803](https://github.com/keptn/lifecycle-toolkit/commit/8698803ff60b71d658d60bfc0c6b8b3d4282798d))
+* update module github.com/stretchr/testify to v1.9.0 ([#3171](https://github.com/keptn/lifecycle-toolkit/issues/3171)) ([d334790](https://github.com/keptn/lifecycle-toolkit/commit/d3347903ad91c33ba4bf664277c53024eb02825a))
+* update module golang.org/x/net to v0.21.0 ([#3091](https://github.com/keptn/lifecycle-toolkit/issues/3091)) ([44489ea](https://github.com/keptn/lifecycle-toolkit/commit/44489ea8909c5c81a2115b952bba9e3416ddd85e))
+* update module sigs.k8s.io/controller-runtime to v0.16.4 ([#3033](https://github.com/keptn/lifecycle-toolkit/issues/3033)) ([f576707](https://github.com/keptn/lifecycle-toolkit/commit/f57670729a18cfdb391c3af5ffdd92de6a330ee5))
+* update module sigs.k8s.io/controller-runtime to v0.16.5 ([#3073](https://github.com/keptn/lifecycle-toolkit/issues/3073)) ([599e2d8](https://github.com/keptn/lifecycle-toolkit/commit/599e2d8712ed7d7b614026a0038d238ed0833b37))
+
 ## [2.0.0](https://github.com/keptn/lifecycle-toolkit/compare/cert-manager-v1.2.0...cert-manager-v2.0.0) (2024-02-06)
 
 

diff --git a/keptn-cert-manager/Makefile b/keptn-cert-manager/Makefile
@@ -6,7 +6,7 @@ RELEASE_REGISTRY?=ghcr.io/keptn
 RELEASE_TIME=$(shell date +%Y%m%d%s)
 BUILD_TIME=$(shell date -u "+%F_%T")
 RELEASE_VERSION?=$(RELEASE_TIME)-v0.24.3#$(shell git describe --tags --match "v*")
-TAG?="v2.0.0" # x-release-please-version
+TAG?="v2.1.0" # x-release-please-version
 RELEASE_IMAGE:=certificate-operator:$(TAG)
 CHART_APPVERSION?=""
 

diff --git a/keptn-cert-manager/chart/Chart.yaml b/keptn-cert-manager/chart/Chart.yaml
@@ -37,7 +37,7 @@ version: 0.2.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.0.0" # x-release-please-version
+appVersion: "v2.1.0" # x-release-please-version
 dependencies:
   - name: common
     repository: "https://charts.lifecycle.keptn.sh"

diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md
@@ -38,7 +38,7 @@ resource.
 | `env.labelSelectorValue`   | specify the value for the label selector                                  | `true`                       |
 | `image.registry`           | specify the container registry for the certificate-operator image         | `ghcr.io`                    |
 | `image.repository`         | specify repo for manager image                                            | `keptn/certificate-operator` |
-| `image.tag`                | select tag for manager container                                          | `v2.0.0`                     |
+| `image.tag`                | select tag for manager container                                          | `v2.1.0`                     |
 | `image.imagePullPolicy`    | specify pull policy for the manager image. This overrides global values   | `""`                         |
 | `livenessProbe`            | custom RBAC proxy liveness probe                                          |                              |
 | `readinessProbe`           | custom manager readiness probe                                            |                              |

diff --git a/keptn-cert-manager/chart/values.yaml b/keptn-cert-manager/chart/values.yaml
@@ -69,7 +69,7 @@ image:
 ## @param     image.repository specify repo for manager image
   repository: keptn/certificate-operator
 ## @param     image.tag select tag for manager container
-  tag: v2.0.0 # x-release-please-version
+  tag: v2.1.0 # x-release-please-version
 ## @param   image.imagePullPolicy specify pull policy for the manager image. This overrides global values
   imagePullPolicy: ""
 ## @extra     livenessProbe custom RBAC proxy liveness probe

diff --git a/keptn-cert-manager/go.mod b/keptn-cert-manager/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/afero v1.11.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	k8s.io/api v0.28.7
 	k8s.io/apiextensions-apiserver v0.28.7
 	k8s.io/apimachinery v0.28.7

diff --git a/keptn-cert-manager/go.sum b/keptn-cert-manager/go.sum
@@ -113,8 +113,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=