Skip to content

Commit

Permalink
Merge branch 'main' into some-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mowies authored Nov 7, 2023
2 parents 73d03af + b935cd7 commit 89d6a56
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/swagger-ui/
CODEOWNERS
CONTRIBUTORS.md
CHANGELOG.md
ignore$
\.editorconfig$
\.gitkeep$
Expand Down
36 changes: 35 additions & 1 deletion .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ eventobject
docsembed
dco
codespace
certiticatehandler
certificatehandler
golangci
hellopy
htmltest
Expand Down Expand Up @@ -205,3 +205,37 @@ timeframe
toml
usecase
webhooknamespaces
Datasources
eventsender
google
kics
schedulinggateshandler
taskdefinitionhandler
thanosruler
tracerfactory
webhookmanager
workloadsstate
timezone
undeploy
toc
tmp
timespan
timeseries
timepicker
thschue
threshold
taskcontext
taskdef
taskdefinitionhandler
taskparameters
taskstatus
vcluster
versioning
webhookcainjection
workloadsstate
workloadstatus
workloadversion
youtube
yourregistry
YOURNAME
yannh
2 changes: 1 addition & 1 deletion docs/content/en/docs/implementing/evaluatemetrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ This section shows how to do that.

Metrics can also be displayed on a Grafana or other dashboard
or they can be exposed as OpenTelemetry metrics; see
[Access Keptn metrics as OpenTelementry metrics](otel.md/#access-keptn-metrics-as-opentelemetry-metrics)
[Access Keptn metrics as OpenTelemetry metrics](otel.md/#access-keptn-metrics-as-opentelemetry-metrics)
for instructions.

### Retrieve KeptnMetric values with kubectl and the KeptnMetric API
Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/yaml-crd-ref/analysisdefinition.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ spec:
* **keyObjective** -- If set to `true`,
the entire analysis fails if this objective fails
* **totalScore** (required) --
* **passPercentage** -- threshhold to reach for the full analysis
* **passPercentage** -- threshold to reach for the full analysis
(all objectives) to pass
<!-- markdownlint-disable -->
* **warningPercentage** -- threshhold to reach
* **warningPercentage** -- threshold to reach
for the full analysis (all objectives) to pass with `warning` status

## Usage
Expand Down
4 changes: 2 additions & 2 deletions lifecycle-operator/apis/lifecycle/v1alpha2/common/phases.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var phases = []KeptnPhaseType{
PhaseCreateTask,
PhaseCreateApp,
PhaseCreateWorkload,
PhaseCreateWorklodInstance,
PhaseCreateWorkloadInstance,
PhaseCreateAppVersion,
PhaseCompleted,
PhaseDeprecated,
Expand Down Expand Up @@ -93,7 +93,7 @@ var (
PhaseCreateTask = KeptnPhaseType{LongName: "Create Task", ShortName: "CreateTask"}
PhaseCreateApp = KeptnPhaseType{LongName: "Create App", ShortName: "CreateApp"}
PhaseCreateWorkload = KeptnPhaseType{LongName: "Create Workload", ShortName: "CreateWorkload"}
PhaseCreateWorklodInstance = KeptnPhaseType{LongName: "Create WorkloadInstance", ShortName: "CreateWorkloadInstance"}
PhaseCreateWorkloadInstance = KeptnPhaseType{LongName: "Create WorkloadInstance", ShortName: "CreateWorkloadInstance"}
PhaseCreateAppVersion = KeptnPhaseType{LongName: "Create AppVersion", ShortName: "CreateAppVersion"}
PhaseCompleted = KeptnPhaseType{LongName: "Completed", ShortName: "Completed"}
PhaseDeprecated = KeptnPhaseType{LongName: "Deprecated", ShortName: "Deprecated"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func MergeMaps(m1 map[string]string, m2 map[string]string) map[string]string {
return merged
}

// IsOwnerSupported returns whether the owner of the given object is supported to be considered a KeptnWorklooad
// IsOwnerSupported returns whether the owner of the given object is supported to be considered a KeptnWorkload
func IsOwnerSupported(owner metav1.OwnerReference) bool {
return owner.Kind == "ReplicaSet" || owner.Kind == "Deployment" || owner.Kind == "StatefulSet" || owner.Kind == "DaemonSet" || owner.Kind == "Rollout"
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func GetRuntimeMountPath(def *klcv1alpha3.KeptnTaskDefinition) string {
return path
}

// check if either the funtions or container spec is set
// check if either the functions or container spec is set
func SpecExists(definition *klcv1alpha3.KeptnTaskDefinition) bool {
if definition == nil {
return false
Expand Down

0 comments on commit 89d6a56

Please sign in to comment.