Merge pull request #964 from caos/compile

fix: compile
caos · Mar 8, 2022 · 61a76ea · 61a76ea
2 parents 011d127 + 345cd23
commit 61a76ea
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 51 deletions.
diff --git a/pkg/kubernetes/resources/ambassador/mapping/adapt.go b/pkg/kubernetes/resources/ambassador/mapping/adapt.go
@@ -82,7 +82,7 @@ func AdaptFuncToEnsure(params *Arguments) (resources.QueryFunc, error) {
  "spec": spec,
  }}
 
- return func(k8sClient kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(k8sClient kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  crdName := "mappings.getambassador.io"
  _, ok, err := k8sClient.CheckCRD(crdName)
  if err != nil {

diff --git a/pkg/kubernetes/resources/ambassador/module/adapt.go b/pkg/kubernetes/resources/ambassador/module/adapt.go
@@ -38,7 +38,7 @@ func AdaptFuncToEnsure(namespace, name string, labels map[string]string, config
  "spec": spec,
  }}
 
- return func(k8sClient kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(k8sClient kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyNamespacedCRDResource(group, version, kind, namespace, name, crd)
  }, nil

diff --git a/pkg/kubernetes/resources/clusterrole/adapt.go b/pkg/kubernetes/resources/clusterrole/adapt.go
@@ -20,7 +20,7 @@ func AdaptFuncToEnsure(nameLabels *labels.Name, apiGroups, kubeResources, verbs
  Verbs: verbs,
  }},
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyClusterRole(cr)
  }, nil

diff --git a/pkg/kubernetes/resources/clusterrolebinding/adapt.go b/pkg/kubernetes/resources/clusterrolebinding/adapt.go
@@ -36,7 +36,7 @@ func AdaptFuncToEnsure(nameLabels *labels.Name, subjects []Subject, clusterrole
  Kind: "ClusterRole",
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyClusterRoleBinding(crb)
  }, nil

diff --git a/pkg/kubernetes/resources/configmap/adapt.go b/pkg/kubernetes/resources/configmap/adapt.go
@@ -16,7 +16,7 @@ func AdaptFuncToEnsure(namespace string, name string, labels map[string]string,
  },
  Data: data,
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyConfigmap(cm)
  }, nil

diff --git a/pkg/kubernetes/resources/cronjob/adapt.go b/pkg/kubernetes/resources/cronjob/adapt.go
@@ -7,7 +7,7 @@ import (
 )
 
 func AdaptFuncToEnsure(job *v1beta1.CronJob) (resources.QueryFunc, error) {
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyCronJob(job)
  }, nil

diff --git a/pkg/kubernetes/resources/deployment/adapt.go b/pkg/kubernetes/resources/deployment/adapt.go
@@ -7,7 +7,7 @@ import (
 )
 
 func AdaptFuncToEnsure(deployment *appsv1.Deployment, force bool) (resources.QueryFunc, error) {
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyDeployment(deployment, force)
  }, nil

diff --git a/pkg/kubernetes/resources/dockerconfigsecret/adapt.go b/pkg/kubernetes/resources/dockerconfigsecret/adapt.go
diff --git a/pkg/kubernetes/resources/ingress/adapt.go b/pkg/kubernetes/resources/ingress/adapt.go
@@ -43,7 +43,7 @@ func AdaptFuncToEnsure(params *Arguments) (resources.QueryFunc, error) {
  }},
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyIngress(ingress)
  }, nil

diff --git a/pkg/kubernetes/resources/job/adapt.go b/pkg/kubernetes/resources/job/adapt.go
@@ -14,7 +14,7 @@ import (
 )
 
 func AdaptFuncToEnsure(job *batch.Job) (resources.QueryFunc, error) {
- return func(k8sClient kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(k8sClient kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
 
  jobDef, err := k8sClient.GetJob(job.GetNamespace(), job.GetName())
  if err != nil && !macherrs.IsNotFound(err) {

diff --git a/pkg/kubernetes/resources/namespace/adapt.go b/pkg/kubernetes/resources/namespace/adapt.go
@@ -13,7 +13,7 @@ func AdaptFuncToEnsure(namespace string) (resources.QueryFunc, error) {
  Name: namespace,
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyNamespace(ns)
  }, nil

diff --git a/pkg/kubernetes/resources/pdb/adapt.go b/pkg/kubernetes/resources/pdb/adapt.go
@@ -24,7 +24,7 @@ func AdaptFuncToEnsure(namespace string, nameLabels *labels.Name, target *labels
  MaxUnavailable: &maxUnavailableParsed,
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyPodDisruptionBudget(pdb)
  }, nil

diff --git a/pkg/kubernetes/resources/role/adapt.go b/pkg/kubernetes/resources/role/adapt.go
@@ -21,7 +21,7 @@ func AdaptFuncToEnsure(namespace string, nameLabels *labels.Name, apiGroups, kub
  Verbs: verbs,
  }},
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyRole(role)
  }, nil

diff --git a/pkg/kubernetes/resources/rolebinding/adapt.go b/pkg/kubernetes/resources/rolebinding/adapt.go
@@ -37,7 +37,7 @@ func AdaptFuncToEnsure(namespace string, nameLabels *labels.Name, subjects []Sub
  APIGroup: "rbac.authorization.k8s.io",
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyRoleBinding(rolebinding)
  }, nil

diff --git a/pkg/kubernetes/resources/secret/adapt.go b/pkg/kubernetes/resources/secret/adapt.go
@@ -19,7 +19,7 @@ func AdaptFuncToEnsure(namespace string, id labels.IDLabels, data map[string]str
  Type: corev1.SecretTypeOpaque,
  StringData: data,
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplySecret(secret)
  }, nil

diff --git a/pkg/kubernetes/resources/service/service.go b/pkg/kubernetes/resources/service/service.go
@@ -30,7 +30,7 @@ func AdaptFuncToEnsure(
  resources.QueryFunc,
  error,
 ) {
- return func(_ kubernetes2.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes2.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  portList := make([]corev1.ServicePort, 0)
  for _, port := range ports {
  portList = append(portList, corev1.ServicePort{

diff --git a/pkg/kubernetes/resources/serviceaccount/serviceaccount.go b/pkg/kubernetes/resources/serviceaccount/serviceaccount.go
@@ -16,7 +16,7 @@ func AdaptFuncToEnsure(namespace string, nameLabels *labels.Name) (resources.Que
  Labels: labels.MustK8sMap(nameLabels),
  },
  }
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyServiceAccount(sa)
  }, nil

diff --git a/pkg/kubernetes/resources/statefulset/adapt.go b/pkg/kubernetes/resources/statefulset/adapt.go
@@ -7,7 +7,7 @@ import (
 )
 
 func AdaptFuncToEnsure(statefulset *appsv1.StatefulSet, force bool) (resources.QueryFunc, error) {
- return func(_ kubernetes.ClientInt) (resources.EnsureFunc, error) {
+ return func(_ kubernetes.ClientInt, _ map[string]interface{}) (resources.EnsureFunc, error) {
  return func(k8sClient kubernetes.ClientInt) error {
  return k8sClient.ApplyStatefulSet(statefulset, force)
  }, nil