diff --git a/VERSION b/VERSION index 5416288bc5..fc6f7a7094 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.11 +v0.12 diff --git a/delivery.yaml b/delivery.yaml index f42b3efebb..813651670a 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -17,9 +17,9 @@ pipeline: if [ "$CUR_PART" != "$VERSION_PART" ]; then NEW_PATCH=0; fi RELEASE_VERSION=${VERSION_PART}.${NEW_PATCH} export VERSION="${RELEASE_VERSION}" - IMAGE="registry-write.opensource.zalan.do/pathfinder/skipper:${RELEASE_VERSION}" + IMAGE="registry-write.opensource.zalan.do/teapot/skipper:${RELEASE_VERSION}" else - IMAGE="registry-write.opensource.zalan.do/pathfinder/skipper-test:${CDP_BUILD_VERSION}" + IMAGE="registry-write.opensource.zalan.do/teapot/skipper-test:${CDP_BUILD_VERSION}" fi export IMAGE @@ -28,10 +28,10 @@ pipeline: git diff cd packaging && make docker.build.amd64 && git status && git diff && make docker.push.amd64 if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then - echo "Created docker image registry.opensource.zalan.do/pathfinder/skipper:${RELEASE_VERSION}" - echo "Creating docker image registry.opensource.zalan.do/pathfinder/skipper-arm64:${RELEASE_VERSION}" + echo "Created docker image registry.opensource.zalan.do/teapot/skipper:${RELEASE_VERSION}" + echo "Creating docker image registry.opensource.zalan.do/teapot/skipper-arm64:${RELEASE_VERSION}" make docker.build.arm64 && git status && git diff && make docker.push.arm64 - echo "Creating docker image registry.opensource.zalan.do/pathfinder/skipper-armv7:${RELEASE_VERSION}" + echo "Creating docker image registry.opensource.zalan.do/teapot/skipper-armv7:${RELEASE_VERSION}" make docker.build.armv7 && git status && git diff && make docker.push.armv7 echo "Creating git tag: ${RELEASE_VERSION}" git gh-tag "${RELEASE_VERSION}" @@ -45,18 +45,18 @@ pipeline: echo -e "\n### Docker image\n" >>$tf echo -e "Docker image is available in Zalando's Open Source registry:\n" >>$tf echo -e '```' >>$tf - echo -e "docker run -it registry.opensource.zalan.do/pathfinder/skipper:${RELEASE_VERSION} skipper --help" >>$tf + echo -e "docker run -it registry.opensource.zalan.do/teapot/skipper:${RELEASE_VERSION} skipper --help" >>$tf echo -e "# arm64" >>$tf - echo -e "docker run -it registry.opensource.zalan.do/pathfinder/skipper-arm64:${RELEASE_VERSION} skipper --help" >>$tf + echo -e "docker run -it registry.opensource.zalan.do/teapot/skipper-arm64:${RELEASE_VERSION} skipper --help" >>$tf echo -e "# arm v7 32bit" >>$tf - echo -e "docker run -it registry.opensource.zalan.do/pathfinder/skipper-armv7:${RELEASE_VERSION} skipper --help" >>$tf + echo -e "docker run -it registry.opensource.zalan.do/teapot/skipper-armv7:${RELEASE_VERSION} skipper --help" >>$tf echo -e '```' >>$tf echo "################################" cat $tf echo "################################" git gh-release --message-from-file "${tf}" "${files[@]}" "$RELEASE_VERSION" else - echo "Created docker image registry.opensource.zalan.do/pathfinder/skipper-test:${CDP_BUILD_VERSION}" + echo "Created docker image registry.opensource.zalan.do/teapot/skipper-test:${CDP_BUILD_VERSION}" echo "Not creating a release. No release version defined." fi - id: docs diff --git a/docs/data-clients/route-string.md b/docs/data-clients/route-string.md index fd5ef20ecd..7bca94b705 100644 --- a/docs/data-clients/route-string.md +++ b/docs/data-clients/route-string.md @@ -17,7 +17,7 @@ skipper -inline-routes '* -> inlineContent("Hello, world!") -> ' Docker Example (Open your browser http://localhost:9090/): ``` -docker run -p 9090:9090 -it registry.opensource.zalan.do/pathfinder/skipper:latest skipper -inline-routes '* -> inlineContent("Hello, world!") -> ' +docker run -p 9090:9090 -it registry.opensource.zalan.do/teapot/skipper:latest skipper -inline-routes '* -> inlineContent("Hello, world!") -> ' ``` ## Serve HTML with CSS @@ -33,7 +33,7 @@ skipper -inline-routes '* -> inlineContent(" inlineContent("") -> ' +docker run -p 9090:9090 -it registry.opensource.zalan.do/teapot/skipper:latest skipper -inline-routes '* -> inlineContent("") -> ' ``` @@ -50,7 +50,7 @@ skipper -inline-routes '* -> inlineContent("{\"foo\": 3}", "application/json; ch Docker Example (Open your browser http://localhost:9090/): ``` -docker run -p 9090:9090 -it registry.opensource.zalan.do/pathfinder/skipper:latest skipper -inline-routes '* -> inlineContent("{\"foo\": 3}", "application/json; charset=utf-8") -> ' +docker run -p 9090:9090 -it registry.opensource.zalan.do/teapot/skipper:latest skipper -inline-routes '* -> inlineContent("{\"foo\": 3}", "application/json; charset=utf-8") -> ' ``` ## Proxy to a given URL diff --git a/docs/kubernetes/deploy/daemonset/daemonset.yaml b/docs/kubernetes/deploy/daemonset/daemonset.yaml index 3864c41453..5646b0942e 100644 --- a/docs/kubernetes/deploy/daemonset/daemonset.yaml +++ b/docs/kubernetes/deploy/daemonset/daemonset.yaml @@ -31,7 +31,7 @@ spec: hostNetwork: true containers: - name: skipper-ingress - image: registry.opensource.zalan.do/pathfinder/skipper:v0.11.1 + image: registry.opensource.zalan.do/teapot/skipper:v0.12.0 ports: - name: ingress-port containerPort: 9999 diff --git a/docs/kubernetes/deploy/demo/deployment.yaml b/docs/kubernetes/deploy/demo/deployment.yaml index 19b43ad140..f7174a3df9 100644 --- a/docs/kubernetes/deploy/demo/deployment.yaml +++ b/docs/kubernetes/deploy/demo/deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: skipper-demo - image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.180 + image: registry.opensource.zalan.do/teapot/skipper:v0.12.0 args: - "skipper" - "-inline-routes" diff --git a/docs/kubernetes/deploy/deployment/deployment.yaml b/docs/kubernetes/deploy/deployment/deployment.yaml index 2b5966855f..f15db53466 100644 --- a/docs/kubernetes/deploy/deployment/deployment.yaml +++ b/docs/kubernetes/deploy/deployment/deployment.yaml @@ -39,7 +39,7 @@ spec: hostNetwork: true containers: - name: skipper-ingress - image: registry.opensource.zalan.do/pathfinder/skipper:v0.11.40 + image: registry.opensource.zalan.do/teapot/skipper:v0.12.0 ports: - name: ingress-port containerPort: 9999 diff --git a/docs/tutorials/basics.md b/docs/tutorials/basics.md index c06f87bf93..f79e110faf 100644 --- a/docs/tutorials/basics.md +++ b/docs/tutorials/basics.md @@ -254,11 +254,11 @@ The local build will write into `./bin/` directory. The current used CI flow to build the official docker container, you can see in [delivery.yaml](https://github.com/zalando/skipper/blob/master/delivery.yaml). Official release versions you will find at -`registry.opensource.zalan.do/pathfinder/skipper:${RELEASE_VERSION}`, +`registry.opensource.zalan.do/teapot/skipper:${RELEASE_VERSION}`, where `${RELEASE_VERSION}` is the git tag got by `$(git describe --tags --always --dirty)`. Test versions are released at -`registry.opensource.zalan.do/pathfinder/skipper-test:${CDP_BUILD_VERSION}` +`registry.opensource.zalan.do/teapot/skipper-test:${CDP_BUILD_VERSION}` for every pull request, limited to only repository members, because of compliance and security reasons. diff --git a/packaging/Makefile b/packaging/Makefile index d215bca1bc..53e7f4855b 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,7 +1,7 @@ .PHONY: docker-push VERSION ?= $(shell git rev-parse HEAD) -REGISTRY ?= registry-write.opensource.zalan.do/pathfinder +REGISTRY ?= registry-write.opensource.zalan.do/teapot IMAGE ?= $(REGISTRY)/skipper:$(VERSION) ARM64_IMAGE ?= $(REGISTRY)/skipper-arm64:$(VERSION) ARM_IMAGE ?= $(REGISTRY)/skipper-armv7:$(VERSION) diff --git a/packaging/helm/skipper-aws/README.md b/packaging/helm/skipper-aws/README.md index 555c76bdad..d7e9bcb44f 100644 --- a/packaging/helm/skipper-aws/README.md +++ b/packaging/helm/skipper-aws/README.md @@ -108,8 +108,8 @@ helm install --name skipper-aws . | kube_ingress_aws_controller.version | The version of kube-ingress-aws-controller to install | 0.10.1 | | kube_ingress_aws_controller.image | The image of kube-ingress-aws-controller to install | registry.opensource.zalan.do/teapot/kube-ingress-aws-controller | | kube_ingress_aws_controller.ssl_policy | The SSL policy to use | ELBSecurityPolicy-TLS-1-2-2017-01 | -| skipper.version | The version of Skipper to install | 0.11.48 | -| skipper.image | The image of Skipper to install | registry.opensource.zalan.do/pathfinder/skipper | +| skipper.version | The version of Skipper to install | 0.12.0 | +| skipper.image | The image of Skipper to install | registry.opensource.zalan.do/teapot/skipper | | skipper.cluster_ratelimit | Enable rate limiting in Skipper | false | | skipper.redis.version | The version of Redis to install | 4.0.9-master-6 | | skipper.redis.image | The image of Redis to install | registry.opensource.zalan.do/zmon/redis | diff --git a/packaging/helm/skipper-aws/values.yaml b/packaging/helm/skipper-aws/values.yaml index ca504b5098..2c099ae485 100644 --- a/packaging/helm/skipper-aws/values.yaml +++ b/packaging/helm/skipper-aws/values.yaml @@ -42,8 +42,8 @@ kube_ingress_aws_controller: # automatically create HTTP routing to endpoints for your ingress and routegroup skipper: - version: 0.11.48 - image: registry.opensource.zalan.do/pathfinder/skipper + version: 0.12.0 + image: registry.opensource.zalan.do/teapot/skipper cluster_ratelimit: false # redis is required for cluster ratelimit redis: diff --git a/readme.md b/readme.md index 898e85b46e..c928c0a034 100644 --- a/readme.md +++ b/readme.md @@ -87,13 +87,13 @@ Start Skipper and make an HTTP request: To run the latest Docker container: - docker run registry.opensource.zalan.do/pathfinder/skipper:latest + docker run registry.opensource.zalan.do/teapot/skipper:latest To run `eskip` you first mount the `.eskip` file, into the container, and run the command docker run \ -v $(PWD)/doc-docker-intro.eskip:/doc-docker-intro.eskip \ - registry.opensource.zalan.do/pathfinder/skipper:latest eskip print doc-docker-intro.eskip + registry.opensource.zalan.do/teapot/skipper:latest eskip print doc-docker-intro.eskip To run `skipper` you first mount the `.eskip` file, into the container, expose the ports and run the command @@ -101,7 +101,7 @@ To run `skipper` you first mount the `.eskip` file, into the container, expose t -v $(PWD)/doc-docker-intro.eskip:/doc-docker-intro.eskip \ -p 9090:9090 \ -p 9911:9911 \ - registry.opensource.zalan.do/pathfinder/skipper:latest skipper -routes-file doc-docker-intro.eskip + registry.opensource.zalan.do/teapot/skipper:latest skipper -routes-file doc-docker-intro.eskip Skipper will then be available on http://localhost:9090