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.

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

rel: Prepare 3.0.0 pre-release #357

Merged
merged 23 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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 charts/refinery/Chart.yaml
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: 2.9.0
appVersion: 2.5.0
version: 3.0.0-hnyinternal.0
appVersion: 3.0.0
keywords:
- refinery
- honeycomb
Expand Down
9 changes: 9 additions & 0 deletions charts/refinery/ci/autoscale-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,12 @@ resources:

autoscaling:
enabled: true

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

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

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

grpcIngress:
enabled: true

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

podDisruptionBudget:
enabled: true

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

redis:
resources:
limits:
cpu: 100m
memory: 200M
requests:
cpu: 100m
memory: 200M
4 changes: 4 additions & 0 deletions charts/refinery/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{{- 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.redis.enabled }}
{{- if and .Values.redis.enabled (eq .Values.redis.mode "deployment") }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -73,4 +73,4 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/refinery/templates/ingress-grpc.yaml
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.grpcIngress.className }}
ingressClassName: {{ .Values.grpcIngress.className }}
{{- end }}
rules:
{{- range .Values.grpcIngress.hosts }}
Expand Down
4 changes: 2 additions & 2 deletions charts/refinery/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ spec:
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- if .Values.ingressClassName }}
ingressClassName: {{ .Values.ingressClassName }}
{{- if .Values.ingress.className }}
ingressClassName: {{ .Values.ingress.className }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
Expand Down
96 changes: 96 additions & 0 deletions charts/refinery/templates/statefulset-redis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{{- if and .Values.redis.enabled (eq .Values.redis.mode "statefulset") }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "refinery.redis.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "refinery.redis.labels" . | nindent 4 }}
{{- with .Values.redis.annotations }}
annotations: {{ toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: 1
serviceName: {{ include "refinery.redis.fullname" . }}
{{- if .Values.redis.persistentVolumeClaimRetentionPolicy.enabled }}
persistentVolumeClaimRetentionPolicy:
whenDeleted: {{ .Values.redis.persistentVolumeClaimRetentionPolicy.whenDeleted }}
whenScaled: {{ .Values.redis.persistentVolumeClaimRetentionPolicy.whenScaled }}
{{- end }}
selector:
matchLabels:
{{- include "refinery.redis.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- /*
.Values.podAnnotations is used here to maintain backwards compatibility.
It should be removed eventually.
*/}}
{{- if or .Values.podAnnotations .Values.redis.podAnnotations }}
annotations:
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.redis.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
labels:
{{- include "refinery.redis.selectorLabels" . | nindent 8 }}
{{- with .Values.redis.commonLabels}}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.redis.podLabels}}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "refinery.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: redis
image: "{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}"
imagePullPolicy: {{ .Values.redis.image.pullPolicy }}
ports:
- name: redis
containerPort: 6379
protocol: TCP
{{- with .Values.redis.resources }}
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.redis.lifecycle }}
lifecycle:
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
- name: {{ .Values.redis.persistentVolumeClaim.name }}
mountPath: /data
{{- with .Values.redis.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.redis.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.redis.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ .Values.redis.persistentVolumeClaim.name }}
spec:
accessModes:
{{- toYaml .Values.redis.persistentVolumeClaim.accessModes | nindent 10}}
resources:
requests:
storage: {{ .Values.redis.persistentVolumeClaim.storageSize }}
{{- end }}
6 changes: 6 additions & 0 deletions charts/refinery/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
},
"StressRelief": {
"type": "object"
},
"CentralStore": {
"type": "object"
},
"OTelTracing": {
"type": "object"
}
}
},
Expand Down
65 changes: 38 additions & 27 deletions charts/refinery/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@
config:
General:
ConfigurationVersion: 2
MinRefineryVersion: v2.0
MinRefineryVersion: v3.0

PeerManagement:
CentralStore:
Type: redis
# IdentifierInterfaceName specifies a network interface to use when finding a local hostname.
# Due to the nature of DNS in Kubernetes, it is recommended to set this value to the 'eth0' interface name.
# When configured the pod's IP will be used in the peer list
IdentifierInterfaceName: eth0
SpanChannelSize: 10_000

RedisPeerManagement:
# Host is the host and port of the Redis instance to use for peer cluster membership management.
Host: '{{include "refinery.redis.fullname" .}}:6379'
MaxIdle: 100
MaxActive: 100

Collection:
# AvailableMemory is the amount of system memory available to the Refinery process.
Expand Down Expand Up @@ -86,26 +85,27 @@ rulesConfigMap:

## Scaling Refinery ##
#
# Since Refinery is a stateful service we recommend provisioning refinery
# If you are not using autoscaling we recommend provisioning refinery
# for your anticipated peak load and using Stress Relief to minimize impact
# from changes in cluster membership.
#
# Use replicaCount and resource limits to set the size of your Refinery cluster
# per your anticipated peak load.
# per your anticipated peak load. Refinery now performs better with many smaller
# instances instead of a few big instances.
# replicaCount is ignored if autoscaling is enabled
replicaCount: 3

resources:
limits:
cpu: 2000m
cpu: 4
# This value is used by default for config.Collection.AvailableMemory
memory: 2Gi
requests:
cpu: 500m
cpu: 2
memory: 500Mi

image:
repository: honeycombio/refinery
repository: tylerhelmuthhc/refinery
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: ""
Expand Down Expand Up @@ -158,27 +158,26 @@ commonLabels: {}

# Redis configuration
redis:

# To install a simple single pod Redis deployment set this to true.
# If false, you must specify a value for existingHost
# To install a simple single pod Redis statefulset set this to true.
# If false, you must specify a value for config.RedisPeerManagement.Host.
# For production, it is recommended to set this to false and provide
# a highly available Redis configuration using redis.existingHost
# an existing highly available Redis instance via using config.RedisPeerManagement.Host.
enabled: true

# If redis.enabled is true, this the image that will be used to create
# the Redis deployment
mode: deployment

image:
repository: redis
tag: 7.2
pullPolicy: IfNotPresent

resources: {}
# limits:
# cpu: 500m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 50Mi
resources:
limits:
cpu: 2
memory: 2Gi
requests:
cpu: 1
memory: 500Mi

# Configure container lifecycle hooks.
lifecycle: {}
Expand All @@ -204,6 +203,19 @@ redis:
labels: {}
annotations: {}

# Only used with redis.mode=statefulset
persistentVolumeClaim:
name: refinery-redis-data
accessModes:
- "ReadWriteOnce"
storageSize: "8Gi"

# Only used with redis.mode=statefulset
persistentVolumeClaimRetentionPolicy:
enabled: true
whenDeleted: Delete
whenScaled: Delete

serviceAccount:
# Specifies whether a service account should be created
create: true
Expand Down Expand Up @@ -256,6 +268,7 @@ ingress:
# - secretName: refinery-tls
# hosts:
# - refinery.local
className: ""

grpcIngress:
enabled: false
Expand All @@ -270,11 +283,9 @@ grpcIngress:
# - secretName: refinery-tls
# hosts:
# - refinery.local
className: ""

# Setup autoscaling for refinery
# When autoscaling events occur, trace sharding will be recomputed. This will result in traces with missing spans being
# sent to Honeycomb, for a small period of time (approximately config.Traces.TraceTimeout * 2).
# Because of this, scaleDown is disabled by default to avoid unnecessary broken traces should traffic go up and down rapidly.
autoscaling:
enabled: false
minReplicas: 3
Expand Down
Loading