From 97fc4a90ae07eed56e9d8ce44075996dacc57a46 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 11 Feb 2019 11:46:59 +0200 Subject: [PATCH 1/2] Add validation for label selectors - Reject deployment if the pod label selector doesn't match 'app: ' --- pkg/controller/deployer.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/controller/deployer.go b/pkg/controller/deployer.go index f95d7af2..ce6c1dd4 100644 --- a/pkg/controller/deployer.go +++ b/pkg/controller/deployer.go @@ -330,6 +330,11 @@ func (c *CanaryDeployer) createPrimaryDeployment(cd *flaggerv1.Canary) error { return err } + if appSel, ok := canaryDep.Spec.Selector.MatchLabels["app"]; !ok || appSel != canaryDep.Name { + return fmt.Errorf("invalid label selector! Deployment %s.%s spec.selector.matchLabels must contain selector 'app: %s'", + targetName, cd.Namespace, targetName) + } + primaryDep, err := c.kubeClient.AppsV1().Deployments(cd.Namespace).Get(primaryName, metav1.GetOptions{}) if errors.IsNotFound(err) { // create primary secrets and config maps From 434c6149ab8fd85857c00ba7049783316da2e64d Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Mon, 11 Feb 2019 11:47:46 +0200 Subject: [PATCH 2/2] Package all charts --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 892bb374..4fd66cac 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ LT_VERSION?=$(shell grep 'VERSION' cmd/loadtester/main.go | awk '{ print $$4 }' run: go run cmd/flagger/* -kubeconfig=$$HOME/.kube/config -log-level=info \ - -metrics-server=https://prometheus.iowa.weavedx.com \ + -metrics-server=https://prometheus.istio.weavedx.com \ -slack-url=https://hooks.slack.com/services/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 \ -slack-channel="devops-alerts" @@ -31,7 +31,7 @@ test: test-fmt test-codegen go test ./... helm-package: - cd charts/ && helm package flagger/ && helm package grafana/ && helm package loadtester/ + cd charts/ && helm package ./* mv charts/*.tgz docs/ helm repo index docs --url https://stefanprodan.github.io/flagger --merge ./docs/index.yaml