fix(logs): adjust naming for operator to work with -operator release … (#1251)

* fix(logs): adjust naming for operator to work with -operator release name

* adjust test

Author: timojohlo

logs/README.md

@@ -119,7 +119,6 @@ The **Logs** Plugin comes with a [Failover Connector](https://github.com/open-te
 | opentelemetry-operator.manager.image.tag | string | `"v0.131.0"` | overrides the default tag repository for the OpenTelemetry Operator image. |
 | opentelemetry-operator.manager.serviceMonitor.enabled | bool | `true` | Enable serviceMonitor for Prometheus metrics scrape |
 | opentelemetry-operator.manager.serviceMonitor.extraLabels | object | `{}` | Additional labels on the ServiceMonitor |
-| opentelemetry-operator.nameOverride | string | `"operator"` | Provide a name in place of the default name `opentelemetry-operator`. |
 | testFramework.enabled | bool | `true` | Activates the Helm chart testing framework. |
 | testFramework.image.registry | string | `"ghcr.io"` | Defines the image registry for the test framework. |
 | testFramework.image.repository | string | `"cloudoperators/greenhouse-extensions-integration-test"` | Defines the image repository for the test framework. |

logs/charts/Chart.yaml

@@ -3,7 +3,7 @@
 
 apiVersion: v2
 name: logs
-version: 0.0.3
+version: 0.0.4
 description: OpenTelemetry Operator Helm chart for Kubernetes
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
 type: application

logs/charts/ci/test-values.yaml

@@ -3,7 +3,6 @@
 
 opentelemetry-operator:
   enabled: true
-  nameOverride: "operator"
   crds:
     create: false
   admissionWebhooks:

logs/charts/templates/tests/test-opentelemetry-config.yaml

@@ -22,11 +22,11 @@ data:
     {{- if ".Values.opentelemetry-operator.enabled" }}
     @test "Verify successful deployment and running status of the {{ .Release.Name }} pod" {
         verify "there is 1 deployment named '{{ .Release.Name }}'"
-        try "at most 4 times every 5s to get pods named '{{ .Release.Name }}-[a-zA-Z0-9]{9,10}-[a-zA-Z0-9]{5}$' and verify that '.status.phase' is 'running'" 
+        try "at most 4 times every 5s to get pods named '{{ .Release.Name }}-opentelemetry-operator-[a-zA-Z0-9]{9,10}-[a-zA-Z0-9]{5}$' and verify that '.status.phase' is 'running'" 
     }
 
-    @test "Verify successful deployment of the {{ .Release.Name }}-operator service" {
-        verify "there is 1 service named '{{ .Release.Name }}-operator\$'"
+    @test "Verify successful deployment of the {{ .Release.Name }}-opentelemetry-operator service" {
+        verify "there is 1 service named '{{ .Release.Name }}-opentelemetry-operator\$'"
     }
     {{- end -}}
 

logs/charts/values.yaml

@@ -8,9 +8,6 @@ commonLabels: {}
 opentelemetry-operator:
   # -- Set to true to enable the installation of the OpenTelemetry Operator.
   enabled: true
-  # -- Provide a name in place of the default name `opentelemetry-operator`.
-  nameOverride: "operator"
-
   crds:
     # This is required because there is no other Plugin that would install them, and because automatic CRD installs are not supported due to a limitation with helm, see [HIP0011](https://github.com/helm/community/blob/main/hips/hip-0011.md).
     # --  If you want to use the upstream CRDs, set this variable to `true``.

logs/plugindefinition.yaml

@@ -6,14 +6,14 @@ kind: PluginDefinition
 metadata:
   name: logs
 spec:
-  version: 0.11.15
+  version: 0.11.16
   displayName: Logs
   description: Observability framework for instrumenting, generating, collecting, and exporting logs.
   icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/logs/logo.png
   helmChart:
     name: logs
     repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-    version: 0.0.3
+    version: 0.0.4
   options:
     - default: true
       description: Set to true to enable the installation of the OpenTelemetry Operator.