Skip to content

Commit

Permalink
minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dmolik committed Sep 27, 2024
1 parent a134daf commit 1499886
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

K8S_VERSION ?= 1.31.1
CILIUM_VERSION ?= 1.16.1
CILIUM_VERSION ?= 1.16.2

V ?= 0
ifeq ($(V), 1)
Expand Down Expand Up @@ -221,7 +221,8 @@ minikube: ## Spool up a local minikube cluster for development

.PHONY: quickstart
quickstart: minikube ## Install the operator into the minikube cluster and deploy the sample CR use the TLS and PROMETHEUS variables to enable those features
$Q$(KUBECTL) apply -f https://raw.githubusercontent.com/hyperspike/valkey-operator/main/dist/install.yaml
$QLATEST=$(curl -s https://api.github.com/repos/hyperspike/valkey-operator/releases/latest | jq -cr .tag_name) \
&& curl -sL https://github.com/hyperspike/valkey-operator/releases/download/$$LATEST/install.yaml | kubectl create -f -
$Q(if [ ! -z $$TLS ] ; then TLS_VALUE=true ; else TLS_VALUE=false ; fi ; if [ ! -z $$PROMETHEUS ] ; then PROMETHEUS_VALUE=true ; else PROMETHEUS_VALUE=false ; fi ; sed -e "s/@TLS@/$$TLS_VALUE/" -e "s/@PROMETHEUS@/$$PROMETHEUS_VALUE/" valkey.yml.tpl | $(KUBECTL) apply -f - )

tunnel: ## turn on minikube's tunnel to test ingress and get UI access
Expand Down
8 changes: 4 additions & 4 deletions hack/minikube.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ data:
--set enableCiliumEndpointSlice=true \
--set ipam.operator.clusterPoolIPv4PodCIDRList=$podcidr \
--set ipv4NativeRoutingCIDR=10.0.0.0/8 \
--set tunnel=disabled \
--set tunnelProtocol="" \
--set routingMode="native" \
--set autoDirectNodeRoutes=true \
--set operator.replicas=1 \
Expand All @@ -87,14 +85,16 @@ data:
--set externalIPs.enabled=true \
--set bgpControlPlane.enabled=true \
--set endpointRoutes.enabled=true \
--set endpointStatus.enabled=true \
--set endpointStatus.status=policy \
--set nodePort.enabled=true \
--set authentication.enabled=true \
--set authentication.mutual.spire.enabled=true \
--set authentication.mutual.spire.install.enabled=true \
--set authentication.mutual.spire.serverAddress=spire-server.cilium-spire.svc.cluster.$name:8081 \
--set k8sServicePort=8443 >> .cni-$name.yaml
#--set tunnel=disabled \
#--set tunnelProtocol="" \
#--set endpointStatus.enabled=true \
#--set endpointStatus.status=policy \
#--set clustermesh.useAPIServer=true \
#--set clustermesh.config.enabled=true \
#--set encryption.enabled=true \
Expand Down
2 changes: 1 addition & 1 deletion hack/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ kind: Prometheus
metadata:
name: prometheus
spec:
image: quay.io/prometheus/prometheus:v2.54.0
image: quay.io/prometheus/prometheus:v3.0.0-beta.0
serviceAccountName: prometheus
serviceMonitorSelector:
matchLabels:
Expand Down

0 comments on commit 1499886

Please sign in to comment.