diff --git a/charts/nr-k8s-otel-collector/Chart.yaml b/charts/nr-k8s-otel-collector/Chart.yaml index 609c8b877..88257dbd5 100644 --- a/charts/nr-k8s-otel-collector/Chart.yaml +++ b/charts/nr-k8s-otel-collector/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.10 +version: 0.10.0 dependencies: diff --git a/charts/nr-k8s-otel-collector/README.md b/charts/nr-k8s-otel-collector/README.md index 2ae645c0a..2056f03b6 100644 --- a/charts/nr-k8s-otel-collector/README.md +++ b/charts/nr-k8s-otel-collector/README.md @@ -163,8 +163,8 @@ to export data to this connector which can then be connected to the New Relic ma | deployment.tolerations | list | `[]` | Sets deployment pod tolerations. Overrides `tolerations` and `global.tolerations` | | dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` | | exporters | string | `nil` | Define custom exporters here. See: https://opentelemetry.io/docs/collector/configuration/#exporters | -| images | object | `{"collector":{"pullPolicy":"IfNotPresent","registry":"","repository":"newrelic/nrdot-collector-k8s","tag":"1.5.0"},"kubectl":{"pullPolicy":"IfNotPresent","registry":"","repository":"bitnami/kubectl","tag":"latest"},"pullSecrets":[]}` | Images used by the chart. | -| images.collector | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"newrelic/nrdot-collector-k8s","tag":"1.5.0"}` | Image for the OpenTelemetry Collector. | +| images | object | `{"collector":{"pullPolicy":"IfNotPresent","registry":"","repository":"newrelic/nrdot-collector-k8s","tag":"1.8.0"},"kubectl":{"pullPolicy":"IfNotPresent","registry":"","repository":"bitnami/kubectl","tag":"latest"},"pullSecrets":[]}` | Images used by the chart. | +| images.collector | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"newrelic/nrdot-collector-k8s","tag":"1.8.0"}` | Image for the OpenTelemetry Collector. | | images.kubectl | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"bitnami/kubectl","tag":"latest"}` | Image for the initContainer that retrieves node allocatable resources. | | images.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. | | kube-state-metrics.enableResourceQuotaSamples | bool | `false` | Enable resource quota data exporting | diff --git a/charts/nr-k8s-otel-collector/e2e/e2e-resources.yml b/charts/nr-k8s-otel-collector/e2e/e2e-resources.yml index 51cd370e4..7ed9243ed 100644 --- a/charts/nr-k8s-otel-collector/e2e/e2e-resources.yml +++ b/charts/nr-k8s-otel-collector/e2e/e2e-resources.yml @@ -314,7 +314,7 @@ spec: kubernetes.io/os: linux containers: - name: compute-pi-digits - image: perl:5.34.0 + image: docker.io/perl:5.34.0 imagePullPolicy: IfNotPresent resources: requests: @@ -352,7 +352,7 @@ metadata: spec: containers: - name: alpine - image: alpine:latest + image: docker.io/alpine:latest resources: limits: # Force a 'CreateContainerError': @@ -373,7 +373,7 @@ metadata: spec: containers: - name: alpine - image: alpine:latest + image: docker.io/alpine:latest nodeSelector: not-existing: not-existing --- @@ -470,7 +470,7 @@ spec: spec: containers: - name: compute-pi-digits - image: perl:5.34.0 + image: docker.io/perl:5.34.0 imagePullPolicy: IfNotPresent resources: requests: @@ -564,7 +564,7 @@ spec: spec: containers: - name: compute-pi-digits - image: perl:5.34.0 + image: docker.io/perl:5.34.0 imagePullPolicy: IfNotPresent resources: requests: @@ -639,7 +639,7 @@ spec: spec: containers: - name: compute-pi-digits - image: perl:5.34.0 + image: docker.io/perl:5.34.0 imagePullPolicy: IfNotPresent resources: requests: diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml index 6106c4cdb..fb361774a 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 rules: - apiGroups: - "" diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml index f693c6e61..489c479bf 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 subjects: - kind: ServiceAccount name: nr-k8s-otel-collector diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml index cb6efb309..eb2e368c4 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 data: daemonset-config.yaml: | receivers: @@ -593,7 +593,7 @@ data: enabled: false resourcedetection/cloudproviders: - detectors: [gcp, eks, ec2, aks, azure] + detectors: [gcp, eks, ec2, aks, azure, oraclecloud] timeout: 2s override: false @@ -605,7 +605,7 @@ data: value: - key: "newrelic.chart.version" action: upsert - value: 0.9.10 + value: 0.10.0 - key: newrelic.entity.type action: upsert value: "k8s" diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml index 3126c7556..e28f11fb0 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 spec: selector: matchLabels: @@ -24,7 +24,7 @@ spec: app.kubernetes.io/name: nr-k8s-otel-collector component: daemonset annotations: - checksum/config: 9dd6a8a2e8197440a17eb7a6141f4f6aaef3d497f2ef1b551ed612e2fe2b566a + checksum/config: ce34a5712c979ae4da4dece1897f5d7a8ecde96e10c537b06c16ac997151fb97 spec: serviceAccountName: nr-k8s-otel-collector initContainers: @@ -88,7 +88,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1001 - image: "docker.io/newrelic/nrdot-collector-k8s:1.5.0" + image: "docker.io/newrelic/nrdot-collector-k8s:1.8.0" imagePullPolicy: IfNotPresent args: - --config diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml index ada3975b5..d5b6d9390 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 data: deployment-config.yaml: | receivers: @@ -516,7 +516,7 @@ data: value: - key: "newrelic.chart.version" action: upsert - value: 0.9.10 + value: 0.10.0 - key: newrelic.entity.type action: upsert value: "k8s" @@ -534,7 +534,7 @@ data: value: - key: "newrelic.chart.version" action: upsert - value: 0.9.10 + value: 0.10.0 transform/events: log_statements: diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml index 967f07be5..1acb99f2a 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 spec: replicas: 1 minReadySeconds: 5 @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: nr-k8s-otel-collector component: deployment annotations: - checksum/config: aaa8aa229e963e30fd154113fb8ff04c208deb3e8883de262bed601b5abcb224 + checksum/config: a018553d827fbc96e40d0ad04ff2fe370b8dd0258794d4e4c1435ea9d2d814b4 spec: serviceAccountName: nr-k8s-otel-collector containers: @@ -40,7 +40,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1001 - image: "docker.io/newrelic/nrdot-collector-k8s:1.5.0" + image: "docker.io/newrelic/nrdot-collector-k8s:1.8.0" imagePullPolicy: IfNotPresent args: - --config diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml index 66ed791dd..0b2850c1c 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml @@ -10,6 +10,6 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 data: licenseKey: PE5SX2xpY2Vuc2VLZXk+ diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml index 9f3cebc7d..0ce1fb6cc 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 spec: type: ClusterIP ports: diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml index 1e6d69ee6..714ef86bc 100644 --- a/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml +++ b/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml @@ -10,5 +10,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: nr-k8s-otel-collector app.kubernetes.io/version: 1.2.0 - helm.sh/chart: nr-k8s-otel-collector-0.9.10 + helm.sh/chart: nr-k8s-otel-collector-0.10.0 annotations: diff --git a/charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml b/charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml index a3e0e6651..76796d73f 100644 --- a/charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml +++ b/charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml @@ -616,7 +616,7 @@ data: {{- end }} resourcedetection/cloudproviders: - detectors: [gcp, eks, ec2, aks, azure] + detectors: [gcp, eks, ec2, aks, azure, oraclecloud] timeout: 2s override: false diff --git a/charts/nr-k8s-otel-collector/tests/images_test.yaml b/charts/nr-k8s-otel-collector/tests/images_test.yaml index 1baa0d5fb..101b4c395 100644 --- a/charts/nr-k8s-otel-collector/tests/images_test.yaml +++ b/charts/nr-k8s-otel-collector/tests/images_test.yaml @@ -140,11 +140,11 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: global.registry.io/newrelic/nrdot-collector-k8s:1.5.0 + value: global.registry.io/newrelic/nrdot-collector-k8s:1.8.0 template: templates/deployment.yaml - equal: path: spec.template.spec.containers[0].image - value: global.registry.io/newrelic/nrdot-collector-k8s:1.5.0 + value: global.registry.io/newrelic/nrdot-collector-k8s:1.8.0 template: templates/daemonset.yaml - it: local registry overrides global registry set: @@ -159,9 +159,9 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: local.registry.io/newrelic/nrdot-collector-k8s:1.5.0 + value: local.registry.io/newrelic/nrdot-collector-k8s:1.8.0 template: templates/deployment.yaml - equal: path: spec.template.spec.containers[0].image - value: local.registry.io/newrelic/nrdot-collector-k8s:1.5.0 + value: local.registry.io/newrelic/nrdot-collector-k8s:1.8.0 template: templates/daemonset.yaml \ No newline at end of file diff --git a/charts/nr-k8s-otel-collector/values.yaml b/charts/nr-k8s-otel-collector/values.yaml index 62bd11385..9d6e7a0d6 100644 --- a/charts/nr-k8s-otel-collector/values.yaml +++ b/charts/nr-k8s-otel-collector/values.yaml @@ -55,7 +55,7 @@ images: collector: registry: "" repository: newrelic/nrdot-collector-k8s - tag: "1.5.0" + tag: "1.8.0" pullPolicy: IfNotPresent # -- Image for the initContainer that retrieves node allocatable resources. kubectl: