diff --git a/cluster-autoscaler/cloudprovider/azure/azure_util.go b/cluster-autoscaler/cloudprovider/azure/azure_util.go index 98d1b3f465f58520f29340d3d2c56dec4fe96d2e..cdbe5c8934e451fa76d6daff2a237302a51bc4c9 100644 --- a/cluster-autoscaler/cloudprovider/azure/azure_util.go +++ b/cluster-autoscaler/cloudprovider/azure/azure_util.go @@ -35,10 +35,10 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "golang.org/x/crypto/pkcs12" - "k8s.io/klog" "k8s.io/autoscaler/cluster-autoscaler/cloudprovider" - "k8s.io/client-go/pkg/version" + "k8s.io/autoscaler/cluster-autoscaler/version" + "k8s.io/klog" ) const ( @@ -229,8 +229,7 @@ func decodePkcs12(pkcs []byte, password string) (*x509.Certificate, *rsa.Private // example: // Azure-SDK-for-Go/7.0.1-beta arm-network/2016-09-01; cluster-autoscaler/v1.7.0-alpha.2.711+a2fadef8170bb0-dirty; func configureUserAgent(client *autorest.Client) { - k8sVersion := version.Get().GitVersion - client.UserAgent = fmt.Sprintf("%s; cluster-autoscaler/%s", client.UserAgent, k8sVersion) + client.UserAgent = fmt.Sprintf("%s; cluster-autoscaler/%s", client.UserAgent, version.ClusterAutoscalerVersion) } // normalizeForK8sVMASScalingUp takes a template and removes elements that are unwanted in a K8s VMAS scale up/down case diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go index 012ea3cad92adeeceb4559950e12e8d06f075062..9442226852844ccd7bd4d2fccf59e726e7b4b3ba 100644 --- a/cluster-autoscaler/main.go +++ b/cluster-autoscaler/main.go @@ -43,6 +43,7 @@ import ( "k8s.io/autoscaler/cluster-autoscaler/utils/errors" kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes" "k8s.io/autoscaler/cluster-autoscaler/utils/units" + "k8s.io/autoscaler/cluster-autoscaler/version" kube_client "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -332,7 +333,7 @@ func main() { kube_flag.InitFlags() healthCheck := metrics.NewHealthCheck(*maxInactivityTimeFlag, *maxFailingTimeFlag) - klog.V(1).Infof("Cluster Autoscaler %s", ClusterAutoscalerVersion) + klog.V(1).Infof("Cluster Autoscaler %s", version.ClusterAutoscalerVersion) go func() { http.Handle("/metrics", prometheus.Handler()) diff --git a/cluster-autoscaler/version.go b/cluster-autoscaler/version/version.go similarity index 97% rename from cluster-autoscaler/version.go rename to cluster-autoscaler/version/version.go index 8c9c377bde9affcd510f94840866df134c4a7e95..c4ce62e1e69d46da8363173e41b21e91d88a238c 100644 --- a/cluster-autoscaler/version.go +++ b/cluster-autoscaler/version/version.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package main +package version // ClusterAutoscalerVersion contains version of CA. const ClusterAutoscalerVersion = "1.13.8"