scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove flannel because now everything here is upstreamed; multiarch is a thing for official flannel now

Browse Source
This commit is contained in:
Lucas Käldström
2016-09-30 23:13:04 +03:00
parent 918e99e298
commit a10a2d9f67
3 changed files with 0 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cluster/images/flannel/Dockerfile
View File

@@ -1,20 +0,0 @@
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM BASEIMAGE
COPY flanneld /opt/bin/
COPY mk-docker-opts.sh /opt/bin/
CMD ["/opt/bin/flanneld"]

66
cluster/images/flannel/Makefile
View File

@@ -1,66 +0,0 @@
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Build the flannel image
#
# Usage:
# [TAG=0.5.5] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] make build
TAG?=0.5.5
ARCH?=amd64
REGISTRY?=gcr.io/google_containers
KUBE_CROSS_TAG=$(shell cat ../../../build-image/cross/VERSION)
GOARM=6
TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2
ifeq ($(ARCH),arm)
CC=arm-linux-gnueabi-gcc
endif
ifeq ($(ARCH),arm64)
CC=aarch64-linux-gnu-gcc
endif
ifeq ($(ARCH),ppc64le)
CC=powerpc64le-linux-gnu-gcc
endif
build:
ifeq ($(ARCH),amd64)
# If we should build an amd64 flannel image, go with the official one
docker pull quay.io/coreos/flannel:$(TAG)
docker tag -f quay.io/coreos/flannel:$(TAG) $(REGISTRY)/flannel-$(ARCH):$(TAG)
else
# Copy the content in this dir to the temp dir
cp ./* $(TEMP_DIR)
docker run -it -v $(TEMP_DIR):/flannel/bin gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) /bin/bash -c \
"curl -sSL https://github.com/coreos/flannel/archive/v${TAG}.tar.gz | tar -C /flannel -xz --strip-components=1 \
&& cd /flannel && GOARM=$(GOARM) GOARCH=$(ARCH) CC=$(CC) CGO_ENABLED=1 ./build"
# Replace BASEIMAGE with the real base image
cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
# Download mk-docker-opts.sh
curl -sSL https://raw.githubusercontent.com/coreos/flannel/v$(TAG)/dist/mk-docker-opts.sh > $(TEMP_DIR)/mk-docker-opts.sh
# And build the image
docker build -t $(REGISTRY)/flannel-$(ARCH):$(TAG) $(TEMP_DIR)
endif
push: build
gcloud docker push $(REGISTRY)/flannel-$(ARCH):$(TAG)
all: build
.PHONY: build push

28
cluster/images/flannel/README.md
View File

@@ -1,28 +0,0 @@
### flannel
This is used mostly for the `docker-multinode` config, but also in other places where flannel runs in a container.
For `amd64`, this image equals to `quay.io/coreos/flannel` to maintain official support.
For other architectures, `flannel` is cross-compiled. The `debian-iptables` image serves as base image.
#### How to release
```console
# Build for linux/amd64 (default)
$ make push ARCH=amd64
# ---> gcr.io/google_containers/flannel-amd64:TAG
$ make push ARCH=arm
# ---> gcr.io/google_containers/flannel-arm:TAG
$ make push ARCH=arm64
# ---> gcr.io/google_containers/flannel-arm64:TAG
$ make push ARCH=ppc64le
# ---> gcr.io/google_containers/flannel-ppc64le:TAG
```
If you don't want to push the images, run `make` or `make build` instead
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/images/flannel/README.md?pixel)]()