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

chore: move from continuous helmify to custom chart #1840

Merged
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
60cdb87
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
59ee71a
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
3df9613
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
602bf73
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
8e5e61a
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
5f06a9f
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
eda83d3
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
88aef5d
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
cb444b4
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
c186e6b
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
ec1202d
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
e0556a4
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 4, 2023
61c240f
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
80d2286
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
471dfcf
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
d1d3d97
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
33fa7ba
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
ec28907
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
6a00b20
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
d4844fb
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
7ce256b
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
1cc313d
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
98921cc
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
122cccd
chore: moved from continuous helmify to custom chart
geoffrey1330 Aug 7, 2023
2c8b8aa
Add back certificate annotation
RealAnna Aug 8, 2023
b354eec
feat(metrics-operator): add missing yaml
RealAnna Aug 8, 2023
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
1 change: 0 additions & 1 deletion .github/actions/deploy-klt-on-cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ runs:
shell: bash
run: |
echo "Installing KLT using helm"
make helm-package
helm version
helm install -n keptn-lifecycle-toolkit-system --create-namespace toolkit ./helm/chart \
--set scheduler.scheduler.imagePullPolicy=Never \
Expand Down
148 changes: 0 additions & 148 deletions .github/workflows/helm-checks.yaml

This file was deleted.

42 changes: 2 additions & 40 deletions .github/workflows/validate-helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@ jobs:
- name: Set up Node
RealAnna marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/[email protected]
with:
node-version: 16

- name: Generate helm charts
env:
RELEASE_REGISTRY: ghcr.io/keptn
run: make helm-package

node-version: 16

- name: Install readme generator
run: |
git clone https://github.com/bitnami-labs/readme-generator-for-helm.git
Expand All @@ -54,36 +49,3 @@ jobs:
echo ""
echo "Helm values documentation is correct!"
fi

helm-generation-check:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache build tools
id: cache-build-tools
uses: actions/cache@v3
with:
path: ./bin
key: build-tools-${{ github.ref_name }}

- name: Generate helm charts
env:
RELEASE_REGISTRY: ghcr.io/keptn
run: make helm-package

- name: Compare YAML file changes
run: |
if [ -z "$(git status --porcelain)" ]; then
echo ""
echo "There are no changes in the manifests"
else
echo ""
echo "Helm charts were not re-generated. Please regenerate them using make helm-package RELEASE_REGISTRY=ghcr.io/keptn"
echo ""
echo "=========== Diff ==========="
git diff
exit 1
fi
29 changes: 0 additions & 29 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ $(LOCALBIN):

## Tool Binaries
KUSTOMIZE ?= $(LOCALBIN)/kustomize
HELMIFY ?= $(LOCALBIN)/helmify

.PHONY: helmify
helmify: $(HELMIFY) ## Download helmify locally if necessary.
$(HELMIFY): $(LOCALBIN)
test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/keptn/helmify/cmd/helmify@17737f7ff50279e758006221f11187a232becf1c

.PHONY: integration-test #these tests should run on a real cluster!
integration-test: # to run a single test by name use --test eg. --test=expose-keptn-metric
Expand Down Expand Up @@ -71,29 +65,6 @@ kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
$(KUSTOMIZE): $(LOCALBIN)
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }

.PHONY: release-helm-manifests
release-helm-manifests: helmify
echo "building helm overlay"
kustomize build ./helm/overlay > helmchart.yaml
envsubst < helmchart.yaml > tmp.yaml; mv tmp.yaml helmchart.yaml
cat helmchart.yaml | $(HELMIFY) -probes=true -image-pull-secrets=true -vv helm/chart

.PHONY: helm-package
helm-package:
$(MAKE) build-release-manifests CHART_APPVERSION=$(CHART_APPVERSION) RELEASE_REGISTRY=$(RELEASE_REGISTRY)
$(MAKE) release-helm-manifests CHART_APPVERSION=$(CHART_APPVERSION) RELEASE_REGISTRY=$(RELEASE_REGISTRY)

.PHONY: build-release-manifests
build-release-manifests:
$(MAKE) -C lifecycle-operator generate
$(MAKE) -C klt-cert-manager generate
$(MAKE) -C metrics-operator generate

$(MAKE) -C lifecycle-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C klt-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)
$(MAKE) -C metrics-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION)

.PHONY: build-deploy-operator
build-deploy-operator:
$(MAKE) -C lifecycle-operator release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG)
Expand Down
46 changes: 0 additions & 46 deletions helm/overlay/kustomization.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.1
RealAnna marked this conversation as resolved.
Show resolved Hide resolved
controller-gen.kubebuilder.io/version: v0.12.0
name: keptnmetrics.metrics.keptn.sh
spec:
group: metrics.keptn.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.1
RealAnna marked this conversation as resolved.
Show resolved Hide resolved
controller-gen.kubebuilder.io/version: v0.12.0
name: keptnmetricsproviders.metrics.keptn.sh
spec:
group: metrics.keptn.sh
Expand Down