From 1d482c02dc585fccf0ef28bec05642214988053c Mon Sep 17 00:00:00 2001 From: Shahidh K Muhammed Date: Mon, 16 Dec 2019 13:06:38 +0530 Subject: [PATCH 1/2] update manifests to v1.0.0 --- install-manifests/azure-container-with-pg/azuredeploy.json | 2 +- install-manifests/azure-container/azuredeploy.json | 2 +- install-manifests/docker-compose-https/docker-compose.yaml | 2 +- install-manifests/docker-compose-pgadmin/docker-compose.yaml | 2 +- install-manifests/docker-compose-postgis/docker-compose.yaml | 2 +- install-manifests/docker-compose/docker-compose.yaml | 2 +- install-manifests/docker-run/docker-run.sh | 2 +- install-manifests/google-cloud-k8s-sql/deployment.yaml | 2 +- install-manifests/kubernetes/deployment.yaml | 2 +- scripts/cli-migrations/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/install-manifests/azure-container-with-pg/azuredeploy.json b/install-manifests/azure-container-with-pg/azuredeploy.json index 1595f56f91f..5f05b3a188a 100644 --- a/install-manifests/azure-container-with-pg/azuredeploy.json +++ b/install-manifests/azure-container-with-pg/azuredeploy.json @@ -97,7 +97,7 @@ "firewallRuleName": "allow-all-azure-firewall-rule", "containerGroupName": "[concat(parameters('name'), '-container-group')]", "containerName": "hasura-graphql-engine", - "containerImage": "hasura/graphql-engine:v1.0.0-rc.1" + "containerImage": "hasura/graphql-engine:v1.0.0" }, "resources": [ { diff --git a/install-manifests/azure-container/azuredeploy.json b/install-manifests/azure-container/azuredeploy.json index 999d87a4fba..53b6dc829fd 100644 --- a/install-manifests/azure-container/azuredeploy.json +++ b/install-manifests/azure-container/azuredeploy.json @@ -55,7 +55,7 @@ "dbName": "[parameters('postgresDatabaseName')]", "containerGroupName": "[concat(parameters('name'), '-container-group')]", "containerName": "hasura-graphql-engine", - "containerImage": "hasura/graphql-engine:v1.0.0-rc.1" + "containerImage": "hasura/graphql-engine:v1.0.0" }, "resources": [ { diff --git a/install-manifests/docker-compose-https/docker-compose.yaml b/install-manifests/docker-compose-https/docker-compose.yaml index f2e7114e55e..76d65f2c68d 100644 --- a/install-manifests/docker-compose-https/docker-compose.yaml +++ b/install-manifests/docker-compose-https/docker-compose.yaml @@ -6,7 +6,7 @@ services: volumes: - db_data:/var/lib/postgresql/data graphql-engine: - image: hasura/graphql-engine:v1.0.0-rc.1 + image: hasura/graphql-engine:v1.0.0 depends_on: - "postgres" restart: always diff --git a/install-manifests/docker-compose-pgadmin/docker-compose.yaml b/install-manifests/docker-compose-pgadmin/docker-compose.yaml index b1deb264e52..c113805df95 100644 --- a/install-manifests/docker-compose-pgadmin/docker-compose.yaml +++ b/install-manifests/docker-compose-pgadmin/docker-compose.yaml @@ -17,7 +17,7 @@ services: PGADMIN_DEFAULT_EMAIL: pgadmin@example.com PGADMIN_DEFAULT_PASSWORD: admin graphql-engine: - image: hasura/graphql-engine:v1.0.0-rc.1 + image: hasura/graphql-engine:v1.0.0 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-compose-postgis/docker-compose.yaml b/install-manifests/docker-compose-postgis/docker-compose.yaml index 18ebc42d533..6fe4aae1da6 100644 --- a/install-manifests/docker-compose-postgis/docker-compose.yaml +++ b/install-manifests/docker-compose-postgis/docker-compose.yaml @@ -6,7 +6,7 @@ services: volumes: - db_data:/var/lib/postgresql/data graphql-engine: - image: hasura/graphql-engine:v1.0.0-rc.1 + image: hasura/graphql-engine:v1.0.0 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-compose/docker-compose.yaml b/install-manifests/docker-compose/docker-compose.yaml index cb71a91b202..febf9493531 100644 --- a/install-manifests/docker-compose/docker-compose.yaml +++ b/install-manifests/docker-compose/docker-compose.yaml @@ -6,7 +6,7 @@ services: volumes: - db_data:/var/lib/postgresql/data graphql-engine: - image: hasura/graphql-engine:v1.0.0-rc.1 + image: hasura/graphql-engine:v1.0.0 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-run/docker-run.sh b/install-manifests/docker-run/docker-run.sh index bc2144ef336..620cd147478 100755 --- a/install-manifests/docker-run/docker-run.sh +++ b/install-manifests/docker-run/docker-run.sh @@ -2,4 +2,4 @@ docker run -d -p 8080:8080 \ -e HASURA_GRAPHQL_DATABASE_URL=postgres://username:password@hostname:port/dbname \ -e HASURA_GRAPHQL_ENABLE_CONSOLE=true \ - hasura/graphql-engine:v1.0.0-rc.1 \ No newline at end of file + hasura/graphql-engine:v1.0.0 \ No newline at end of file diff --git a/install-manifests/google-cloud-k8s-sql/deployment.yaml b/install-manifests/google-cloud-k8s-sql/deployment.yaml index 87bcddd906c..74c98dbd8aa 100644 --- a/install-manifests/google-cloud-k8s-sql/deployment.yaml +++ b/install-manifests/google-cloud-k8s-sql/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: graphql-engine - image: hasura/graphql-engine:v1.0.0-rc.1 + image: hasura/graphql-engine:v1.0.0 ports: - containerPort: 8080 readinessProbe: diff --git a/install-manifests/kubernetes/deployment.yaml b/install-manifests/kubernetes/deployment.yaml index f3cb3618f4b..d56c9d6dc93 100644 --- a/install-manifests/kubernetes/deployment.yaml +++ b/install-manifests/kubernetes/deployment.yaml @@ -18,7 +18,7 @@ spec: app: hasura spec: containers: - - image: hasura/graphql-engine:v1.0.0-rc.1 + - image: hasura/graphql-engine:v1.0.0 imagePullPolicy: IfNotPresent name: hasura env: diff --git a/scripts/cli-migrations/Dockerfile b/scripts/cli-migrations/Dockerfile index da099f4402e..c1203c56bb7 100644 --- a/scripts/cli-migrations/Dockerfile +++ b/scripts/cli-migrations/Dockerfile @@ -1,4 +1,4 @@ -FROM hasura/graphql-engine:v1.0.0-rc.1 +FROM hasura/graphql-engine:v1.0.0 # set an env var to let the cli know that # it is running in server environment From f0ddbc842078ab7503925351c89b0488aba460dd Mon Sep 17 00:00:00 2001 From: Rikin Kachhia <54616969+rikinsk@users.noreply.github.com> Date: Tue, 17 Dec 2019 17:57:33 +0530 Subject: [PATCH 2/2] fix feature compatibility version check expression (#3546) --- console/src/helpers/versionUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/src/helpers/versionUtils.js b/console/src/helpers/versionUtils.js index ee535486760..5cda1ead7e8 100644 --- a/console/src/helpers/versionUtils.js +++ b/console/src/helpers/versionUtils.js @@ -36,7 +36,7 @@ export const getFeaturesCompatibility = serverVersion => { Object.keys(featureLaunchVersions).forEach(feature => { featuresCompatibility[feature] = isValidServerVersion - ? semver.satisfies(featureLaunchVersions[feature], '<=' + serverVersion) + ? semver.satisfies(serverVersion, '>=' + featureLaunchVersions[feature]) : true; });