Skip to content

Commit f061a73

Browse files
authored
Merge pull request #40 from stefanprodan/istio-operator-update
Add Prometheus Istio addon
2 parents 79c0dbb + 6a6688e commit f061a73

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

.github/actions/helm/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh -l
22

3-
VERSION=3.3.1
3+
VERSION=3.5.3
44
curl -sL https://get.helm.sh/helm-v${VERSION}-linux-amd64.tar.gz | tar xz
55

66
mkdir -p $GITHUB_WORKSPACE/bin

.github/workflows/update-istio.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ jobs:
2525
ISTIO_VER=${ISTIO_DIR##./istio-}
2626
2727
echo "Build manifests for ${ISTIO_VER} in dir ${ISTIO_DIR}"
28-
helm template ${ISTIO_DIR}/manifests/charts/istio-operator/ \
29-
--set hub=docker.io/istio \
30-
--set tag=${ISTIO_VER} \
31-
--set enableCRDTemplates=true \
32-
--set operatorNamespace=istio-operator \
33-
--set istioNamespace=istio-system > ./istio/operator/manifests.yaml
28+
helm template --include-crds \
29+
${ISTIO_DIR}/manifests/charts/istio-operator/ > ./istio/operator/manifests.yaml
30+
31+
cat ${ISTIO_DIR}/samples/addons/prometheus.yaml > ./istio/system/prometheus.yaml
3432
3533
rm -rf ${ISTIO_DIR}
3634

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
.DS_Store
1616
temp/
1717
bin/
18+
istio-*

istio/system/profile.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,4 @@ metadata:
44
namespace: istio-system
55
name: istio-default
66
spec:
7-
profile: default
8-
components:
9-
pilot:
10-
k8s:
11-
resources:
12-
requests:
13-
cpu: 10m
14-
memory: 100Mi
7+
profile: demo

0 commit comments

Comments
 (0)