From 957f3b14aac8a7d54dcb37f13ad2088f34d803a7 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:35:15 +0200 Subject: [PATCH] feat: use Sumo Logic repository for all images (#3677) * feat: use Sumo Logic repository for all images Signed-off-by: Dominik Rosiek * feat: use Sumo Logic repository for all images Signed-off-by: Dominik Rosiek * chore: changelog Signed-off-by: Dominik Rosiek * chore: update prometheus image Signed-off-by: Dominik Rosiek * chore: regenerate golden files Signed-off-by: Dominik Rosiek * chore: fix typo Signed-off-by: Dominik Rosiek --------- Signed-off-by: Dominik Rosiek --- .changelog/3677.changed.txt | 1 + deploy/helm/sumologic/README.md | 21 +++++++---- deploy/helm/sumologic/values.yaml | 35 ++++++++++++++----- .../goldenfile/cleanup/basic.output.yaml | 2 +- .../sumologic-mock-no-secret.output.yaml | 2 +- .../additional-complex.output.yaml | 2 +- .../logs_otc_daemonset/additional.output.yaml | 2 +- .../logs_otc_daemonset/basic.output.yaml | 2 +- .../logs_otc_daemonset/complex.output.yaml | 2 +- .../metrics-server/basic.output.yaml | 20 +++++------ .../instrumentation.output.yaml | 16 ++++----- 11 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 .changelog/3677.changed.txt diff --git a/.changelog/3677.changed.txt b/.changelog/3677.changed.txt new file mode 100644 index 0000000000..1e91523c64 --- /dev/null +++ b/.changelog/3677.changed.txt @@ -0,0 +1 @@ +feat: use Sumo Logic repository for all images \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index f89c277791..96d485e594 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -180,7 +180,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `sumologic.setup.job.image.repository` | Image repository for Sumo Logic setup job docker container. | `public.ecr.aws/sumologic/kubernetes-setup` | | `sumologic.setup.job.image.tag` | Image tag for Sumo Logic setup job docker container. | `3.13.0` | | `sumologic.setup.job.image.pullPolicy` | Image pullPolicy for Sumo Logic docker container. | `IfNotPresent` | -| `sumologic.setup.job.initContainerImage.repository` | Image repository for Sumo Logic setup job docker init container. | `public.ecr.aws/docker/library/busybox` | +| `sumologic.setup.job.initContainerImage.repository` | Image repository for Sumo Logic setup job docker init container. | `public.ecr.aws/sumologic/busybox` | | `sumologic.setup.job.initContainerImage.tag` | Image tag for Sumo Logic setup job docker init container. | `latest` | | `sumologic.setup.job.nodeSelector` | Node selector for sumologic setup job. [See help.sumologic.com/docs/send-data/kubernetes/best-practices for more information.](https://help.sumologic.com/docs/send-data/kubernetes/best-practices/) | `{}` | | `sumologic.setup.job.tolerations` | Add tolerations for the setup Job. | `[]` | @@ -208,6 +208,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `kube-prometheus-stack.grafana.enabled` | If true, deploy the grafana sub-chart. | `false` | | `kube-prometheus-stack.grafana.defaultDashboardsEnabled` | Deploy default dashboards. These are loaded using the sidecar. | `false` | | `kube-prometheus-stack.prometheusOperator.enabled` | Enable prometheus-operator | `false` | +| `kube-prometheus-stack.prometheusOperator.image.repository` | Prometheus Operator container image repository | `public.ecr.aws/sumologic/prometheus-operator` | | `kube-prometheus-stack.prometheusOperator.podLabels` | Additional labels for prometheus operator pods. | `{}` | | `kube-prometheus-stack.prometheusOperator.podAnnotations` | Additional annotations for prometheus operator pods. | `{}` | | `kube-prometheus-stack.prometheusOperator.resources` | Resource limits for prometheus operator. Uses sub-chart defaults. | `{"limits": {"cpu": "200m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}` | @@ -215,11 +216,13 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `kube-prometheus-stack.prometheusOperator.admissionWebhooks.enabled` | Create PrometheusRules admission webhooks. Mutating webhook will patch PrometheusRules objects indicating they were validated. Validating webhook will check the rules syntax. | `false` | | `kube-prometheus-stack.prometheusOperator.tls.enabled` | Enable TLS in prometheus operator. | `false` | | `kube-prometheus-stack.kube-state-metrics.fullnameOverride` | Used to override the chart's full name. | `Nil` | +| `kube-prometheus-stack.kube-state-metrics.image.repository` | Kube State Metrics container image repository. | `public.ecr.aws/sumologic/kube-state-metrics` | | `kube-prometheus-stack.kube-state-metrics.resources` | Resource limits for kube state metrics. Uses sub-chart defaults. | `{"limits": {"cpu": "100m", "memory": "64Mi"}, "requests": {"cpu": "10m", "memory": "32Mi"}}` | | `kube-prometheus-stack.kube-state-metrics.customLabels` | Custom labels to apply to service, deployment and pods. Uses sub-chart defaults. | `{}` | | `kube-prometheus-stack.kube-state-metrics.podAnnotations` | Additional annotations for pods in the DaemonSet. Uses sub-chart defaults. | `{}` | | `kube-prometheus-stack.prometheus.enabled` | Enable Prometheus | `false` | | `kube-prometheus-stack.prometheus.additionalServiceMonitors` | List of ServiceMonitor objects to create. | See [values.yaml] | +| `kube-prometheus-stack.prometheus.prometheusSpec.image.repository` | Container repository for Prometheus. | `public.ecr.aws/sumologic/prometheus` | | `kube-prometheus-stack.prometheus.prometheusSpec.resources` | Resource limits for prometheus. Uses sub-chart defaults. | `{"limits": {"cpu": "2000m", "memory": "8Gi"}, "requests": {"cpu": "500m", "memory": "1Gi"}}` | | `kube-prometheus-stack.prometheus.prometheusSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod. | See [values.yaml] | | `kube-prometheus-stack.prometheus.prometheusSpec.podMetadata.labels` | Add custom pod labels to prometheus pods | `{}` | @@ -227,6 +230,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `kube-prometheus-stack.prometheus.prometheusSpec.remoteWrite` | If specified, the remote_write spec. | See [values.yaml] | | `kube-prometheus-stack.prometheus.prometheusSpec.walCompression` | Enables walCompression in Prometheus | `true` | | `kube-prometheus-stack.prometheus-node-exporter.fullnameOverride` | Used to override the chart's full name. | `Nil` | +| `kube-prometheus-stack.prometheus-node-exporter.image.repository` | Prometheus Node Exporter container image repository. | `public.ecr.aws/sumologic/node-exporter` | | `kube-prometheus-stack.prometheus-node-exporter.podLabels` | Additional labels for prometheus-node-exporter pods. | `{}` | | `kube-prometheus-stack.prometheus-node-exporter.podAnnotations` | Additional annotations for prometheus-node-exporter pods. | `{}` | | `kube-prometheus-stack.prometheus-node-exporter.resources` | Resource limits for node exporter. Uses sub-chart defaults. | `{"limits": {"cpu": "200m", "memory": "50Mi"}, "requests": {"cpu": "100m", "memory": "30Mi"}}` | @@ -270,13 +274,14 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `falco.imagePullSecrets` | Pull secrets for falco images. For more information on using Kubernetes secrets with container registries please refer to [Creating a Secret with a Docker config at kubernetes.io](https://kubernetes.io/docs/concepts/containers/images/#creating-a-secret-with-a-docker-config). | `[]` | | `falco.customRules` | Additional falco rules related to Sumo Logic Kubernetes Collection | See [values.yaml] | | `falco.driver.kind` | Tell Falco which driver to use. Available options: module (kernel driver) and ebpf (eBPF probe). Set to `ebpf` for GKE | `module` | -| `falco.driver.loader.initContainer.image` | Init container image configuration for falco driver loader. | `{"registry": "public.ecr.aws", "repository": "falcosecurity/falco-driver-loader"}` | +| `falco.driver.loader.initContainer.image` | Init container image configuration for falco driver loader. | `{"registry": "public.ecr.aws", "repository": "sumologic/falco-driver-loader"}` | | `falco.falco.load_plugins` | Names of the plugins to be loaded by Falco. | `["json", "k8saudit"]` | | `falco.falco.rules_file` | The location of the rules files that will be consumed by Falco. | `["/etc/falco/falco_rules.yaml", "/etc/falco/falco_rules.local.yaml", "/etc/falco/k8s_audit_rules.yaml", "/etc/falco/rules.d", "/etc/falco/rules.available/application_rules.yaml"]` | | `falco.image.registry` | Image registry for falco docker container. | `public.ecr.aws` | -| `falco.image.repository` | Image repository for falco docker container. | `falcosecurity/falco-no-driver` | +| `falco.image.repository` | Image repository for falco docker container. | `sumologic/falco-no-driver` | | `falco.falcoctl` | Falcoctl configuration. We don't use it for now due to breaking changes. [See this issue](https://github.com/SumoLogic/sumologic-kubernetes-collection/issues/3144). | `{"artifact": {"follow": {"enabled": false}, "install": {"enabled": false}}}` | | `telegraf-operator.enabled` | Flag to control deploying Telegraf Operator Helm sub-chart. | `false` | +| `telegraf-operator.image.repository` | Image container repository for Telegraf Operator. | `public.ecr.aws/sumologic/telegraf-operator` | | `telegraf-operator.fullnameOverride` | Used to override the chart's full name. | `Nil` | | `telegraf-operator.replicaCount` | Replica count for Telegraf Operator pods. | 1 | | `telegraf-operator.classes.secretName` | Secret name in which the Telegraf Operator configuration will be stored. | `telegraf-operator-classes` | @@ -287,27 +292,28 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.enabled` | Flag to control deploying OpenTelemetry Operator Helm sub-chart. | `true` | | `opentelemetry-operator.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `false` | | `opentelemetry-operator.instrumentation.dotnet.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | -| `opentelemetry-operator.instrumentation.dotnet.repository` | OpenTelemetry Operator DotNet Instrumentation iamfge repository. | `ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet` | +| `opentelemetry-operator.instrumentation.dotnet.repository` | OpenTelemetry Operator DotNet Instrumentation iamfge repository. | `public.ecr.aws/sumologic/autoinstrumentation-dotnet` | | `opentelemetry-operator.instrumentation.dotnet.tag` | OpenTelemetry Operator DotNet Instrumentation image tag. | `0.7.0` | | `opentelemetry-operator.instrumentation.dotnet.image` | OpenTelemetry Operator DotNet Instrumentation image. Deprecated, please use `repository` and `tag` instead. | `""` | | `opentelemetry-operator.instrumentation.dotnet.metrics.enabled` | Flag to control metrics export from DotNet instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.dotnet.traces.enabled` | Flag to control traces export from DotNet instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.java.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | -| `opentelemetry-operator.instrumentation.java.repository` | OpenTelemetry Operator Java Instrumentation image repository. | `ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java` | +| `opentelemetry-operator.instrumentation.java.repository` | OpenTelemetry Operator Java Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-java` | | `opentelemetry-operator.instrumentation.java.tag` | OpenTelemetry Operator Java Instrumentation image tag. | `1.26.0` | | `opentelemetry-operator.instrumentation.java.image` | OpenTelemetry Operator Java Instrumentation image. Deprecated, please use `repository` and `tag` instead. | `""` | | `opentelemetry-operator.instrumentation.java.metrics.enabled` | Flag to control metrics export from Java instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.java.traces.enabled` | Flag to control traces export from Java instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.python.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | -| `opentelemetry-operator.instrumentation.python.repository` | OpenTelemetry Operator Python Instrumentation image repository. | `ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python` | +| `opentelemetry-operator.instrumentation.python.repository` | OpenTelemetry Operator Python Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-python` | | `opentelemetry-operator.instrumentation.python.tag` | OpenTelemetry Operator Python Instrumentation image tag. | `0.39b0` | | `opentelemetry-operator.instrumentation.python.image` | OpenTelemetry Operator Python Instrumentation image. Deprecated, please use `repository` and `tag` instead. | `""` | | `opentelemetry-operator.instrumentation.python.metrics.enabled` | Flag to control metrics export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.python.traces.enabled` | Flag to control traces export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.nodejs.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` | -| `opentelemetry-operator.instrumentation.nodejs.repository` | OpenTelemetry Operator NodeJS Instrumentation image repository. | `ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs` | +| `opentelemetry-operator.instrumentation.nodejs.repository` | OpenTelemetry Operator NodeJS Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-nodejs` | | `opentelemetry-operator.instrumentation.nodejs.tag` | OpenTelemetry Operator NodeJS Instrumentation image tag. | `0.40.0` | | `opentelemetry-operator.instrumentation.nodejs.image` | OpenTelemetry Operator NodeJS Instrumentation image. Deprecated, please use `repository` and `tag` instead. | `""` | +| `opentelemetry-operator.manager.image.repository` | The default operator image repository for OpenTelemetry. | `public.ecr.aws/sumologic/opentelemetry-operator` | | `opentelemetry-operator.manager.collectorImage.repository` | The default collector image repository for OpenTelemetryCollector CRDs. | `public.ecr.aws/sumologic/sumologic-otel-collector` | | `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.92.0-sumo-0` | | `opentelemetry-operator.manager.resources.limits.cpu` | Used to set limit CPU for OpenTelemetry-Operator Manager. | `250m` | @@ -320,6 +326,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.admissionWebhooks` | Admission webhooks make sure only requests with correctly formatted rules will get into the Operator. They also enable the sidecar injection for OpenTelemetryCollector and Instrumentation CR's. | See [values.yaml] | | `opentelemetry-operator.manager.env` | Additional environment variables for opentelemetry-operator helm chart. | `{"ENABLE_WEBHOOKS": "true"}` | | `opentelemetry-operator.kubeRBACProxy.image.repository` | Container repository for Kube RBAC Proxy. | `public.ecr.aws/sumologic/kube-rbac-proxy` | +| `opentelemetry-operator.testFramework.image.repository` | The default operator image repository for OpenTelemetry test framework. | `public.ecr.aws/sumologic/busybox` | | `otelcolInstrumentation.enabled` | Enables Sumo Otel Distro Collector StatefulSet to collect telemetry data. [See docs for more information.](/docs/opentelemetry-collector/traces.md) | `true` | | `otelcolInstrumentation.autoscaling.enabled` | Option to override the default autoscaling parameter (sumologic.autoscaling.enabled) for Sumo Otel Distro Collector StatefulSet and specify params for HPA. Autoscaling needs metrics-server to access cpu metrics. | `false` | | `otelcolInstrumentation.autoscaling.minReplicas` | Default min replicas for autoscaling. | `3` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 38b389a2ee..67b1bfdb72 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -119,7 +119,7 @@ sumologic: tag: 3.13.0 pullPolicy: IfNotPresent initContainerImage: - repository: public.ecr.aws/docker/library/busybox + repository: public.ecr.aws/sumologic/busybox tag: latest ## Optionally specify an array of pullSecrets. ## They will be added to serviceaccount that is used for Sumo Logic's @@ -744,6 +744,9 @@ sumologic: ## Configure metrics-server ## ref: https://github.com/bitnami/charts/blob/master/bitnami/metrics-server/values.yaml metrics-server: + image: + registry: public.ecr.aws + repository: sumologic/metrics-server ## Set the enabled flag to true for enabling metrics-server. ## This is required before enabling autoscaling unless you have an existing metrics-server in the cluster. enabled: false @@ -1020,6 +1023,8 @@ kube-prometheus-stack: defaultDashboardsEnabled: false prometheusOperator: enabled: false + image: + repository: public.ecr.aws/sumologic/prometheus-operator ## Labels to add to the operator pod podLabels: {} ## Annotations to add to the operator pod @@ -1065,6 +1070,7 @@ kube-prometheus-stack: ## uses version 2.6.0 of kube-state-metrics, but this version has some critical vulnerabilities, ## so we bump the image manually. image: + repository: public.ecr.aws/sumologic/kube-state-metrics tag: "v2.7.0" prometheus: monitor: @@ -1131,6 +1137,8 @@ kube-prometheus-stack: prometheus-node-exporter: ## Put here the new name if you want to override the full name used for Prometheus Node exporter components. # fullnameOverride: "" + image: + repository: public.ecr.aws/sumologic/node-exporter nodeSelector: kubernetes.io/os: linux @@ -1180,6 +1188,8 @@ kube-prometheus-stack: enabled: false additionalServiceMonitors: [] prometheusSpec: + image: + repository: public.ecr.aws/sumologic/prometheus ## Prometheus default scrape interval, default from upstream Kube Prometheus Stack Helm chart ## NOTE changing the scrape interval to be >1m can result in metrics ## from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps. @@ -2068,7 +2078,7 @@ otellogs: initContainers: changeowner: image: - repository: "public.ecr.aws/docker/library/busybox" + repository: "public.ecr.aws/sumologic/busybox" tag: "1.36.0" pullPolicy: IfNotPresent securityContext: @@ -2291,6 +2301,7 @@ telegraf-operator: # fullnameOverride: "" image: sidecarImage: public.ecr.aws/sumologic/telegraf:1.21.2 + repository: public.ecr.aws/sumologic/telegraf-operator replicaCount: 1 classes: secretName: "telegraf-operator-classes" @@ -2323,7 +2334,7 @@ falco: image: registry: public.ecr.aws - # repository: falcosecurity/falco-no-driver + repository: sumologic/falco-no-driver ## Add kernel-devel package through MachineConfig, required to enable building of missing falco modules (only for OpenShift) addKernelDevel: true @@ -2332,7 +2343,7 @@ falco: initContainers: ## Add initContainer to wait until kernel-devel is installed on host - name: init-falco - image: public.ecr.aws/docker/library/busybox:1.36.0 + image: public.ecr.aws/sumologic/busybox:1.36.0 command: - "sh" - "-c" @@ -2357,7 +2368,7 @@ falco: initContainer: image: registry: public.ecr.aws - # repository: falcosecurity/falco-driver-loader + repository: sumologic/falco-driver-loader falco: load_plugins: - json @@ -2438,7 +2449,7 @@ opentelemetry-operator: instrumentation: dotnet: - repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet + repository: public.ecr.aws/sumologic/autoinstrumentation-dotnet tag: 0.7.0 ## image is deprecated, it should be specified in ${repository}:${tag} format @@ -2454,7 +2465,7 @@ opentelemetry-operator: # value: my_value java: - repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java + repository: public.ecr.aws/sumologic/autoinstrumentation-java tag: 1.26.0 ## image is deprecated, it should be specified in ${repository}:${tag} format @@ -2470,7 +2481,7 @@ opentelemetry-operator: # value: my_value python: - repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python + repository: public.ecr.aws/sumologic/autoinstrumentation-python tag: 0.39b0 ## image is deprecated, it should be specified in ${repository}:${tag} format @@ -2488,7 +2499,7 @@ opentelemetry-operator: ## Current instrumentation doesn't support customization ## for nodejs. Traces are always enabled. nodejs: - repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs + repository: public.ecr.aws/sumologic/autoinstrumentation-nodejs tag: 0.40.0 ## image is deprecated, it should be specified in ${repository}:${tag} format @@ -2516,6 +2527,8 @@ opentelemetry-operator: issuerRef: {} manager: + image: + repository: public.ecr.aws/sumologic/opentelemetry-operator collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" tag: "0.92.0-sumo-0" @@ -2534,6 +2547,10 @@ opentelemetry-operator: image: repository: public.ecr.aws/sumologic/kube-rbac-proxy + testFramework: + image: + repository: public.ecr.aws/sumologic/busybox + ## pvcCleaner deletes unused PVCs pvcCleaner: metrics: diff --git a/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml b/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml index 3aeb4dc836..4d2d2b54b3 100644 --- a/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/cleanup/basic.output.yaml @@ -32,7 +32,7 @@ spec: emptyDir: {} initContainers: - name: copy-files - image: public.ecr.aws/docker/library/busybox:latest + image: public.ecr.aws/sumologic/busybox:latest command: ["sh", "-c", "cp /configmap/* /etc/terraform"] volumeMounts: - name: configmap diff --git a/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml index 2fdcbaccf3..4cf4be4bd6 100644 --- a/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml +++ b/tests/helm/testdata/goldenfile/cleanup/sumologic-mock-no-secret.output.yaml @@ -32,7 +32,7 @@ spec: emptyDir: {} initContainers: - name: copy-files - image: public.ecr.aws/docker/library/busybox:latest + image: public.ecr.aws/sumologic/busybox:latest command: ["sh", "-c", "cp /configmap/* /etc/terraform"] volumeMounts: - name: configmap diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml index 6d984011e2..bcde8b8d78 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml @@ -120,7 +120,7 @@ spec: initContainers: # ensure the host path is owned by the otel user group - name: changeowner # yamllint disable-line rule:line-length - image: public.ecr.aws/docker/library/busybox:1.36.0 + image: public.ecr.aws/sumologic/busybox:1.36.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml index e30cf8e673..049a1d2c77 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -103,7 +103,7 @@ spec: initContainers: # ensure the host path is owned by the otel user group - name: changeowner # yamllint disable-line rule:line-length - image: public.ecr.aws/docker/library/busybox:1.36.0 + image: public.ecr.aws/sumologic/busybox:1.36.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml index 35542ac3d8..4c4a78186a 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -94,7 +94,7 @@ spec: initContainers: # ensure the host path is owned by the otel user group - name: changeowner # yamllint disable-line rule:line-length - image: public.ecr.aws/docker/library/busybox:1.36.0 + image: public.ecr.aws/sumologic/busybox:1.36.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml index 26fdeaf14f..68eb711fc0 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/complex.output.yaml @@ -112,7 +112,7 @@ spec: initContainers: # ensure the host path is owned by the otel user group - name: changeowner # yamllint disable-line rule:line-length - image: public.ecr.aws/docker/library/busybox:1.36.0 + image: public.ecr.aws/sumologic/busybox:1.36.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml index 699d45b404..fc328afc1b 100644 --- a/tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml @@ -29,9 +29,6 @@ spec: helm.sh/chart: metrics-server-6.13.1 spec: serviceAccountName: RELEASE-NAME-metrics-server - volumes: - - emptyDir: {} - name: empty-dir affinity: podAffinity: @@ -50,7 +47,7 @@ spec: dnsPolicy: ClusterFirst containers: - name: metrics-server - image: docker.io/bitnami/metrics-server:0.7.0-debian-12-r8 + image: public.ecr.aws/sumologic/metrics-server:0.7.0-debian-12-r8 imagePullPolicy: "IfNotPresent" securityContext: allowPrivilegeEscalation: false @@ -96,9 +93,12 @@ spec: port: https scheme: HTTPS volumeMounts: - - mountPath: "/tmp" - name: "empty-dir" - subPath: "tmp-dir" - - mountPath: "/opt/bitnami/metrics-server/apiserver.local.config" - name: "empty-dir" - subPath: "app-tmp-dir" + - name: empty-dir + mountPath: /tmp + subPath: tmp-dir + - name: empty-dir + mountPath: /opt/bitnami/metrics-server/apiserver.local.config + subPath: app-tmp-dir + volumes: + - name: empty-dir + emptyDir: {} diff --git a/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml b/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml index 3e175a3977..e8d26f30d9 100644 --- a/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml +++ b/tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml @@ -35,7 +35,7 @@ data: - name: OTEL_RESOURCE_ATTRIBUTES value: application=ot-operator1 dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.7.0 + image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:0.7.0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -48,7 +48,7 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 python: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.39b0 + image: public.ecr.aws/sumologic/autoinstrumentation-python:0.39b0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -59,12 +59,12 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.40.0 + image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.40.0 env: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.26.0 + image: public.ecr.aws/sumologic/autoinstrumentation-java:1.26.0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -97,7 +97,7 @@ data: - name: OTEL_RESOURCE_ATTRIBUTES value: application=ot-operator2 dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.7.0 + image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:0.7.0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -110,7 +110,7 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 python: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.39b0 + image: public.ecr.aws/sumologic/autoinstrumentation-python:0.39b0 env: - name: OTEL_METRICS_EXPORTER value: otlp @@ -121,12 +121,12 @@ data: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.40.0 + image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.40.0 env: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.26.0 + image: public.ecr.aws/sumologic/autoinstrumentation-java:1.26.0 env: - name: OTEL_METRICS_EXPORTER value: otlp