feat(ci): build provider res in ci (#912)

tkestack · Nov 17, 2020 · 45b2fcd · 45b2fcd
1 parent fa61791
commit 45b2fcd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -134,8 +134,12 @@ lint:
 test:
 	@$(MAKE) go.test
 
+.PHONY: release.provider
+release.provider:
+	cd build/docker/tools/provider-res && make all
+
 .PHONY: release.build
-release.build:
+release.build: release.provider
 	make push.multiarch
 
 ## release: Release tke

diff --git a/build/docker/tools/provider-res/Makefile b/build/docker/tools/provider-res/Makefile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations under the License.
 
 IMAGE = provider-res
-VERSION = v1.18.3-1
+VERSION = v1.18.3-2
 REGISTRY_PREFIX ?= tkestack
 
 COMMON_SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

diff --git a/build/docker/tools/tke-installer/release.sh b/build/docker/tools/tke-installer/release.sh
@@ -23,7 +23,7 @@ set -o pipefail
 REGISTRY_PREFIX=${REGISTRY_PREFIX:-tkestack}
 BUILDER=${BUILDER:-default}
 VERSION=${VERSION:-$(git describe --dirty --always --tags | sed 's/-/./g')}
-PROVIDER_RES_VERSION=v1.18.3-1
+PROVIDER_RES_VERSION=v1.18.3-2
 K8S_VERSION=${PROVIDER_RES_VERSION%-*}
 DOCKER_VERSION=19.03.9
 OSS=(linux)

diff --git a/cmd/tke-installer/app/installer/images/images.go b/cmd/tke-installer/app/installer/images/images.go
@@ -72,7 +72,7 @@ var components = Components{
 	Busybox:  containerregistry.Image{Name: "busybox", Tag: "1.31.1"},
 	InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.7.9"},
 
-	ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.18.3-1"},
+	ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.18.3-2"},
 
 	TKEAuthAPI:               containerregistry.Image{Name: "tke-auth-api", Tag: Version},
 	TKEAuthController:        containerregistry.Image{Name: "tke-auth-controller", Tag: Version},

diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -29,7 +29,7 @@ var (
 	OSs           = []string{"linux"}
 
 	K8sVersionConstraint = ">= 1.10"
-	K8sVersions          = []string{"1.18.3", "1.17.13", "1.16.9", "1.16.6"}
+	K8sVersions          = []string{"1.18.3", "1.17.13", "1.16.9"}
 	K8sVersionsWithV     = funk.Map(K8sVersions, func(s string) string {
 		return "v" + s
 	}).([]string)