feat: improve naming (#961)

Co-authored-by: odubajDT <[email protected]> Co-authored-by: Florian Bacher <[email protected]> Co-authored-by: realanna <[email protected]>
keptn · Mar 3, 2023 · bd49357 · bd49357
1 parent ef35387
commit bd49357
Show file tree

Hide file tree

Showing 87 changed files with 619 additions and 915 deletions.
diff --git a/.github/.kubescape/exceptions.json b/.github/.kubescape/exceptions.json
@@ -10,7 +10,7 @@
         "designatorType": "Attributes",
         "attributes": {
           "kind": "ServiceAccount",
-          "name": "klc-controller-manager"
+          "name": "lifecycle-operator"
         }
       }
     ],

diff --git a/.github/actions/deploy-klt-on-cluster/action.yml b/.github/actions/deploy-klt-on-cluster/action.yml
@@ -62,23 +62,23 @@ runs:
       shell: bash
       run: |
         echo "Installing KLT using manifests"
-        sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/keptn-lifecycle-operator-manifest-test/release.yaml
-        sed -i 's/ghcr.keptn.sh\/keptn\/functions-runtime:.*/localhost:5000\/keptn\/functions-runtime:${{ inputs.functions_runtime_tag }}/g' ~/download/artifacts/keptn-lifecycle-operator-manifest-test/release.yaml
+        sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml
+        sed -i 's/ghcr.keptn.sh\/keptn\/functions-runtime:.*/localhost:5000\/keptn\/functions-runtime:${{ inputs.functions_runtime_tag }}/g' ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml
         kubectl create namespace keptn-lifecycle-toolkit-system
-        kubectl apply -f ~/download/artifacts/keptn-lifecycle-operator-manifest-test
+        kubectl apply -f ~/download/artifacts/lifecycle-operator-manifest-test
         
-        sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/klt-cert-manager-manifest-test/release.yaml
-        kubectl apply -f ~/download/artifacts/klt-cert-manager-manifest-test
-        kubectl rollout status deployment klt-cert-manager -n keptn-lifecycle-toolkit-system -w
+        sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/certificate-operator-manifest-test/release.yaml
+        kubectl apply -f ~/download/artifacts/certificate-operator-manifest-test
+        kubectl rollout status deployment certificate-operator -n keptn-lifecycle-toolkit-system -w
 
         sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/metrics-operator-manifest-test/release.yaml
         kubectl apply -f ~/download/artifacts/metrics-operator-manifest-test
-        kubectl rollout status deployment metrics-operator-controller -n keptn-lifecycle-toolkit-system -w
+        kubectl rollout status deployment metrics-operator -n keptn-lifecycle-toolkit-system -w
         
         sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/scheduler-manifest-test/release.yaml
         kubectl apply -f ~/download/artifacts/scheduler-manifest-test
-        kubectl rollout status deployment keptn-scheduler -n keptn-lifecycle-toolkit-system -w
-        kubectl rollout status deployment klc-controller-manager -n keptn-lifecycle-toolkit-system -w
+        kubectl rollout status deployment scheduler -n keptn-lifecycle-toolkit-system -w
+        kubectl rollout status deployment lifecycle-operator -n keptn-lifecycle-toolkit-system -w
 
     - name: Install lifecycle-toolkit with helm
       if: ${{ inputs.helm-install == 'true'  }}

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -70,13 +70,13 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     steps:
       - name: Check out code
@@ -111,15 +111,15 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
           - name: "functions-runtime"
             folder: "functions-runtime/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     steps:
       - name: Check out code
@@ -163,7 +163,7 @@ jobs:
           path: /tmp/${{ matrix.config.name }}-image.tar
 
       - name: Install controller-gen
-        if: matrix.config.name == 'keptn-lifecycle-operator' || matrix.config.name == 'metrics-operator'
+        if: matrix.config.name == 'lifecycle-operator' || matrix.config.name == 'metrics-operator'
         working-directory: ./${{ matrix.config.folder }}
         run: make controller-gen
 
@@ -226,15 +226,15 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
           - name: "functions-runtime"
             folder: "functions-runtime/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     permissions:
       packages: write # Needed for pushing images to the registry
@@ -280,7 +280,7 @@ jobs:
           cache-to: type=gha,scope=${{ github.ref_name }}-${{ matrix.config.name }}
 
       - name: Install controller-gen
-        if: matrix.config.name == 'keptn-lifecycle-operator' || matrix.config.name == 'klt-cert-manager' || matrix.config.name == 'metrics-operator'
+        if: matrix.config.name == 'lifecycle-operator' || matrix.config.name == 'certificate-operator' || matrix.config.name == 'metrics-operator'
         working-directory: ./${{ matrix.config.folder }}
         run: make controller-gen
 

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "scheduler"
             folder: "scheduler/"

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -27,13 +27,13 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     steps:
       - name: Check out code

diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml
@@ -66,15 +66,15 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
           - name: "functions-runtime"
             folder: "functions-runtime/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     steps:
       - name: Check out code

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,15 +43,15 @@ jobs:
     strategy:
       matrix:
         config:
-          - name: "keptn-lifecycle-operator"
+          - name: "lifecycle-operator"
             folder: "operator/"
           - name: "metrics-operator"
             folder: "metrics-operator/"
           - name: "scheduler"
             folder: "scheduler/"
           - name: "functions-runtime"
             folder: "functions-runtime/"
-          - name: "klt-cert-manager"
+          - name: "certificate-operator"
             folder: "klt-cert-manager/"
     runs-on: ubuntu-22.04
     permissions:

diff --git a/.github/workflows/security-scans.yml b/.github/workflows/security-scans.yml
@@ -179,10 +179,10 @@ jobs:
       matrix:
         image:
           - "functions-runtime"
-          - "keptn-lifecycle-operator"
+          - "lifecycle-operator"
           - "metrics-operator"
           - "scheduler"
-          - "klt-cert-manager"
+          - "certificate-operator"
     steps:
       - name: Download images
         id: download_images

diff --git a/docs/content/en/docs/concepts/metrics/_index.md b/docs/content/en/docs/concepts/metrics/_index.md
@@ -72,7 +72,7 @@ variable `EXPOSE_KEPTN_METRICS` in the metrics-operator manifest needs to be set
 is `true`. To access the metrics, use the following command:
 
 ```shell
-kubectl port-forward deployment/metrics-operator-controller 9999 -n keptn-lifecycle-toolkit-system
+kubectl port-forward deployment/metrics-operator 9999 -n keptn-lifecycle-toolkit-system
 ```
 
 and access the metrics via your browser with:

diff --git a/docs/content/en/docs/snippets/tasks/install.md b/docs/content/en/docs/snippets/tasks/install.md
@@ -8,7 +8,7 @@ In version 0.6.0 and later, you can install the Lifecycle Toolkit using the curr
 
 ```shell
 kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/v0.5.0/manifest.yaml
-kubectl wait --for=condition=Available deployment/klc-controller-manager -n keptn-lifecycle-toolkit-system --timeout=120s
+kubectl wait --for=condition=Available deployment/lifecycle-operator -n keptn-lifecycle-toolkit-system --timeout=120s
 ```
 
 <!---x-release-please-end-->
@@ -28,5 +28,5 @@ After that, you can install the Lifecycle Toolkit `<oldversion>` with:
 
 ```shell
 kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/<oldversion>/manifest.yaml
-kubectl wait --for=condition=Available deployment/klc-controller-manager -n keptn-lifecycle-toolkit-system --timeout=120s
+kubectl wait --for=condition=Available deployment/lifecycle-operator -n keptn-lifecycle-toolkit-system --timeout=120s
 ```
diff --git a/examples/Makefile b/examples/Makefile
@@ -10,7 +10,7 @@ install: install-observability install-argo
 	@echo "Create Namespace and install Keptn-lifecycle-toolkit"
 	@echo "-----------------------------------"
 	kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/v0.5.0/manifest.yaml #x-release-please-version
-	kubectl wait --for=condition=available deployment/klc-controller-manager -n keptn-lifecycle-toolkit-system --timeout=300s
+	kubectl wait --for=condition=available deployment/lifecycle-operator -n keptn-lifecycle-toolkit-system --timeout=300s
 
 .PHONY: install-observability
 install-observability:
@@ -75,7 +75,7 @@ restart-lifecycle-toolkit:
 	@echo "----------------------------------"
 	@echo "Restart Keptn Lifecycle Controller"
 	@echo "----------------------------------"
-	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" klc-controller-manager
-	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" klc-controller-manager --watch
-	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" keptn-scheduler -n keptn-lifecycle-toolkit-system
-	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" keptn-scheduler --watch
+	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" lifecycle-operator
+	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" lifecycle-operator --watch
+	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" scheduler -n keptn-lifecycle-toolkit-system
+	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" scheduler --watch
diff --git a/examples/support/observability/README.md b/examples/support/observability/README.md
@@ -55,7 +55,7 @@ in the `config` directory:
 kubectl apply -f config/otel-collector.yaml -n keptn-lifecycle-toolkit-system
 ```
 
-Also, please ensure that the `OTEL_COLLECTOR_URL` env vars of both the `klc-controller-manager`,
+Also, please ensure that the `OTEL_COLLECTOR_URL` env vars of both the `lifecycle-operator`,
 as well as the `keptn-scheduler` deployments are set appropriately.
 By default, they are set to `otel-collector:4317`, which should be the correct value for this tutorial.
 
@@ -75,11 +75,11 @@ can edit the Collector ConfigMap with the following command:
 kubectl edit configmap otel-collector-conf -n keptn-lifecycle-toolkit-system
 ```
 
-When the `otel-collector` pod is up and running, restart the `keptn-scheduler` and `klc-controller-manager` so they can
+When the `otel-collector` pod is up and running, restart the `keptn-scheduler` and `lifecycle-operator` so they can
 pick up the new configuration.
 
 ```shell
-kubectl rollout restart deployment -n keptn-lifecycle-toolkit-system keptn-scheduler klc-controller-manager
+kubectl rollout restart deployment -n keptn-lifecycle-toolkit-system keptn-scheduler lifecycle-operator
 ```
 
 ## Seeing the OpenTelemetry Collector in action

diff --git a/examples/support/observability/config/otel-collector.yaml b/examples/support/observability/config/otel-collector.yaml
@@ -21,7 +21,7 @@ data:
             - job_name: 'otel-collector'
               scrape_interval: 5s
               static_configs:
-                - targets: ['klc-controller-manager-metrics-service:2222']
+                - targets: ['lifecycle-operator-metrics-service:2222']
     processors:
     extensions:
       health_check: {}