github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91261 from tosi3k/am-patch-1

Browse Source 
Fix permissions in kube-addon-manager
This commit is contained in:
Kubernetes Prow Robot 2020-05-19 22:02:28 -07:00 committed by GitHub
commit cf13f8d994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/addon-manager/CHANGELOG.md
View File

@ -1,3 +1,6 @@
## Version 9.1.1 (Wed May 19 2020 Antoni Zawodny <zawodny@google.com>)
- Fix kube-addons.sh and kubectl permissions
## Version 9.1.0 (Wed May 13 2020 Antoni Zawodny <zawodny@google.com>) ## Version 9.1.0 (Wed May 13 2020 Antoni Zawodny <zawodny@google.com>)
- Enable overriding the default list of whitelisted resources - Enable overriding the default list of whitelisted resources

4
cluster/addons/addon-manager/Makefile
View File

@ -15,7 +15,7 @@
IMAGE=staging-k8s.gcr.io/kube-addon-manager IMAGE=staging-k8s.gcr.io/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v9.1.0 VERSION=v9.1.1
KUBECTL_VERSION?=v1.13.2 KUBECTL_VERSION?=v1.13.2
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.0 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.0
@ -29,7 +29,7 @@ all: build
build: build:
cp ./* $(TEMP_DIR) cp ./* $(TEMP_DIR)
curl -sSL --retry 5 https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl curl -sSL --retry 5 https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl
chmod +x $(TEMP_DIR)/kubectl chmod a+rx $(TEMP_DIR)/kube-addons.sh $(TEMP_DIR)/kubectl
cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
ifneq ($(ARCH),amd64) ifneq ($(ARCH),amd64)