-
Notifications
You must be signed in to change notification settings - Fork 151
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Additional fixes for issues where sometimes certificates and Instrume…
…ntation opentelemetry.io/v1alpha1 are installed too early
- Loading branch information
Showing
7 changed files
with
212 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: bug_fix | ||
| # The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) | ||
| component: operator | ||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Additional fixes for issues where sometimes certificates and Instrumentation opentelemetry.io/v1alpha1 are installed too early | ||
| # One or more tracking issues related to the change | ||
| issues: [1559] | ||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...or-and-auto-instrumentation/rendered_manifests/operator/job-operator-startupapicheck.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| --- | ||
| # Source: splunk-otel-collector/templates/operator/job-operator-startupapicheck.yaml | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: default-splunk-otel-collector-operator-startupapicheck | ||
| namespace: default | ||
| labels: | ||
| app.kubernetes.io/name: splunk-otel-collector | ||
| helm.sh/chart: splunk-otel-collector-0.113.0 | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/instance: default | ||
| app.kubernetes.io/version: "0.113.0" | ||
| app: splunk-otel-collector | ||
| component: otel-operator | ||
| chart: splunk-otel-collector-0.113.0 | ||
| release: default | ||
| heritage: Helm | ||
| app.kubernetes.io/component: otel-operator | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade | ||
| "helm.sh/hook-weight": "4" | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: startupapicheck | ||
| image: "busybox:latest" | ||
| env: | ||
| - name: MANAGER_METRICS_SERVICE_CLUSTERIP | ||
| value: "default-splunk-otel-collector-operator" | ||
| - name: MANAGER_METRICS_SERVICE_PORT | ||
| value: "8443" | ||
| command: | ||
| - sh | ||
| - -c | ||
| - | | ||
| i=0 | ||
| while [ $i -lt 300 ]; do | ||
| if wget -qO- "$MANAGER_METRICS_SERVICE_CLUSTERIP:$MANAGER_METRICS_SERVICE_PORT" 2>&1 | grep -qv "HTTP/1.0 400 Bad Request"; then | ||
| echo "Operator service is available." | ||
| exit 0 | ||
| fi | ||
| echo "Waiting for operator service to become available... (attempt $i)" | ||
| i=$((i + 1)) | ||
| sleep 1 | ||
| done | ||
| echo "Timeout reached. Operator service did not become available." | ||
| exit 1 | ||
| restartPolicy: Never |
50 changes: 50 additions & 0 deletions
50
...uto-instrumentation/rendered_manifests/operator/job-operator-webhook-startupapicheck.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| --- | ||
| # Source: splunk-otel-collector/templates/operator/job-operator-webhook-startupapicheck.yaml | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: default-splunk-otel-collector-operator-webhook-startupapicheck | ||
| namespace: default | ||
| labels: | ||
| app.kubernetes.io/name: splunk-otel-collector | ||
| helm.sh/chart: splunk-otel-collector-0.113.0 | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/instance: default | ||
| app.kubernetes.io/version: "0.113.0" | ||
| app: splunk-otel-collector | ||
| component: otel-operator | ||
| chart: splunk-otel-collector-0.113.0 | ||
| release: default | ||
| heritage: Helm | ||
| app.kubernetes.io/component: otel-operator | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade | ||
| "helm.sh/hook-weight": "4" | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: wget | ||
| image: "busybox:latest" | ||
| env: | ||
| - name: WEBHOOK_SERVICE_CLUSTERIP | ||
| value: "default-splunk-otel-collector-operator-webhook" | ||
| - name: WEBHOOK_SERVICE_PORT | ||
| value: "443" | ||
| command: | ||
| - sh | ||
| - -c | ||
| - | | ||
| i=0 | ||
| while [ $i -lt 300 ]; do | ||
| if wget -qO- "$WEBHOOK_SERVICE_CLUSTERIP:$WEBHOOK_SERVICE_PORT" 2>&1 | grep -qv "HTTP/1.0 400 Bad Request"; then | ||
| echo "Operator webhook service is available." | ||
| exit 0 | ||
| fi | ||
| echo "Waiting for webhook service to become available... (attempt $i)" | ||
| i=$((i + 1)) | ||
| sleep 1 | ||
| done | ||
| echo "Timeout reached. Operator webhook service did not become available." | ||
| exit 1 | ||
| restartPolicy: Never |
46 changes: 46 additions & 0 deletions
46
helm-charts/splunk-otel-collector/templates/operator/job-operator-startupapicheck.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| {{- if .Values.operator.enabled }} | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: {{ template "splunk-otel-collector.fullname" . }}-operator-startupapicheck | ||
| namespace: {{ template "splunk-otel-collector.namespace" . }} | ||
| labels: | ||
| {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} | ||
| app: {{ template "splunk-otel-collector.name" . }} | ||
| component: otel-operator | ||
| chart: {{ template "splunk-otel-collector.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| app.kubernetes.io/component: otel-operator | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade | ||
| "helm.sh/hook-weight": "4" | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: startupapicheck | ||
| image: "busybox:latest" | ||
| env: | ||
| - name: MANAGER_METRICS_SERVICE_CLUSTERIP | ||
| value: "{{ template "splunk-otel-collector.fullname" . }}-operator" | ||
| - name: MANAGER_METRICS_SERVICE_PORT | ||
| value: "8443" | ||
| command: | ||
| - sh | ||
| - -c | ||
| - | | ||
| i=0 | ||
| while [ $i -lt 300 ]; do | ||
| if wget -qO- "$MANAGER_METRICS_SERVICE_CLUSTERIP:$MANAGER_METRICS_SERVICE_PORT" 2>&1 | grep -qv "HTTP/1.0 400 Bad Request"; then | ||
| echo "Operator service is available." | ||
| exit 0 | ||
| fi | ||
| echo "Waiting for operator service to become available... (attempt $i)" | ||
| i=$((i + 1)) | ||
| sleep 1 | ||
| done | ||
| echo "Timeout reached. Operator service did not become available." | ||
| exit 1 | ||
| restartPolicy: Never | ||
| {{- end }} |
46 changes: 46 additions & 0 deletions
46
...charts/splunk-otel-collector/templates/operator/job-operator-webhook-startupapicheck.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| {{- if .Values.operator.enabled }} | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: {{ template "splunk-otel-collector.fullname" . }}-operator-webhook-startupapicheck | ||
| namespace: {{ template "splunk-otel-collector.namespace" . }} | ||
| labels: | ||
| {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} | ||
| app: {{ template "splunk-otel-collector.name" . }} | ||
| component: otel-operator | ||
| chart: {{ template "splunk-otel-collector.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| app.kubernetes.io/component: otel-operator | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade | ||
| "helm.sh/hook-weight": "4" | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: wget | ||
| image: "busybox:latest" | ||
| env: | ||
| - name: WEBHOOK_SERVICE_CLUSTERIP | ||
| value: "{{ template "splunk-otel-collector.fullname" . }}-operator-webhook" | ||
| - name: WEBHOOK_SERVICE_PORT | ||
| value: "443" | ||
| command: | ||
| - sh | ||
| - -c | ||
| - | | ||
| i=0 | ||
| while [ $i -lt 300 ]; do | ||
| if wget -qO- "$WEBHOOK_SERVICE_CLUSTERIP:$WEBHOOK_SERVICE_PORT" 2>&1 | grep -qv "HTTP/1.0 400 Bad Request"; then | ||
| echo "Operator webhook service is available." | ||
| exit 0 | ||
| fi | ||
| echo "Waiting for webhook service to become available... (attempt $i)" | ||
| i=$((i + 1)) | ||
| sleep 1 | ||
| done | ||
| echo "Timeout reached. Operator webhook service did not become available." | ||
| exit 1 | ||
| restartPolicy: Never | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters