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

fix: fix examples, update podtatohead #1098

Merged
merged 1 commit into from
Mar 23, 2023
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
19 changes: 16 additions & 3 deletions examples/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# renovate: datasource=github-tags depName=jaegertracing/jaeger
JAEGER_VERSION ?= v1.43.0
# renovate: datasource=github-tags depName=jaegertracing/jaeger-operator
JAEGER_VERSION ?= v1.42.0
TOOLKIT_NAMESPACE ?= keptn-lifecycle-toolkit-system
PODTATO_NAMESPACE ?= podtato-kubectl
GRAFANA_PORT_FORWARD ?= 3000
Expand All @@ -11,7 +11,8 @@ install: install-observability install-argo
@echo "-----------------------------------"
helm repo add klt https://charts.lifecycle.keptn.sh
helm repo update
helm upgrade --install keptn klt/klt -n keptn-lifecycle-toolkit-system --create-namespace --wait
helm upgrade --install keptn klt/klt -n $(TOOLKIT_NAMESPACE) --create-namespace --wait
RealAnna marked this conversation as resolved.
Show resolved Hide resolved
kubectl apply -f support/keptn/keptnconfig.yaml -n $(TOOLKIT_NAMESPACE)

.PHONY: install-observability
install-observability:
Expand Down Expand Up @@ -57,6 +58,18 @@ undeploy-podtatohead:
uninstall-observability: undeploy-podtatohead
make -C support/observability uninstall

.PHONY: uninstall-argo
uninstall-argo: undeploy-podtatohead
make -C support/argo uninstall

.PHONY: uninstall
uninstall: uninstall-observability uninstall-argo
@echo "-----------------------------------"
@echo "Uninstall Keptn-lifecycle-toolkit"
@echo "-----------------------------------"
helm uninstall keptn -n $(TOOLKIT_NAMESPACE)
kubectl delete ns $(TOOLKIT_NAMESPACE) --ignore-not-found=true

.PHONY: port-forward-argocd
port-forward-argocd:
@echo ""
Expand Down
3 changes: 0 additions & 3 deletions examples/sample-app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ port-forward-grafana:

.PHONY: deploy-version-1
deploy-version-1:
kubectl create namespace "$(PODTATO_NAMESPACE)" --dry-run=client -o yaml | kubectl apply -f -
kubectl apply -k version-1

.PHONY: deploy-version-2
deploy-version-2:
kubectl create namespace "$(PODTATO_NAMESPACE)" --dry-run=client -o yaml | kubectl apply -f -
kubectl apply -k version-2

.PHONY: deploy-version-3
deploy-version-3:
kubectl create namespace "$(PODTATO_NAMESPACE)" --dry-run=client -o yaml | kubectl apply -f -
kubectl apply -k version-3

.PHONY: undeploy-podtatohead
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-app/base/app-post-deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: lifecycle.keptn.sh/v1alpha2
apiVersion: lifecycle.keptn.sh/v1alpha3
kind: KeptnTaskDefinition
metadata:
name: post-deployment-notification
Expand Down
12 changes: 6 additions & 6 deletions examples/sample-app/base/app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: lifecycle.keptn.sh/v1alpha2
apiVersion: lifecycle.keptn.sh/v1alpha3
kind: KeptnApp
metadata:
name: podtato-head
Expand All @@ -7,15 +7,15 @@ spec:
version: "1.0.0"
workloads:
- name: podtato-head-left-arm
version: 0.2.7
version: 0.1.0
- name: podtato-head-left-leg
version: 0.2.7
- name: podtato-head-entry
version: 0.2.7
version: 0.1.0
- name: podtato-head-frontend
version: 0.1.0
- name: podtato-head-right-arm
version: 0.1.0
- name: podtato-head-right-leg
version: 0.2.7
version: 0.1.0
- name: podtato-head-hat
version: 0.1.0

Expand Down
5 changes: 4 additions & 1 deletion examples/sample-app/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
resources:
- https://github.com/podtato-head/podtato-head-app/releases/download/v0.3.1/manifest.yaml
- app.yaml
- manifest.yaml
- app-post-deploy.yaml
- provider.yaml
- metric.yaml

patchesStrategicMerge:
- manifest.yaml
Loading