Skip to content

Commit

Permalink
more changes
Browse files Browse the repository at this point in the history
Signed-off-by: Giovanni Liva <[email protected]>
  • Loading branch information
thisthat committed Sep 5, 2023
1 parent 03fa1cd commit f2c41ce
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ with pre- and post-deployment evaluations and tasks.
It is an incubating project, under the umbrella of the
[Keptn Application Lifecycle working group](https://github.com/keptn/wg-app-lifecycle).

> **Note:** Keptn was developed under the code name of
"Keptn Lifecycle Controller" or "KLT" for short.
> **Note** Keptn was developed under the code name of
"Keptn Lifecycle Toolkit" or "KLT" for short.
The source code contains many vestiges of these names.

## Goals
Expand Down
4 changes: 2 additions & 2 deletions assets/logo/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Keptn Lifecycle Controller Logos
# Keptn Logos

This directory contains the Keptn Lifecycle Controller logos in different formats and colors.
This directory contains the Keptn logos in different formats and colors.

## Logos

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ that are relevant only to documentation

For usability considerations, we make the following exceptions:

* The main `README.md` file for the lifecycle-controller repository
* The main `README.md` file for the lifecycle-toolkit repository
includes this basic information as well as a link
to the full installation documentation which has more details.
* The Getting Started Guide also includes this information
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ weight: 300
---

Before using Keptn
as a contributor to the Keptn `lifecycle-controller` repository,
as a contributor to the Keptn `lifecycle-toolkit` repository,
it is expected that you comply with the guidelines while
making contributions towards the repository.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cascade:
**Keptn's Lifecycle Operator** is
a Kubernetes [operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
that automates the deployment and management
of the Keptn Lifecycle Controller components in a Kubernetes cluster.
of the Keptn components in a Kubernetes cluster.
The Keptn Lifecycle Operator contains several controllers for **Keptn CRDs**
and a **Mutating Webhook**.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/install/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Keptn and its dependencies are now installed and ready to use.

## Enable Keptn for your cluster

To enable the Keptn Lifecycle Controller in your cluster,
To enable the Keptn in your cluster,
annotate the Kubernetes
[Namespace](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/)
resource for each namespace in the cluster.
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-app/base/python-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
python:
httpRef:
url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/runtimes/python-runtime/samples/secrets.py
url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/python-runtime/samples/secrets.py
parameters:
map:
user: "myuser"
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-app/version-2/app-pre-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
function:
httpRef:
url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts
url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts
parameters:
map:
url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080
2 changes: 1 addition & 1 deletion examples/sample-app/version-3/app-pre-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
function:
httpRef:
url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts
url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts
parameters:
map:
url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080
2 changes: 1 addition & 1 deletion examples/support/argo/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Deploying an application using the Keptn Lifecycle Controller and ArgoCD
# Deploying an application using Keptn and ArgoCD

In this example, we will show you how to install our sample application *podtatohead*
using Keptn and [ArgoCD](https://argo-cd.readthedocs.io/en/stable/).
Expand Down
2 changes: 1 addition & 1 deletion examples/support/observability/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ kubectl port-forward -n keptn-lifecycle-toolkit-system svc/jaeger-query 16686

Afterwards, you can view the Jaeger UI in the browser at
[localhost:16686](http://localhost:16686).
There you should see the traces generated by the lifecycle controller,
There you should see the traces generated by the lifecycle operator,
which should look like this:

### Traces overview
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Keptn Lifecycle Controller Metrics",
"title": "Keptn Metrics",
"uid": "wlo2MpIVk",
"version": 13,
"weekStart": ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@
},
"timepicker": {},
"timezone": "",
"title": "Keptn Lifecycle Controller Metrics",
"title": "Keptn Metrics",
"uid": "wlo2MpIVk",
"version": 13,
"weekStart": ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,23 @@ func (a *PodMutatingWebhook) Handle(ctx context.Context, req admission.Request)
return admission.Errored(http.StatusBadRequest, err)
}

// check if Lifecycle Controller is enabled for this namespace
// check if Lifecycle Operator is enabled for this namespace
namespace := &corev1.Namespace{}
if err = a.Client.Get(ctx, types.NamespacedName{Name: req.Namespace}, namespace); err != nil {
logger.Error(err, "could not get namespace", "namespace", req.Namespace)
return admission.Errored(http.StatusInternalServerError, err)
}

if namespace.GetAnnotations()[apicommon.NamespaceEnabledAnnotation] != "enabled" {
logger.Info("namespace is not enabled for lifecycle controller", "namespace", req.Namespace)
return admission.Allowed("namespace is not enabled for lifecycle controller")
logger.Info("namespace is not enabled for lifecycle operator", "namespace", req.Namespace)
return admission.Allowed("namespace is not enabled for lifecycle operator")
}

// check the OwnerReference of the pod to see if it is supported and intended to be managed by KLT
ownerRef := a.getOwnerReference(pod.ObjectMeta)

if ownerRef.Kind == "" {
msg := "owner of pod is not supported by lifecycle controller"
msg := "owner of pod is not supported by lifecycle operator"
logger.Info(msg, "namespace", req.Namespace, "pod", req.Name)
return admission.Allowed(msg)
}
Expand Down
2 changes: 1 addition & 1 deletion runtimes/deno-runtime/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Keptn Lifecycle Controller - Deno Runtime
# Keptn - Deno Runtime

## Build

Expand Down

0 comments on commit f2c41ce

Please sign in to comment.