Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 31 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,41 @@ helm-template: helm-version## Generate Helm templates.
helm-install: helm-version## Install Helm chart.
helm install khook helm/khook \
--namespace kagent \
--create-namespace
--create-namespace \
--set image.registry=$(DOCKER_REGISTRY) \
--set image.repository=$(DOCKER_REPO)/$(DOCKER_IMAGE) \
--set image.tag=$(VERSION)

.PHONY: helm-upgrade
helm-upgrade: helm-version## Upgrade Helm chart.
helm upgrade khook helm/khook \
--namespace kagent
--namespace kagent \
--set image.registry=$(DOCKER_REGISTRY) \
--set image.repository=$(DOCKER_REPO)/$(DOCKER_IMAGE) \
--set image.tag=$(VERSION)

.PHONY: build-deploy
build-deploy: docker-build helm-deploy ## Build Docker image and deploy via Helm.
@echo "Built and deployed image: $(IMG)"

.PHONY: helm-deploy
helm-deploy: helm-version ## Deploy or upgrade Helm chart.
@if helm status khook --namespace kagent >/dev/null 2>&1; then \
echo "Upgrading existing release..."; \
helm upgrade khook helm/khook \
--namespace kagent \
--set image.registry=$(DOCKER_REGISTRY) \
--set image.repository=$(DOCKER_REPO)/$(DOCKER_IMAGE) \
--set image.tag=$(VERSION); \
else \
echo "Installing new release..."; \
helm install khook helm/khook \
--namespace kagent \
--create-namespace \
--set image.registry=$(DOCKER_REGISTRY) \
--set image.repository=$(DOCKER_REPO)/$(DOCKER_IMAGE) \
--set image.tag=$(VERSION); \
fi

.PHONY: helm-uninstall
helm-uninstall: helm-version## Uninstall Helm chart.
Expand Down
2 changes: 1 addition & 1 deletion helm/khook/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
- name: manager
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
image: "{{- if .Values.image.registry }}{{ .Values.image.registry }}/{{- end }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- /manager
Expand Down
6 changes: 4 additions & 2 deletions helm/khook/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
replicaCount: 1

image:
repository: otomato/khook
registry: cr.kagent.dev
repository: kagent-dev/khook
pullPolicy: IfNotPresent
tag: "latest"
# tag will default to Chart.AppVersion if not specified
tag: ""

imagePullSecrets: []
nameOverride: ""
Expand Down
Loading