Skip to content

Commit dc7a447

Browse files
author
Amir Moualem
authored
Merge pull request #140 from snyk/chore/tilt_fixes
Chore/tilt fixes
2 parents 6495835 + 1a0850c commit dc7a447

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed

Tiltfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ docker_build("snyk/kubernetes-monitor", ".",
66
entrypoint="bin/start-tilt"
77
)
88

9-
k8s_yaml(local("helm template snyk-monitor | ./add-ns.py snyk-monitor"))
9+
allow_k8s_contexts(['minikube', 'kubernetes-admin@kind'])
10+
k8s_yaml(local("helm template snyk-monitor | ./tilt/add-ns.py snyk-monitor"))
1011
k8s_resource('snyk-monitor', port_forwards='9229:9229')
1112
watch_file("snyk-monitor")
1213

scripts/publish-gh-pages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ echo overriding new yaml / chart files from master branch
2121
git checkout origin/master -- snyk-monitor snyk-monitor-cluster-permissions.yaml snyk-monitor-deployment.yaml snyk-monitor-namespaced-permissions.yaml
2222

2323
echo overriding tag placeholders with latest semantic version
24-
sed -i "s/{{IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING}}/${NEW_TAG}/g" ./snyk-monitor/values.yaml
25-
sed -i "s/{{IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING}}/${NEW_TAG}/g" ./snyk-monitor-deployment.yaml
24+
sed -i "s/IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING/${NEW_TAG}/g" ./snyk-monitor/values.yaml
25+
sed -i "s/IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING/${NEW_TAG}/g" ./snyk-monitor-deployment.yaml
2626

2727
echo building new helm release
2828
./helm init --client-only

snyk-monitor-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
app.kubernetes.io/name: snyk-monitor
1616
spec:
1717
containers:
18-
- image: snyk/kubernetes-monitor:{{IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING}}
18+
- image: snyk/kubernetes-monitor:IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING
1919
imagePullPolicy: Always
2020
name: snyk-monitor
2121
terminationMessagePath: /dev/termination-log

snyk-monitor/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ integrationApi: ""
1717
# The registry from which to pull the snyk-monitor image.
1818
image:
1919
repository: snyk/kubernetes-monitor
20-
tag: {{IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING}}
20+
tag: IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING
2121
pullPolicy: Always
2222

2323
# The snyk-monitor requires knowing the cluster name so that it can organise
File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
./kind create cluster --config=./test/fixtures/cluster-config.yaml --name=kind
2+
export KUBECONFIG=`./kind get kubeconfig-path`
3+
./kubectl create namespace snyk-monitor
4+
./kubectl create secret generic snyk-monitor -n snyk-monitor --from-literal=dockercfg.json="{}" --from-literal=integrationId="41214617-cb5d-4674-8d97-5b456952c360"
5+
echo '------------------------------------------------'
6+
echo 'run "PATH=$PATH:./ tilt up" to start tilt'
7+
echo "don't forget to set up KUBECONFIG"
8+
echo 'clean up afterwards with "./kind delete cluster"'

0 commit comments

Comments
 (0)