Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change klt to keptn for annotations and certs #2229

Merged
merged 5 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ metadata:
name: keptnapps.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -402,7 +402,7 @@ metadata:
name: keptnappcreationrequests.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -465,7 +465,7 @@ metadata:
name: keptnappversions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -1284,7 +1284,7 @@ metadata:
name: keptnconfigs.options.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -1354,7 +1354,7 @@ metadata:
name: keptnevaluations.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -1739,7 +1739,7 @@ metadata:
name: keptnevaluationdefinitions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -1932,7 +1932,7 @@ metadata:
name: keptnevaluationproviders.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -2114,7 +2114,7 @@ metadata:
name: keptntasks.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -2526,7 +2526,7 @@ metadata:
name: keptntaskdefinitions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -4246,7 +4246,7 @@ metadata:
name: keptnworkloads.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -4538,7 +4538,7 @@ metadata:
name: keptnworkloadinstances.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down Expand Up @@ -5328,7 +5328,7 @@ metadata:
name: analyses.metrics.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: metrics.keptn.sh
Expand Down Expand Up @@ -5514,7 +5514,7 @@ metadata:
name: analysisdefinitions.metrics.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: metrics.keptn.sh
Expand Down Expand Up @@ -5871,7 +5871,7 @@ metadata:
name: analysisvaluetemplates.metrics.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: metrics.keptn.sh
Expand Down Expand Up @@ -5954,7 +5954,7 @@ metadata:
name: keptnmetrics.metrics.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: metrics.keptn.sh
Expand Down Expand Up @@ -6309,7 +6309,7 @@ metadata:
name: keptnmetricsproviders.metrics.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: metrics.keptn.sh
Expand Down Expand Up @@ -7364,7 +7364,7 @@ rules:
- apiGroups:
- ""
resourceNames:
- klt-certs
- keptn-certs
resources:
- secrets
verbs:
Expand Down Expand Up @@ -8229,7 +8229,7 @@ kind: MutatingWebhookConfiguration
metadata:
name: lifecycle-mutating-webhook-configuration
annotations:
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
keptn.sh/inject-cert: "true"
app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
Expand Down Expand Up @@ -8286,7 +8286,7 @@ kind: ValidatingWebhookConfiguration
metadata:
name: lifecycle-validating-webhook-configuration
annotations:
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
keptn.sh/inject-cert: "true"
helm.sh/chart: lifecycle-operator-0.1.0
Expand Down Expand Up @@ -8322,7 +8322,7 @@ kind: ValidatingWebhookConfiguration
metadata:
name: metrics-validating-webhook-configuration
annotations:
cert-manager.io/inject-ca-from: 'helmtests/klt-certs'
cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
labels:
keptn.sh/inject-cert: "true"
helm.sh/chart: metrics-operator-0.1.0
Expand Down
6 changes: 3 additions & 3 deletions docs/content/en/docs/architecture/cert-manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ This returns something like:

```shell
NAME TYPE DATA AGE
klt-certs Opaque 5 4d23h
keptn-certs Opaque 5 4d23h
```

Specify the `NAME` of the Keptn certificate (`klt-certs` in this case)
Specify the `NAME` of the Keptn certificate (`keptn-certs` in this case)
to delete the Keptn certificate:

```shell
kubectl delete secret klt-certs -n keptn-lifecycle-toolkit-system
kubectl delete secret keptn-certs -n keptn-lifecycle-toolkit-system
```
2 changes: 1 addition & 1 deletion docs/content/en/docs/implementing/integrate/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ metadata:
name: podtato-head
namespace: podtato-kubectl
annotations:
app.kubernetes.io/managed-by: "klt"
app.kubernetes.io/managed-by: "keptn"
spec:
version: "<version string based on a hash of all containing workloads>"
workloads:
Expand Down
6 changes: 3 additions & 3 deletions docs/content/en/docs/operate/cert-manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ These are the CRs for `cert-manager.io` to be applied to your cluster:
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: klt-certs
name: keptn-certs
namespace: <your-namespace>
spec:
dnsNames:
Expand All @@ -48,7 +48,7 @@ spec:
issuerRef:
kind: Issuer
name: klt-selfsigned-issuer
secretName: klt-certs
secretName: keptn-certs
---
apiVersion: cert-manager.io/v1
kind: Issuer
Expand All @@ -63,7 +63,7 @@ Note the following about these fields:

* The `apiVersion` field refers to the API for the cert-manager.
* The value of the `.spec.secretName` field as well as the `.metadata.name` of the `Certificate` CR
must be `klt-certs`.
must be `keptn-certs`.
* Substitute the namespace placeholders with your namespace, where Keptn is installed.

See the [CA Injector](https://cert-manager.io/docs/concepts/ca-injector/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rules:
- apiGroups:
- ""
resourceNames:
- klt-certs
- keptn-certs
resources:
- secrets
verbs:
Expand Down
2 changes: 1 addition & 1 deletion klt-cert-manager/config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ rules:
- apiGroups:
- ""
resourceNames:
- klt-certs
- keptn-certs
resources:
- secrets
verbs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type KeptnWebhookCertificateReconciler struct {
// +kubebuilder:rbac:groups="apps",resources=deployments,verbs=get;list;watch;

//role
// +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=get;update;patch,resourceNames=klt-certs
// +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=get;update;patch,resourceNames=keptn-certs
// +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=create;list;watch

// Reconcile is part of the main kubernetes reconciliation loop which aims to
Expand Down
2 changes: 1 addition & 1 deletion klt-cert-manager/pkg/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

const (
SuccessDuration = 3 * time.Hour
SecretName = "klt-certs"
SecretName = "keptn-certs"
CertificatesSecretEmptyErr = "certificates secret is empty"
)

Expand Down
2 changes: 1 addition & 1 deletion lifecycle-operator/chart/templates/keptnapp-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnapps.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnappcreationrequests.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnappversions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
2 changes: 1 addition & 1 deletion lifecycle-operator/chart/templates/keptnconfig-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnconfigs.options.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnevaluations.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnevaluationdefinitions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnevaluationproviders.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
2 changes: 1 addition & 1 deletion lifecycle-operator/chart/templates/keptntask-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: keptntasks.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptntaskdefinitions.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnworkloads.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keptnworkloadinstances.lifecycle.keptn.sh
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
crdGroup: lifecycle.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: MutatingWebhookConfiguration
metadata:
name: lifecycle-mutating-webhook-configuration
annotations:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
keptn.sh/inject-cert: "true"
app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ValidatingWebhookConfiguration
metadata:
name: lifecycle-validating-webhook-configuration
annotations:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/klt-certs'
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
labels:
keptn.sh/inject-cert: "true"
{{- include "chart.labels" . | nindent 4 }}
Expand Down
Loading
Loading