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

Jump to bottom

maint(refinery): Move 2.x working branch back into main #370

Merged
merged 3 commits into from
Jun 13, 2024
Merged

maint(refinery): Move 2.x working branch back into main #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dc501a
rel(refinery): bump default refinery version to 2.5.1 (#362)
TylerHelmuth May 15, 2024
e08065a
rel: bump default refinery version to 2.5.2 (#367)
TylerHelmuth May 22, 2024
6de2860
Merge remote-tracking branch 'origin/main' into refinery-2.X-work-branch
TylerHelmuth Jun 13, 2024
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
minikube start --driver=none --kubernetes-version=${K8S_VERSION}
- run:
name: Lint charts
command: ct lint --config ./ct.yaml
command: ct lint --config ./ct.yaml --target-branch refinery-2.X-work-branch
- run:
name: Test charts
command: ct install --config ./ct.yaml
command: ct install --config ./ct.yaml --target-branch refinery-2.X-work-branch


release-charts:
Expand Down
4 changes: 2 additions & 2 deletions charts/refinery/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: refinery
description: Chart to deploy Honeycomb Refinery
type: application
version: 3.0.0-hnyinternal.3
appVersion: 3.0.0
version: 2.9.3
appVersion: 2.5.2
keywords:
- refinery
- honeycomb
Expand Down
9 changes: 0 additions & 9 deletions charts/refinery/ci/autoscale-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,3 @@ resources:

autoscaling:
enabled: true

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
9 changes: 0 additions & 9 deletions charts/refinery/ci/debug.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@ resources:
debug:
enabled: true
port: 6062

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
9 changes: 0 additions & 9 deletions charts/refinery/ci/default-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,3 @@ resources:
requests:
cpu: 100m
memory: 200M

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
9 changes: 0 additions & 9 deletions charts/refinery/ci/ingress-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,3 @@ ingress:

grpcIngress:
enabled: true

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
9 changes: 0 additions & 9 deletions charts/refinery/ci/pdb-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,3 @@ resources:

podDisruptionBudget:
enabled: true

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
9 changes: 0 additions & 9 deletions charts/refinery/ci/rules-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,3 @@ rules:
test:
DeterministicSampler:
SampleRate: 1

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
4 changes: 0 additions & 4 deletions charts/refinery/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{{- if .Values.ingressClassName }}
{{- fail "ingressClassName is no longer supported. Use ingress.className or grpcIngress.className instead." }}
{{- end }}

Honeycomb refinery is setup and configured to refine events that are sent through it. You should see data flowing
within a few minutes at https://ui.honeycomb.io

Expand Down
4 changes: 2 additions & 2 deletions charts/refinery/templates/deployment-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and .Values.redis.enabled (eq .Values.redis.mode "deployment") }}
{{- if .Values.redis.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -73,4 +73,4 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
15 changes: 7 additions & 8 deletions charts/refinery/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand Down Expand Up @@ -113,16 +112,16 @@ spec:
httpGet:
path: /alive
port: data
{{- with .Values.livenessProbe }}
{{- toYaml . | nindent 12 }}
{{- end }}
initialDelaySeconds: 10
periodSeconds: 10
failureThreshold: 3
readinessProbe:
httpGet:
path: /ready
path: /alive
port: data
{{- with .Values.readinessProbe }}
{{- toYaml . | nindent 12 }}
{{- end }}
initialDelaySeconds: 0
periodSeconds: 3
failureThreshold: 5
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumes:
Expand Down
4 changes: 2 additions & 2 deletions charts/refinery/templates/ingress-grpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ spec:
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- if .Values.grpcIngress.className }}
ingressClassName: {{ .Values.grpcIngress.className }}
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
rules:
{{- range .Values.grpcIngress.hosts }}
Expand Down
4 changes: 2 additions & 2 deletions charts/refinery/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ spec:
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
{{- if .Values.ingressClassName }}
ingressClassName: {{ .Values.ingressClassName }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
Expand Down
96 changes: 0 additions & 96 deletions charts/refinery/templates/statefulset-redis.yaml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions charts/refinery/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@
},
"StressRelief": {
"type": "object"
},
"CentralStore": {
"type": "object"
},
"OTelTracing": {
"type": "object"
}
}
},
Expand Down
Loading
Loading