From 1c234a86b22df7cf9ddebea8bb2d71ae063d61ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= <57442769+gjedlicska@users.noreply.github.com> Date: Mon, 30 May 2022 19:40:20 +0200 Subject: [PATCH] gergo/hotfixes (#785) * ci(circleci): publish npm packages with the implicit default `latest` tag * feat(helm chart): add a conditional flag for creating k8s namespace in the helm chart * fix(server package.json): fix cross-env variable string naming fix #780 --- .circleci/config.yml | 2 +- packages/server/package.json | 2 +- utils/helm/speckle-server/templates/namespace.yml | 4 +++- utils/helm/speckle-server/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b47680b92..f17e55916 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ jobs: - run: name: publish to npm - command: 'yarn workspaces foreach -pv --no-private npm publish --access public --tag next' + command: 'yarn workspaces foreach -pv --no-private npm publish --access public' # - run: # name: commit changes diff --git a/packages/server/package.json b/packages/server/package.json index fc9e24893..51802d514 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -15,7 +15,7 @@ "node": "^16.0.0" }, "scripts": { - "dev": "cross-env 'NODE_ENV=development' 'DEBUG=speckle:*' nodemon ./bin/www --watch . --watch ./bin/www -e js,graphql,env", + "dev": "cross-env NODE_ENV=development DEBUG='speckle:*' nodemon ./bin/www --watch . --watch ./bin/www -e js,graphql,env", "dev:server:test": "cross-env NODE_ENV=test DEBUG=speckle:* node ./bin/www", "test": "cross-env NODE_ENV=test mocha", "test:coverage": "cross-env NODE_ENV=test nyc --reporter lcov mocha", diff --git a/utils/helm/speckle-server/templates/namespace.yml b/utils/helm/speckle-server/templates/namespace.yml index 59f794477..a1f4da9b2 100644 --- a/utils/helm/speckle-server/templates/namespace.yml +++ b/utils/helm/speckle-server/templates/namespace.yml @@ -1,4 +1,6 @@ +{{- if .Values.create_namespace }} apiVersion: v1 kind: Namespace metadata: - name: {{ .Values.namespace }} \ No newline at end of file + name: {{ .Values.namespace }} +{{- end }} \ No newline at end of file diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml index d54240c75..8b876202f 100644 --- a/utils/helm/speckle-server/values.yaml +++ b/utils/helm/speckle-server/values.yaml @@ -101,3 +101,5 @@ enable_prometheus_monitoring: false cert_manager_issuer: letsencrypt-staging helm_test_enabled: true + +create_namespace: true