Skip to content

Commit

Permalink
Merge branch 'main' into doc/adapt-keptn-context-env-var
Browse files Browse the repository at this point in the history
  • Loading branch information
bacherfl authored Nov 27, 2023
2 parents bb06f52 + aec1148 commit 05127d5
Show file tree
Hide file tree
Showing 87 changed files with 155 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .github/actions/deploy-keptn-on-cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ runs:
echo "installing with values.yaml file:"
cat tmp.yaml
helm install -n keptn-lifecycle-toolkit-system --create-namespace keptn ../../../chart \
helm install -n keptn-system --create-namespace keptn ../../../chart \
--values ./tmp.yaml \
--debug --wait --timeout 1m
2 changes: 1 addition & 1 deletion .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9407,7 +9407,7 @@ webhooks:
- lifecycle-operator
- key: kubernetes.io/metadata.name
operator: NotIn
values: ["cert-manager","keptn-lifecycle-toolkit-system","observability","monitoring"]
values: ["cert-manager","keptn-system","observability","monitoring"]
- key: kubernetes.io/metadata.name
operator: NotIn
values:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6989,7 +6989,7 @@ webhooks:
- lifecycle-operator
- key: kubernetes.io/metadata.name
operator: NotIn
values: ["cert-manager","keptn-lifecycle-toolkit-system","observability","monitoring"]
values: ["cert-manager","keptn-system","observability","monitoring"]
- key: kubernetes.io/metadata.name
operator: NotIn
values:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ build-deploy-scheduler:
$(MAKE) -C scheduler release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C scheduler push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH)
kubectl create namespace keptn-lifecycle-toolkit-system --dry-run=client -o yaml | kubectl apply -f -
kubectl create namespace keptn-system --dry-run=client -o yaml | kubectl apply -f -
kubectl apply -f scheduler/config/rendered/release.yaml

.PHONY: build-deploy-certmanager
build-deploy-certmanager:
$(MAKE) -C keptn-cert-manager release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C keptn-cert-manager push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
$(MAKE) -C keptn-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH)
kubectl create namespace keptn-lifecycle-toolkit-system --dry-run=client -o yaml | kubectl apply -f -
kubectl create namespace keptn-system --dry-run=client -o yaml | kubectl apply -f -
kubectl apply -f keptn-cert-manager/config/rendered/release.yaml

.PHONY: build-deploy-dev-environment
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ to install the latest release of Keptn:
```shell
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait
helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait
```

### Installation with only certain namespaces allowed
Expand All @@ -90,7 +90,7 @@ Keptn lifecycle orchestration is by default enabled for all namespaces except th
- `kube-public`
- `kube-node-lease`
- `cert-manager`
- `keptn-lifecycle-toolkit-system`
- `keptn-system`
- `observability`
- `monitoring`
- `<Keptn installation namespace>`
Expand All @@ -112,7 +112,7 @@ and add the values file to the helm installation command:
```shell
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --values values.yaml --create-namespace --wait
helm upgrade --install keptn keptn/keptn -n keptn-system --values values.yaml --create-namespace --wait
```

> **Note**
Expand Down Expand Up @@ -147,7 +147,7 @@ to install Keptn with scheduling gates enabled:
```shell
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --set schedulingGatesEnabled=true --create-namespace --wait
helm upgrade --install keptn keptn/keptn -n keptn-system --set schedulingGatesEnabled=true --create-namespace --wait
```

> **Note**
Expand Down Expand Up @@ -327,11 +327,11 @@ Please find more information in the [LICENSE](LICENSE) file.

<!-- markdownlint-disable-next-line MD033 -->
<a href="https://github.com/keptn/lifecycle-toolkit/graphs/contributors">
<!-- markdownlint-disable-next-line MD033 -->
<!-- markdownlint-disable-next-line MD033 MD045 -->
<img src="https://contrib.rocks/image?repo=keptn/lifecycle-toolkit" />
</a>

