diff --git a/circle.yml b/circle.yml index c93c8f115..d8757df67 100644 --- a/circle.yml +++ b/circle.yml @@ -47,18 +47,6 @@ test: make all deployment: - gitsync: - branch: "merge/git-sync" - commands: - - docker login -e '.' -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" quay.io - - | - IMAGE_TAG="quay.io/weaveworks/flux:$(./docker/image-tag)" - echo Pushing $IMAGE_TAG - docker push "$IMAGE_TAG" - # Assumes that both images change in lock-step (they share a lot of code, so ..) - IMAGE_TAG="quay.io/weaveworks/flux-service:$(./docker/image-tag)" - echo Pushing $IMAGE_TAG - docker push "$IMAGE_TAG" push: branch: master commands: diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml index 8c5fc270d..79e35a4c2 100644 --- a/deploy/flux-deployment.yaml +++ b/deploy/flux-deployment.yaml @@ -24,7 +24,7 @@ spec: # There are no ":latest" images for flux. Find the most recent # release or image version at https://quay.io/weaveworks/flux # and replace the tag here. - image: quay.io/weaveworks/flux:1.0.0-beta + image: quay.io/weaveworks/flux:1.0.0 imagePullPolicy: IfNotPresent ports: - containerPort: 3030 # informational diff --git a/http/daemon/server.go b/http/daemon/server.go index 73f279c35..a6efc019e 100644 --- a/http/daemon/server.go +++ b/http/daemon/server.go @@ -215,7 +215,7 @@ func (s HTTPServer) GetPublicSSHKey(w http.ResponseWriter, r *http.Request) { transport.ErrorResponse(w, r, err) return } - transport.JSONResponse(w, r, res) + transport.JSONResponse(w, r, res.PublicSSHKey) } func (s HTTPServer) RegeneratePublicSSHKey(w http.ResponseWriter, r *http.Request) { diff --git a/internal_docs/releasing.md b/internal_docs/releasing.md index 66ac860fa..25f161d0a 100644 --- a/internal_docs/releasing.md +++ b/internal_docs/releasing.md @@ -8,7 +8,8 @@ This process will create a new tagged release of flux, push dockerfiles and uplo ## Release process 1. Alter and commit the /CHANGELOG.md file to signify what has changed in this version. -2. Create a new release: https://github.com/weaveworks/flux/releases/new +2. Ensure example deployment is up-to-date. (Check image tags) +3. Create a new release: https://github.com/weaveworks/flux/releases/new 4. Fill in the version number for the name and tag. The version number should conform to [semver](semver.org); i.e., look like `1.2.3` (NB: no leading 'v'); optionally with a pre-release suffix, e.g., `1.0.0-beta` 5. Fill in the Description field (possibly a copy paste from the CHANGELOG.md) 6. Click "Publish release"