Skip to content

Commit

Permalink
Merge branch 'main' into guides
Browse files Browse the repository at this point in the history
  • Loading branch information
mowies authored Mar 4, 2024
2 parents e0ba502 + 036a1d4 commit 3065e9a
Show file tree
Hide file tree
Showing 118 changed files with 1,483 additions and 627 deletions.
8 changes: 6 additions & 2 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Analysislog
analysismetrics
analysispool
analysisspec
analysisstate
analysisstatus
analysistypes
analysisvaluetemplate
Expand All @@ -45,7 +46,6 @@ argocd
argoproj
ARMO
artifacthub
Artificathub
asdfg
authurl
automerge
Expand Down Expand Up @@ -79,6 +79,7 @@ certwebhook
chainsaw
Chans
Checkmarx
checktype
clientgoscheme
cloudevents
clt
Expand Down Expand Up @@ -321,9 +322,11 @@ keptnmetricsprovider
keptnmetricsproviderlist
keptnmetricsproviderspec
keptnmetricstatus
keptnphase
keptnprommetrics
keptnsandbox
keptnserver
keptnstate
keptntask
keptntaskdefinition
keptntaskdefinitionlist
Expand Down Expand Up @@ -373,6 +376,7 @@ kyverno
lastword
Lato
LFC
libexpat
Lifcycle
lifecyclekeptnsh
linenums
Expand Down Expand Up @@ -448,7 +452,6 @@ onsi
opencontainers
openfeature
Openshift
openssf
opentelemetry
opentracing
operatorcommon
Expand All @@ -472,6 +475,7 @@ perc
persistentvolumeclaims
persistentvolumes
phaseitem
phasetraceid
pid
pipefail
poc
Expand Down
32 changes: 30 additions & 2 deletions .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2056,6 +2056,14 @@ spec:
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
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
type: object
status:
description: unused field
Expand Down Expand Up @@ -2890,6 +2898,19 @@ spec:
- keptnMetricRef
type: object
type: array
retries:
default: 10
description: |-
Retries indicates how many times the KeptnEvaluation can be attempted in the case of an error or
missed evaluation objective, before considering the KeptnEvaluation to be failed.
type: integer
retryInterval:
default: 5s
description: |-
RetryInterval specifies the interval at which the KeptnEvaluation is retried in the case of an error
or a missed objective.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
required:
- objectives
type: object
Expand Down Expand Up @@ -7019,6 +7040,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7104,6 +7126,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7871,6 +7894,11 @@ spec:
- PostDeploymentTasks
- PostDeploymentEvaluations
type: string
deploymentStartTime:
description: DeploymentStartTime represents the start time of the
deployment phase
format: date-time
type: string
deploymentStatus:
default: Pending
description: DeploymentStatus indicates the current status of the
Expand Down Expand Up @@ -11457,9 +11485,9 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: FUNCTION_RUNNER_IMAGE
value: "ghcr.io/keptn/deno-runtime:v2.0.1"
value: "ghcr.io/keptn/deno-runtime:v2.0.2"
- name: PYTHON_RUNNER_IMAGE
value: "ghcr.io/keptn/python-runtime:v1.0.2"
value: "ghcr.io/keptn/python-runtime:v1.0.3"
- name: KEPTN_APP_CONTROLLER_LOG_LEVEL
value: "0"
- name: KEPTN_APP_CREATION_REQUEST_CONTROLLER_LOG_LEVEL
Expand Down
32 changes: 30 additions & 2 deletions .github/scripts/.helm-tests/lifecycle-only/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,14 @@ spec:
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
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
type: object
status:
description: unused field
Expand Down Expand Up @@ -2836,6 +2844,19 @@ spec:
- keptnMetricRef
type: object
type: array
retries:
default: 10
description: |-
Retries indicates how many times the KeptnEvaluation can be attempted in the case of an error or
missed evaluation objective, before considering the KeptnEvaluation to be failed.
type: integer
retryInterval:
default: 5s
description: |-
RetryInterval specifies the interval at which the KeptnEvaluation is retried in the case of an error
or a missed objective.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
required:
- objectives
type: object
Expand Down Expand Up @@ -6965,6 +6986,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7050,6 +7072,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7817,6 +7840,11 @@ spec:
- PostDeploymentTasks
- PostDeploymentEvaluations
type: string
deploymentStartTime:
description: DeploymentStartTime represents the start time of the
deployment phase
format: date-time
type: string
deploymentStatus:
default: Pending
description: DeploymentStatus indicates the current status of the
Expand Down Expand Up @@ -8866,9 +8894,9 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: FUNCTION_RUNNER_IMAGE
value: "ghcr.io/keptn/deno-runtime:v2.0.1"
value: "ghcr.io/keptn/deno-runtime:v2.0.2"
- name: PYTHON_RUNNER_IMAGE
value: "ghcr.io/keptn/python-runtime:v1.0.2"
value: "ghcr.io/keptn/python-runtime:v1.0.3"
- name: KEPTN_APP_CONTROLLER_LOG_LEVEL
value: "0"
- name: KEPTN_APP_CREATION_REQUEST_CONTROLLER_LOG_LEVEL
Expand Down
32 changes: 30 additions & 2 deletions .github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2031,6 +2031,14 @@ spec:
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
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
type: object
status:
description: unused field
Expand Down Expand Up @@ -2867,6 +2875,19 @@ spec:
- keptnMetricRef
type: object
type: array
retries:
default: 10
description: |-
Retries indicates how many times the KeptnEvaluation can be attempted in the case of an error or
missed evaluation objective, before considering the KeptnEvaluation to be failed.
type: integer
retryInterval:
default: 5s
description: |-
RetryInterval specifies the interval at which the KeptnEvaluation is retried in the case of an error
or a missed objective.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
required:
- objectives
type: object
Expand Down Expand Up @@ -6999,6 +7020,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7084,6 +7106,7 @@ spec:
type: string
type: array
resourceReference:
description: ResourceReference represents the parent resource of Workload
properties:
kind:
type: string
Expand Down Expand Up @@ -7852,6 +7875,11 @@ spec:
- PostDeploymentTasks
- PostDeploymentEvaluations
type: string
deploymentStartTime:
description: DeploymentStartTime represents the start time of the
deployment phase
format: date-time
type: string
deploymentStatus:
default: Pending
description: DeploymentStatus indicates the current status of the
Expand Down Expand Up @@ -9180,9 +9208,9 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: FUNCTION_RUNNER_IMAGE
value: "ghcr.io/keptn/deno-runtime:v2.0.1"
value: "ghcr.io/keptn/deno-runtime:v2.0.2"
- name: PYTHON_RUNNER_IMAGE
value: "ghcr.io/keptn/python-runtime:v1.0.2"
value: "ghcr.io/keptn/python-runtime:v1.0.3"
- name: KEPTN_APP_CONTROLLER_LOG_LEVEL
value: "0"
- name: KEPTN_APP_CREATION_REQUEST_CONTROLLER_LOG_LEVEL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ processor:
useRawDocstring: true
ignoreFields:
- "TypeMeta$"
- "KeptnPhase$"
render:
kubernetesVersion: 1.28
knownTypes:
Expand All @@ -11,6 +12,12 @@ render:
- name: ItemStatus
package: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3
link: ../v1alpha3/index.md#itemstatus
- name: KeptnState
package: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common
link: ../v1alpha3/index.md#keptnstate
- name: PhaseTraceID
package: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common
link: ../v1alpha3/index.md#phasetraceid
- name: Quantity
package: "k8s.io/apimachinery/pkg/api/resource"
link: https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity
Expand All @@ -23,3 +30,6 @@ render:
- name: MapCarrier
package: "go.opentelemetry.io/otel/propagation"
link: https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier
- name: UID
package: "k8s.io/apimachinery/pkg/types"
link: https://pkg.go.dev/k8s.io/[email protected]/pkg/types#UID
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ processor:
- "EmptyStatus$"
- "KeptnEvaluationProvider$"
- "KeptnEvaluationProviderList$"
- "KeptnPhase$"
ignoreFields:
- "TypeMeta$"
- "EmptyStatus$"
- "KeptnPhase$"
render:
kubernetesVersion: 1.28
knownTypes:
Expand All @@ -22,3 +24,6 @@ render:
- name: MapCarrier
package: "go.opentelemetry.io/otel/propagation"
link: https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier
- name: UID
package: "k8s.io/apimachinery/pkg/types"
link: https://pkg.go.dev/k8s.io/[email protected]/pkg/types#UID
2 changes: 1 addition & 1 deletion .github/scripts/generate-crd-docs/templates/type.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ _Appears in:_
{{ end -}}

