Skip to content

Commit

Permalink
Merge pull request #32 from lightrun-platform/DEVOPS-2140-lightrun-ku…
Browse files Browse the repository at this point in the history
…bernetes-operator-helm-chart-move-into-charts-folder

DEVOPS-2140-lightrun-kubernetes-operator-helm-chart-move-into-charts-folder
  • Loading branch information
imeliran authored Aug 18, 2024
2 parents ddc8765 + 3f541bf commit 38a83c2
Show file tree
Hide file tree
Showing 18 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
printf "Update generated parts of helm chart\n"
make before-push
printf "Install helm chart\n"
helm install -n lightrun-k8s-operator lightrun-k8s-operator ./helm-chart -f .github/workflows/tests_data/chart_values.yaml
helm install -n lightrun-k8s-operator lightrun-k8s-operator ./charts/lightrun-operator -f .github/workflows/tests_data/chart_values.yaml
kubectl wait deployment sample-deployment --for condition=Available=True --timeout=90s
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
paths-ignore:
- lightrun-init-agent/*
- .github/**
- helm-chart/*
- charts/*
- charts/**
- grafana/*
- config/*
- examples/*
Expand Down Expand Up @@ -55,12 +54,12 @@ jobs:
- name: Install Helm
uses: azure/setup-helm@v4

- name: Pack Helm chart
- name: Pack Operator Helm chart
shell: bash
run: |
yq -i '.version = "${{steps.release_tag.outputs.new_tag}}"' helm-chart/Chart.yaml
yq -i '.controllerManager.manager.image.tag = "${{steps.release_tag.outputs.new_tag}}"' helm-chart/values.yaml
helm package ./helm-chart -u -d ./helm-repo/
yq -i '.version = "${{steps.release_tag.outputs.new_tag}}"' charts/lightrun-operator/Chart.yaml
yq -i '.controllerManager.manager.image.tag = "${{steps.release_tag.outputs.new_tag}}"' charts/lightrun-operator/values.yaml
helm package ./charts/lightrun-operator -u -d ./helm-repo/
- name: Pack Lightrun Agents Helm chart
shell: bash
run: |
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ deploy-to-file: manifests kustomize ## Prepare all manifests in 1 file.

.PHONY: before-push
before-push: manifests generate kustomize fmt vet deploy-to-file
$(KUSTOMIZE) build config/crd --output helm-chart/crds/lightrunjavaagent_crd.yaml
$(KUSTOMIZE) build config/rbac | yq 'select(.metadata.name == "leader-election-role").rules' > helm-chart/generated/rbac_leader_election_rules.yaml
$(KUSTOMIZE) build config/rbac | yq 'select(.metadata.name == "manager-role").rules' > helm-chart/generated/rbac_manager_rules.yaml
helm template ./helm-chart > examples/operator.yaml --include-crds --namespace lightrun-operator
$(KUSTOMIZE) build config/crd --output charts/lightrun-operator/crds/lightrunjavaagent_crd.yaml
$(KUSTOMIZE) build config/rbac | yq 'select(.metadata.name == "leader-election-role").rules' > charts/lightrun-operator/generated/rbac_leader_election_rules.yaml
$(KUSTOMIZE) build config/rbac | yq 'select(.metadata.name == "manager-role").rules' > charts/lightrun-operator/generated/rbac_manager_rules.yaml
helm template ./charts/lightrun-operator > examples/operator.yaml --include-crds --namespace lightrun-operator

## Location to install dependencies to
LOCALBIN ?= $(shell pwd)/bin
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ helm repo add lightrun-k8s-operator https://lightrun-platform.github.io/lightrun
```

- Install the Helm chart:
> _Using default [values](../helm-chart/values.yaml)_
> _Using default [values](../lightrun-operator/values.yaml)_
```sh
helm install lightrun-k8s-operator/lightrun-k8s-operator -n lightrun-operator --create-namespace
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ kubectl apply -f agent.yaml -n lightrun-agent-test

## Example with Helm Chart

[Helm chart](../helm-chart/) is available in repository branch `helm-repo`
[Helm chart](../charts/lightrun-operator/) is available in repository branch `helm-repo`
- Add the repo to your Helm repository list
```sh
helm repo add lightrun-k8s-operator https://lightrun-platform.github.io/lightrun-k8s-operator
```

- Install the Helm chart:
> _Using default [values](../helm-chart/values.yaml)_
> _Using default [values](../charts/lightrun-operator/values.yaml)_
```sh
helm install lightrun-k8s-operator/lightrun-k8s-operator -n lightrun-operator --create-namespace
Expand Down

0 comments on commit 38a83c2

Please sign in to comment.