✨release v1.4.0 (#82)

yunify · Sep 5, 2019 · d79a44d · d79a44d
1 parent b48970d
commit d79a44d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,18 @@
 # Changelog
+## [ 1.4.0 ] - 2019-09-05
+### Added
+- support adding tags to resources [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/78)
+### Changed
+- ✨change gcfg to yaml [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/76)
+- ✈️ refactor error handling [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/75)
+- simplify deployment [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/78)
+
+### Fixed
+- 🚒 fix updates not working as expected [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/70)
+- 🚒 fix listener not working when ports changing from "aabb" style to "aa" [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/71)
+- 🚒 fix jenkinsfile [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/73)
+- 🚒 add cleanup before/after e2e [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/80)
+
 ## [ 1.3.5 ] - 2019-08-07
 ### Fixed
 - when changing ports in service, old listeners are not deleted [@magicsong](https://github.com/yunify/qingcloud-cloud-controller-manager/pull/68)

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 # Vars describing project
 NAME= qingcloud-cloud-controller-manager
 GIT_REPOSITORY= github.com/yunify/qingcloud-cloud-controller-manager
-IMG?= kubespheredev/cloud-controller-manager:v1.3.6
+IMG?= kubespheredev/cloud-controller-manager:v1.4.0
 
 # Generate vars to be included from external script
 # Allows using bash to generate complex vars, such as project versions

diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@
 2. 生成配置文件。下面展示了配置文件的样子(Yaml格式)。
   `cat qingcloud.yaml `，修改其中一些字段：
     ```yaml
-    qyConfigPath: /etc/qingcloud/config.yaml  #青云api密钥存放的位置，必填
     zone: ap2a
     defaultVxNetForLB: vxnet-lddzg8e #lb的默认vxnet，必填
     clusterID: "mycluster" #集群名称，必填，任意字符串，但是必须保证在一个网段内唯一。
@@ -35,7 +34,7 @@
     ```
     创建`secret`, `kubectl create secret generic qcsecret --from-file=$secret_file -n kube-system`，替换其中的secret_file为上面生成的密钥地址。
 
-3. 安装yaml，等待安装完成即可
+4. 安装yaml，等待安装完成即可
    ```
    kubectl apply -f https://raw.githubusercontent.com/yunify/qingcloud-cloud-controller-manager/master/deploy/kube-cloud-controller-manager.yaml
    ```

diff --git a/deploy/kube-cloud-controller-manager.yaml b/deploy/kube-cloud-controller-manager.yaml
@@ -25,7 +25,7 @@ spec:
         - --v=3
         - --cloud-provider=qingcloud
         - --cloud-config=/etc/kubernetes/qingcloud.yaml
-        image: kubespheredev/cloud-controller-manager:v1.3.5
+        image: kubespheredev/cloud-controller-manager:v1.4.0
         imagePullPolicy: Always
         name: qingcloud-cloud-controller-manager
         resources:

diff --git a/pkg/loadbalance/loadbalancer.go b/pkg/loadbalance/loadbalancer.go
@@ -234,6 +234,7 @@ func (l *LoadBalancer) EnsureEIP() error {
 		l.EIPs = []string{eip.ID}
 	} else {
 		if len(l.EIPs) == 0 {
+			klog.V(3).Infof("Current service annotation %+v", l.service.Annotations)
 			return fmt.Errorf("Must specify a eip on service %s, current eip source :%s", l.service.Name, l.EIPAllocateSource)
 		}
 	}

diff --git a/pkg/qingcloud/qingcloud.go b/pkg/qingcloud/qingcloud.go
@@ -22,10 +22,10 @@ import (
 
 const (
 	ProviderName = "qingcloud"
+	QYConfigPath = "/etc/qingcloud/config.yaml"
 )
 
 type Config struct {
-	QYConfigPath      string   `yaml:"qyConfigPath"`
 	Zone              string   `yaml:"zone"`
 	DefaultVxNetForLB string   `yaml:"defaultVxNetForLB,omitempty"`
 	ClusterID         string   `yaml:"clusterID"`
@@ -85,7 +85,7 @@ func newQingCloud(config Config) (cloudprovider.Interface, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err = qcConfig.LoadConfigFromFilepath(config.QYConfigPath); err != nil {
+	if err = qcConfig.LoadConfigFromFilepath(QYConfigPath); err != nil {
 		return nil, err
 	}
 	qcService, err := qcservice.Init(qcConfig)