Skip to content

Commit

Permalink
deps: upgrade kubectl and mock images to 2.24.0
Browse files Browse the repository at this point in the history
(cherry picked from commit 26a44b2)
  • Loading branch information
swiatekm authored and rnishtala-sumo committed Jul 25, 2024
1 parent 8e1632b commit 4caf075
Show file tree
Hide file tree
Showing 6 changed files with 181 additions and 5 deletions.
1 change: 1 addition & 0 deletions .changelog/3775.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deps: upgrade kubectl and mock images to 2.24.0
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `opentelemetry-operator.manager.resources.requests.memory` | Used to set requested Memory for OpenTelemetry-Operator Manager. | `256Mi` |
| `opentelemetry-operator.instrumentationNamespaces` | Used to create `Instrumentation` resources in specified namespaces. | `Nil` |
| `opentelemetry-operator.instrumentationJobImage.image.repository` | Name of the image repository used to apply Instrumentation resource | `public.ecr.aws/sumologic/kubernetes-tools-kubectl` |
| `opentelemetry-operator.instrumentationJobImage.image.tag` | Name of the image tag used to apply Instrumentation resource | `2.20.0` |
| `opentelemetry-operator.instrumentationJobImage.image.tag` | Name of the image tag used to apply Instrumentation resource | `2.24.0` |
| `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. | {} |
| `otelcolInstrumentation.enabled` | Enables Sumo Otel Distro Collector StatefulSet to collect telemetry data. [See docs for more information.](/docs/opentelemetry-collector/traces.md) | `true` |
Expand Down Expand Up @@ -639,7 +639,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `pvcCleaner.metrics.enabled` | Flag to enable cleaning unused PVCs for otelcol metrics statefulsets. | `false` |
| `pvcCleaner.logs.enabled` | Flag to enable cleaning unused PVCs for otelcol logs statefulsets. | `false` |
| `pvcCleaner.job.image.repository` | Image repository for pvcCleaner docker containers. | `public.ecr.aws/sumologic/kubernetes-tools-kubectl` |
| `pvcCleaner.job.image.tag` | Image tag for pvcCleaner docker containers. | `2.20.0` |
| `pvcCleaner.job.image.tag` | Image tag for pvcCleaner docker containers. | `2.24.0` |
| `pvcCleaner.job.image.pullPolicy` | Image pullPolicy for pvcCleaner docker containers. | `IfNotPresent` |
| `pvcCleaner.job.resources` | Resource requests and limits for the pvcCleaner containers. | `{"limits": {"memory": "256Mi", "cpu": "2000m"}, "requests": {"memory": "64Mi", "cpu": "100m"}}` |
| `pvcCleaner.job.nodeSelector` | Node selector for pvcCleaner job. [See docs/best-practices.md for more information.](/docs/best-practices.md) | `{}` |
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4613,7 +4613,7 @@ opentelemetry-operator:
instrumentationJobImage:
image:
repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
tag: 2.20.0
tag: 2.24.0

createDefaultInstrumentation: false
instrumentationNamespaces: ""
Expand Down Expand Up @@ -4679,7 +4679,7 @@ pvcCleaner:
job:
image:
repository: public.ecr.aws/sumologic/kubernetes-tools-kubectl
tag: 2.20.0
tag: 2.24.0
pullPolicy: IfNotPresent

resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
serviceAccountName: RELEASE-NAME-sumologic
containers:
- name: instrumentation-cr-applier
image: public.ecr.aws/sumologic/kubernetes-tools-kubectl:2.20.0
image: public.ecr.aws/sumologic/kubernetes-tools-kubectl:2.24.0
volumeMounts:
- name: instrumentation-cr-configmap
mountPath: /tmp/instrumentation-cr.yaml
Expand Down
64 changes: 64 additions & 0 deletions tests/helm/testdata/goldenfile/sumologic-mock/basic.output.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
# Source: sumologic/templates/sumologic-mock/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: RELEASE-NAME-sumologic-mock
namespace: sumologic
labels:
app: RELEASE-NAME-sumologic-mock
sumologic.com/app: sumologic-mock
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
annotations:
helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-weight: "1"
spec:
selector:
matchLabels:
app: RELEASE-NAME-sumologic-mock
template:
metadata:
annotations:
labels:
app: RELEASE-NAME-sumologic-mock
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: sumologic-mock
spec:
serviceAccountName: RELEASE-NAME-sumologic-mock
nodeSelector:
kubernetes.io/os: linux
securityContext: {}
containers:
- ports:
- containerPort: 3000
image: public.ecr.aws/sumologic/sumologic-mock:2.24.0
name: sumologic-mock
args:
- sumologic-mock
- --hostname=RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.
securityContext:
capabilities:
drop:
- ALL
imagePullPolicy: Always
livenessProbe:
httpGet:
path: /metrics
port: 3000
initialDelaySeconds: 15
periodSeconds: 20
resources:
limits:
cpu: 1000m
memory: 2Gi
requests:
cpu: 100m
memory: 768Mi
hostname: sumologic-mock
restartPolicy: Always
imagePullSecrets:
- name: regcred
111 changes: 111 additions & 0 deletions tests/helm/testdata/goldenfile/sumologic-mock/complex.output.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
---
# Source: sumologic/templates/sumologic-mock/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: RELEASE-NAME-sumologic-mock
namespace: collection
labels:
app: RELEASE-NAME-sumologic-mock
sumologic.com/app: sumologic-mock
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
annotations:
helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-weight: "1"
spec:
selector:
matchLabels:
app: RELEASE-NAME-sumologic-mock
template:
metadata:
annotations:
labels:
app: RELEASE-NAME-sumologic-mock
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: sumologic-mock
spec:
serviceAccountName: RELEASE-NAME-sumologic-mock
nodeSelector:
disktype: ssd
kubernetes.io/os: linux
tolerations:
- effect: NoSchedule
key: key1
operator: Equal
value: value1
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
weight: 1
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/e2e-az-name
operator: In
values:
- e2e-az1
- e2e-az2
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- RELEASE-NAME-sumologic-otelcol-logs
- RELEASE-NAME-sumologic-otelcol-metrics
- RELEASE-NAME-sumologic-otelcol-events
- RELEASE-NAME-sumologic-otelcol-instrumentation
- key: app
operator: In
values:
- prometheus-operator-prometheus
topologyKey: "kubernetes.io/hostname"
securityContext:
allowPrivilegeEscalation: false
priorityClassName: "high-priority"
containers:
- ports:
- containerPort: 3000
image: public.ecr.aws/sumologic/sumologic-mock:2.24.0
name: sumologic-mock
args:
- sumologic-mock
- --hostname=RELEASE-NAME-sumologic-mock.collection.svc.cluster.local.
- --print-logs
- --print-metrics
- --print-headers
securityContext:
capabilities:
drop:
- ALL
imagePullPolicy: Always
livenessProbe:
httpGet:
path: /metrics
port: 3000
initialDelaySeconds: 15
periodSeconds: 20
resources:
limits:
cpu: 2000m
memory: 3Gi
requests:
cpu: 1000m
memory: 1Gi
hostname: sumologic-mock
restartPolicy: Always
imagePullSecrets:
- name: regcred

0 comments on commit 4caf075

Please sign in to comment.