Made with [contrib.rocks](https://contrib.rocks).

<!-- markdownlint-disable-next-line MD033 MD013 -->
<!-- markdownlint-disable-next-line MD033 MD013 MD045 -->
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=858843d8-8da2-4ce5-a325-e5321c770a78" />
2 changes: 1 addition & 1 deletion dashboards/grafana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ If you prefer to prepare the dashboards for the examples and importing them as j
make import-json
```

<!-- markdownlint-disable-next-line MD033 MD013 -->
<!-- markdownlint-disable-next-line MD033 MD013 MD045 -->
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=858843d8-8da2-4ce5-a325-e5321c770a78" />
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/ke
How it works:

* The certificate is created as a secret
in the `keptn-lifecycle-toolkit-system` namespace
in the `keptn-system` namespace
with a renewal threshold of 12 hours.
* If the certificate expires,
the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/keptn-cert-manager/README.md)
Expand All @@ -49,11 +49,11 @@ because of an invalid certificate.
To solve this, delete the certificate and restart the operator.

The Keptn cert-manager certificate is stored as a secret in the
`keptn-lifecycle-toolkit-system` namespace.
`keptn-system` namespace.
To retrieve it:

```shell
kubectl get secrets -n keptn-lifecycle-toolkit-system
kubectl get secrets -n keptn-system
```

This returns something like:
Expand All @@ -67,5 +67,5 @@ Specify the `NAME` of the Keptn certificate (`keptn-certs` in this case)
to delete the Keptn certificate:

```shell
kubectl delete secret keptn-certs -n keptn-lifecycle-toolkit-system
kubectl delete secret keptn-certs -n keptn-system
```
18 changes: 9 additions & 9 deletions docs/content/en/docs/getting-started/observability.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Install Keptn using Helm:
```shell
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait
helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait
```

Keptn will need to know where to send OpenTelemetry traces.
Expand All @@ -70,9 +70,9 @@ apiVersion: options.keptn.sh/v1alpha1
kind: KeptnConfig
metadata:
name: keptnconfig-sample
namespace: keptn-lifecycle-toolkit-system
namespace: keptn-system
spec:
OTelCollectorUrl: 'jaeger-collector.keptn-lifecycle-toolkit-system.svc.cluster.local:4317'
OTelCollectorUrl: 'jaeger-collector.keptn-system.svc.cluster.local:4317'
keptnAppCreationRequestTimeoutSeconds: 30
```
Expand Down Expand Up @@ -248,7 +248,7 @@ To see these raw metrics:

```shell
SERVICE=$(kubectl get svc -l control-plane=lifecycle-operator -A -ojsonpath="{.items[0].metadata.name}")
kubectl -n keptn-lifecycle-toolkit-system port-forward svc/$SERVICE 2222
kubectl -n keptn-system port-forward svc/$SERVICE 2222
```

Note that this command will (and should) continue to run in your terminal windows.
Expand Down Expand Up @@ -315,14 +315,14 @@ Install Jaeger to store and visualise the deployment traces generated by Keptn:
kubectl create namespace observability
kubectl apply -f https://github.com/jaegertracing/jaeger-operator/releases/download/v1.46.0/jaeger-operator.yaml -n observability
kubectl wait --for=condition=available deployment/jaeger-operator -n observability --timeout=300s
kubectl apply -f jaeger.yaml -n keptn-lifecycle-toolkit-system
kubectl wait --for=condition=available deployment/jaeger -n keptn-lifecycle-toolkit-system --timeout=300s
kubectl apply -f jaeger.yaml -n keptn-system
kubectl wait --for=condition=available deployment/jaeger -n keptn-system --timeout=300s
```

Port-forward to access Jaeger:

```shell
kubectl -n keptn-lifecycle-toolkit-system port-forward svc/jaeger-query 16686
kubectl -n keptn-system port-forward svc/jaeger-query 16686
```

Jaeger is available on `http://localhost:16686`
Expand Down Expand Up @@ -377,7 +377,7 @@ stringData:
"typeName":"Jaeger",
"typeLogoUrl":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg",
"access":"proxy",
"url":"http://jaeger-query.keptn-lifecycle-toolkit-system.svc.cluster.local:16686",
"url":"http://jaeger-query.keptn-system.svc.cluster.local:16686",
"user":"",
"database":"",
"basicAuth":false,
Expand Down Expand Up @@ -415,7 +415,7 @@ prometheus:
- job_name: "scrape_klt"
scrape_interval: 5s
static_configs:
- targets: ['lifecycle-operator-metrics-service.keptn-lifecycle-toolkit-system.svc.cluster.local:2222']
- targets: ['lifecycle-operator-metrics-service.keptn-system.svc.cluster.local:2222']
```
```shell
Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/guides/dora.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ To view DORA metrics, run the following two commands:
- Retrieve the service name with:

```shell
kubectl -n keptn-lifecycle-toolkit-system get service \
kubectl -n keptn-system get service \
-l control-plane=lifecycle-operator
```

- Then port-forward to the name of your service:

```shell
kubectl -n keptn-lifecycle-toolkit-system port-forward \
kubectl -n keptn-system port-forward \
service/<YOURNAME> 2222
```

Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/guides/evaluatemetrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Note the following:
on all namespaces in the cluster,
create `KeptnMetricsProvider` and `KeptnMetric` resources
in a centralized namespace
such as `keptn-lifecycle-toolkit-system`.
such as `keptn-system`.

To configure a data provider into your Keptn cluster:

Expand Down Expand Up @@ -223,7 +223,7 @@ $ kubectl get --raw "/apis/custom.metrics.k8s.io/v1beta2/namespaces/podtato-kube
{
"describedObject": {
"kind": "KeptnMetric",
"namespace": "keptn-lifecycle-toolkit-system",
"namespace": "keptn-system",
"name": "keptnmetric-sample",
"apiVersion": "metrics.keptn.sh/v1beta1"
},
Expand Down
12 changes: 6 additions & 6 deletions docs/content/en/docs/guides/otel.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ you must have the following on your cluster:

- The Prometheus Operator must have the required permissions
to watch resources of your Keptn namespace
(default is `keptn-lifecycle-toolkit-system`).
(default is `keptn-system`).
See
[Setup for Monitoring other Namespaces](https://prometheus-operator.dev/docs/kube/monitoring-other-namespaces/)).

Expand Down Expand Up @@ -113,15 +113,15 @@ using this manifest, the command is:

```shell
kubectl apply -f config/otel-collector.yaml \
-n keptn-lifecycle-toolkit-system
-n keptn-system
```

Use the following command to confirm that the pod
for the `otel-collector` deployment is up and running:

```shell
$ kubectl get pods -lapp=opentelemetry \
-n keptn-lifecycle-toolkit-system
-n keptn-system
NAME READY STATUS RESTARTS AGE
otel-collector-6fc4cc84d6-7hnvp 1/1 Running 0 92m
Expand All @@ -133,7 +133,7 @@ you can edit the Collector `ConfigMap` with the following command:

```shell
kubectl edit configmap otel-collector-conf \
-n keptn-lifecycle-toolkit-system
-n keptn-system
```

When the `otel-collector` pod is up and running,
Expand All @@ -142,7 +142,7 @@ so they can pick up the new configuration:

```shell
kubectl rollout restart deployment \
-n keptn-lifecycle-toolkit-system keptn-scheduler lifecycle-operator
-n keptn-system keptn-scheduler lifecycle-operator
```

Keptn begins to collect OpenTelemetry metrics
Expand All @@ -157,7 +157,7 @@ via port `9999` of the Keptn metrics-operator.
To access the metrics, use the following command:

```shell
kubectl port-forward deployment/metrics-operator 9999 -n keptn-lifecycle-toolkit-system
kubectl port-forward deployment/metrics-operator 9999 -n keptn-system
```

You can access the metrics from your browser at: `http://localhost:9999`
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Some considerations for Keptn:
resources that are used for pre- and post-deployment
can reference metrics from any namespace.
So you can create `KeptnMetrics` in a centralized namespace
(such as `keptn-lifecycle-toolkit-system`)
(such as `keptn-system`)
and access those metrics in evaluations on all namespaces in the cluster.
* Analysis related resources
([Analysis](../../reference/crd-reference/analysis.md),
Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/docs/installation/uninstall.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ you can uninstall it together with all CRDs, webhooks and
custom resources with using the following command:

```shell
helm uninstall keptn -n keptn-lifecycle-toolkit-system
helm uninstall keptn -n keptn-system
```

If your Keptn instance is not installed in the
`keptn-lifecycle-toolkit-system` namespace, please substitute
`keptn-system` namespace, please substitute
it with your custom one.
4 changes: 2 additions & 2 deletions docs/content/en/docs/installation/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ by running the same command sequence used to install Keptn:
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn \
-n keptn-lifecycle-toolkit-system --create-namespace --wait
-n keptn-system --create-namespace --wait
```

Use the `--set` flag or download and edit the `values.yaml` file
Expand Down Expand Up @@ -59,7 +59,7 @@ kubectl delete -f \
```shell
helm repo add keptn https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait
helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait
```

For information about advanced installation options, refer to
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/migrate/metrics-observe.md
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ The process is:
name: my-project-ad
namespace: keptn-lifecycle-poc
args:
ns: keptn-lifecycle-toolkit-system
ns: keptn-system
project: my-project
timeframe:
from: "2023-09-14T11:20:19Z"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ apiVersion: metrics.keptn.sh/v1beta1
kind: AnalysisDefinition
metadata:
name: ed-my-proj-dev-svc1
namespace: keptn-lifecycle-toolkit-system
namespace: keptn-system
spec:
objectives:
- analysisValueTemplateRef:
name: response-time-p95
namespace: keptn-lifecycle-toolkit-system
namespace: keptn-system
target:
failure:
<operator>:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ but the `KeptnEvaluationDefinition` resources
can reference metrics from any namespace in the cluster.
This means that you can create `KeptnMetricsProvider`
and `KeptnMetric` resources
in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`)
in a centralized namespace (e.g. in `keptn-system`)
and use those metrics in evaluations
on all namespaces in the cluster.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/reference/crd-reference/metric.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ resources that are used for pre- and post-deployment evaluations.
from any namespace.
This means that you can create `KeptnMetricsProvider`
and `KeptnMetric` resources
in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`)
in a centralized namespace (e.g. in `keptn-system`)
and access those metrics in evaluations
on all namespaces in the cluster.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ resources that are used for pre- and post-deployment evaluations.
from any namespace.
This means that you can create `KeptnMetricsProvider`
and `KeptnMetric` resources
in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`)
in a centralized namespace (e.g. in `keptn-system`)
and access those metrics in evaluations
on all namespaces in the cluster.

Expand Down
2 changes: 1 addition & 1 deletion examples/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# renovate: datasource=github-tags depName=jaegertracing/jaeger-operator
JAEGER_VERSION ?= v1.51.0
TOOLKIT_NAMESPACE ?= keptn-lifecycle-toolkit-system
TOOLKIT_NAMESPACE ?= keptn-system
PODTATO_NAMESPACE ?= podtato-kubectl
GRAFANA_PORT_FORWARD ?= 3000

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ The deployment should fail because of too few cpu resources

* This should only change one service, you can see that only this changed in the trace

<!-- markdownlint-disable-next-line MD033 MD013 -->
<!-- markdownlint-disable-next-line MD033 MD013 MD045 -->
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=858843d8-8da2-4ce5-a325-e5321c770a78" />
2 changes: 1 addition & 1 deletion examples/support/argo/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LFC_NAMESPACE ?= keptn-lifecycle-toolkit-system
LFC_NAMESPACE ?= keptn-system
PODTATO_NAMESPACE ?= podtato-kubectl
ARGO_NAMESPACE ?= argocd
# renovate: datasource=github-tags depName=argoproj/argo-cd
Expand Down
Loading

0 comments on commit 05127d5

Please sign in to comment.