fix(prometheus): fix k8s 1.16 cannot install prometheus

Signed-off-by: Feng Kun <[email protected]>
GaoXiaodong · Aug 18, 2020 · cc357e7 · cc357e7
1 parent 50f61d2
commit cc357e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/monitor/controller/prometheus/controller.go b/pkg/monitor/controller/prometheus/controller.go
@@ -639,7 +639,7 @@ func (c *Controller) installPrometheus(ctx context.Context, prometheus *v1.Prome
 
  crds := getCRDs()
  for _, crd := range crds {
- if apiclient.ClusterVersionIsBefore117(kubeClient) {
+ if apiclient.ClusterVersionIsBefore116(kubeClient) {
  crdObj := apiextensionsv1beta1.CustomResourceDefinition{}
  err := json.Unmarshal([]byte(crd), &crdObj)
  if err != nil {
@@ -2336,7 +2336,7 @@ func (c *Controller) uninstallPrometheus(ctx context.Context, prometheus *v1.Pro
 
  crds := getCRDs()
  for _, crd := range crds {
- if apiclient.ClusterVersionIsBefore117(kubeClient) {
+ if apiclient.ClusterVersionIsBefore116(kubeClient) {
  crdObj := apiextensionsv1beta1.CustomResourceDefinition{}
  err := json.Unmarshal([]byte(crd), &crdObj)
  if err != nil {

diff --git a/pkg/platform/controller/addon/prometheus/controller.go b/pkg/platform/controller/addon/prometheus/controller.go
@@ -631,7 +631,7 @@ func (c *Controller) installPrometheus(ctx context.Context, prometheus *v1.Prome
 
  crds := getCRDs()
  for _, crd := range crds {
- if apiclient.ClusterVersionIsBefore117(kubeClient) {
+ if apiclient.ClusterVersionIsBefore116(kubeClient) {
  crdObj := apiextensionsv1beta1.CustomResourceDefinition{}
  err := json.Unmarshal([]byte(crd), &crdObj)
  if err != nil {
@@ -2327,7 +2327,7 @@ func (c *Controller) uninstallPrometheus(ctx context.Context, prometheus *v1.Pro
 
  crds := getCRDs()
  for _, crd := range crds {
- if apiclient.ClusterVersionIsBefore117(kubeClient) {
+ if apiclient.ClusterVersionIsBefore116(kubeClient) {
  crdObj := apiextensionsv1beta1.CustomResourceDefinition{}
  err := json.Unmarshal([]byte(crd), &crdObj)
  if err != nil {

diff --git a/pkg/util/apiclient/version.go b/pkg/util/apiclient/version.go
@@ -35,8 +35,8 @@ func ClusterVersionIsBefore19(client kubernetes.Interface) bool {
  return result
 }
 
-func ClusterVersionIsBefore117(client kubernetes.Interface) bool {
- result, err := CheckClusterVersion(client, "< 1.17")
+func ClusterVersionIsBefore116(client kubernetes.Interface) bool {
+ result, err := CheckClusterVersion(client, "< 1.16")
  if err != nil {
  return false
  }