{{ range $type.Members -}}
| `{{ .Name }}` {{ if .Type.IsAlias }}_{{ markdownRenderTypeLink .Type.UnderlyingType }}_{{else}}_{{ markdownRenderType .Type }}_{{ end }} | {{ template "type_members" . }} |
| `{{ .Name }}` _{{ markdownRenderType .Type }}_ | {{ template "type_members" . }} |
{{- if index .Markers "kubebuilder:default" -}}
{{- with index (index .Markers "kubebuilder:default") 0 -}}
{{ .Value -}}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
uses: codecov/codecov-action@v4
with:
flags: ${{ matrix.config.name }}
token: ${{ secrets.CODECOV_TOKEN }}

build_image:
name: Build Docker Image
Expand Down Expand Up @@ -193,6 +194,8 @@ jobs:
name: Component Tests
needs: prepare_ci_run
uses: ./.github/workflows/component-test.yml
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

integration_tests:
name: Integration Tests
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/component-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Component Tests
on:
workflow_call:
secrets:
CODECOV_TOKEN:
required: false
env:
GO_VERSION: "~1.20"
defaults:
Expand Down Expand Up @@ -30,3 +33,4 @@ jobs:
uses: codecov/codecov-action@v4
with:
flags: component-tests
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: ./.github/actions/deploy-prometheus-on-cluster

- name: Install Chainsaw
uses: kyverno/[email protected].6
uses: kyverno/[email protected].7

- name: Run Scheduling Gates Integration Tests
if: inputs.scheduling-gates == 'gates_on' && inputs.allowed-namespaces == 'allowed_ns_off'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
- name: Trivy image scan scheduler
if: matrix.image == 'scheduler'
uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # 0.17.0
uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d # 0.18.0
with:
input: "images/${{ matrix.image }}-image.tar"
severity: 'CRITICAL,HIGH'
Expand All @@ -247,7 +247,7 @@ jobs:

- name: Trivy image scan
if: matrix.image != 'scheduler'
uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # 0.17.0
uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d # 0.18.0
with:
input: "images/${{ matrix.image }}-image.tar"
severity: 'CRITICAL,HIGH'
Expand Down
Loading

0 comments on commit 3065e9a

Please sign in to comment.