Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new values to allow custom ports #218

Merged
merged 5 commits into from
Jun 20, 2022
Merged

Added new values to allow custom ports #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0953972
Added new values to allow custom ports
abelperezok May 29, 2022
925fc9b
Merge branch 'main' into new-values-custom-ports
abelperezok Jun 15, 2022
abbef6f
Merge branch 'main' into new-values-custom-ports
abelperezok Jun 18, 2022
7030e52
Bumped chart's patch version by 1
abelperezok Jun 19, 2022
85efcd6
Fixed tag position in values.yaml
abelperezok Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.8.1
version: 0.8.2
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
16 changes: 9 additions & 7 deletions charts/opentelemetry-operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ spec:
hostNetwork: {{ .Values.hostNetwork }}
containers:
- args:
- --metrics-addr=127.0.0.1:8080
- --metrics-addr=127.0.0.1:{{ .Values.manager.ports.metricsPort }}
- --enable-leader-election
- --health-probe-addr=:{{ .Values.manager.ports.healthzPort }}
- --webhook-port={{ .Values.manager.ports.webhookPort }}
{{- if and .Values.manager.collectorImage.repository .Values.manager.collectorImage.tag }}
- --collector-image={{ .Values.manager.collectorImage.repository }}:{{ .Values.manager.collectorImage.tag }}
{{- end }}
Expand All @@ -40,19 +42,19 @@ spec:
image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}"
name: manager
ports:
- containerPort: 9443
- containerPort: {{ .Values.manager.ports.webhookPort }}
name: webhook-server
protocol: TCP
livenessProbe:
httpGet:
path: /healthz
port: 8081
port: {{ .Values.manager.ports.healthzPort }}
initialDelaySeconds: 15
periodSeconds: 20
readinessProbe:
httpGet:
path: /readyz
port: 8081
port: {{ .Values.manager.ports.healthzPort }}
initialDelaySeconds: 5
periodSeconds: 10
resources: {{ toYaml .Values.manager.resources | nindent 12 }}
Expand All @@ -61,14 +63,14 @@ spec:
name: cert
readOnly: true
- args:
- --secure-listen-address=0.0.0.0:8443
- --upstream=http://127.0.0.1:8080/
- --secure-listen-address=0.0.0.0:{{ .Values.kubeRBACProxy.ports.proxyPort }}
- --upstream=http://127.0.0.1:{{ .Values.manager.ports.metricsPort }}/
- --logtostderr=true
- --v=0
image: "{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}"
name: kube-rbac-proxy
ports:
- containerPort: 8443
- containerPort: {{ .Values.kubeRBACProxy.ports.proxyPort }}
name: https
protocol: TCP
{{- with .Values.kubeRBACProxy.resources }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
targetPort: webhook-server
selector:
app.kubernetes.io/name: opentelemetry-operator
control-plane: controller-manager
6 changes: 6 additions & 0 deletions charts/opentelemetry-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ manager:
collectorImage:
repository:
tag:
ports:
metricsPort: 8080
webhookPort: 9443
healthzPort: 8081
resources:
limits:
cpu: 100m
Expand All @@ -34,6 +38,8 @@ kubeRBACProxy:
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.11.0
ports:
proxyPort: 8443
resources:
limits:
cpu: 500m
Expand Down