From 2a44fcb302d5ccbffb56549ae0d39c6291e979e3 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Fri, 14 May 2021 15:31:04 -0700 Subject: [PATCH] chore: Remove installer code --- Dockerfile | 2 - manager/controllers/bus/installer.go | 248 --------------------- manager/controllers/bus/installer_test.go | 13 -- manager/controllers/pipeline_controller.go | 19 -- manager/main.go | 6 +- 5 files changed, 1 insertion(+), 287 deletions(-) delete mode 100644 manager/controllers/bus/installer.go delete mode 100644 manager/controllers/bus/installer_test.go diff --git a/Dockerfile b/Dockerfile index a9b80d28..045da94e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -a -l FROM gcr.io/distroless/static:nonroot AS controller WORKDIR / COPY --from=controller-builder /workspace/bin/manager . -COPY config/kafka-default.yaml /config/ -COPY config/stan-default.yaml /config/ USER 9653:9653 ENTRYPOINT ["/manager"] diff --git a/manager/controllers/bus/installer.go b/manager/controllers/bus/installer.go deleted file mode 100644 index 41abf757..00000000 --- a/manager/controllers/bus/installer.go +++ /dev/null @@ -1,248 +0,0 @@ -package bus - -import ( - "context" - "fmt" - "io/ioutil" - "os" - "path/filepath" - "strings" - - "k8s.io/client-go/rest" - - dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1" - "github.com/argoproj-labs/argo-dataflow/shared/util" - - appsv1 "k8s.io/api/apps/v1" - rbacv1 "k8s.io/api/rbac/v1" - apierr "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/dynamic" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/log/zap" -) - -var ( - logger = zap.New() - images = make(map[string]string) - enabled = os.Getenv(dfv1.EnvInstaller) == "true" -) - -type Installer interface { - Install(ctx context.Context, name, namespace string) error -} - -func NewInstaller() Installer { - if enabled { - restConfig := ctrl.GetConfigOrDie() - return &installer{ - restConfig: restConfig, - dynamicInterface: dynamic.NewForConfigOrDie(restConfig), - } - } - return nil -} - -type installer struct { - restConfig *rest.Config - dynamicInterface dynamic.Interface -} - -func init() { - v := os.Getenv(dfv1.EnvInstallerImages) - if v == "" { - v = ` -{ - "nats-streaming": "docker.io/nats-streaming", - "nats": "docker.io/nats", - "quay.io/argoproj/dataflow-runner": "quay.io/argoproj/dataflow-runner", - "solsson/kafka-initutils": "docker.io/solsson/kafka-initutils", - "solsson/kafka": "docker.io/solsson/kafka" -} -` - } - util.MustUnJSON(v, &images) - logger.Info("installer config", - "enabled", enabled, - "images", images, - ) -} - -func imageName(x string) (string, error) { - parts := strings.SplitN(x, ":", 2) - if len(parts) != 2 { - return "", fmt.Errorf("expected format image:name, got %q", x) - } - name := parts[0] - tag := parts[1] - if y, ok := images[name]; ok { - parts := strings.SplitN(y, ":", 2) - newName := parts[0] - newTag := tag - if len(parts) == 2 { - newTag = parts[1] - } - return newName + ":" + newTag, nil - } else { - return x, nil - } -} - -func (i installer) Install(ctx context.Context, name, namespace string) error { - filename := filepath.Join("config", name+".yaml") - v, err := ioutil.ReadFile(filename) - if os.IsNotExist(err) { - logger.Info("bus not found", "name", name) - return nil - } else if err != nil { - return fmt.Errorf("failed to read file %s: %w", filename, err) - } - logger.Info("installing", "name", name, "namespace", namespace) - list, err := util.SplitYAML(v) - if err != nil { - return fmt.Errorf("failed to split YAML: %w", err) - } - for _, item := range list.Items { - if err := i.apply(ctx, namespace, &item); err != nil { - return err - } - } - return nil -} - -func (i installer) apply(ctx context.Context, namespace string, item *unstructured.Unstructured) error { - switch item.GetKind() { - case "ClusterRoleBinding": - x := &rbacv1.ClusterRoleBinding{} - if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, x); err != nil { - return fmt.Errorf("failed to convert from unstructured: %w", err) - } - for _, s := range x.Subjects { - s.Namespace = namespace - } - if v, err := runtime.DefaultUnstructuredConverter.ToUnstructured(x); err != nil { - return fmt.Errorf("failed to convert to unstructured: %w", err) - } else { - item.Object = v - } - case "RoleBinding": - x := &rbacv1.RoleBinding{} - if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, x); err != nil { - return fmt.Errorf("failed to convert from unstructured: %w", err) - } - for _, s := range x.Subjects { - s.Namespace = namespace - } - if v, err := runtime.DefaultUnstructuredConverter.ToUnstructured(x); err != nil { - return fmt.Errorf("failed to convert to unstructured: %w", err) - } else { - item.Object = v - } - case "StatefulSet": - x := &appsv1.StatefulSet{} - if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, x); err != nil { - return fmt.Errorf("failed to convert from unstructured: %w", err) - } - for i, c := range x.Spec.Template.Spec.Containers { - if v, err := imageName(c.Image); err != nil { - return err - } else { - c.Image = v - } - x.Spec.Template.Spec.Containers[i] = c - } - if v, err := runtime.DefaultUnstructuredConverter.ToUnstructured(x); err != nil { - return fmt.Errorf("failed to convert to unstructured: %w", err) - } else { - item.Object = v - } - } - - if item.GetAnnotations() == nil { - item.SetAnnotations(map[string]string{}) - } - if item.GetLabels() == nil { - item.SetLabels(map[string]string{}) - } - - labels := item.GetLabels() - labels["app.kubernetes.io/managed-by"] = "argo-dataflow" - labels["app.kubernetes.io/created-by"] = "controller-manager" - item.SetLabels(labels) - - item.SetNamespace(namespace) - - annotations := item.GetAnnotations() - annotations[dfv1.KeyHash] = util.MustHash(item) - item.SetAnnotations(annotations) - - resourceInterface := i.resourceInterface(item, namespace) - if _, err := resourceInterface.Create(ctx, item, metav1.CreateOptions{}); err != nil { - if apierr.IsAlreadyExists(err) { - old, err := resourceInterface.Get(ctx, item.GetName(), metav1.GetOptions{}) - if err != nil { - return fmt.Errorf("failed to get %s/%s: %w", item.GetKind(), item.GetName(), err) - } - if old.GetAnnotations()[dfv1.KeyHash] != item.GetAnnotations()[dfv1.KeyHash] { - logger.Info("resource already exists, but hash has changed, deleting and re-creating", "kind", item.GetKind(), "name", item.GetName()) - if err := resourceInterface.Delete(ctx, item.GetName(), metav1.DeleteOptions{}); err != nil { - return fmt.Errorf("failed to delete changed %s/%s: %w", item.GetKind(), item.GetName(), err) - } - if _, err := resourceInterface.Create(ctx, item, metav1.CreateOptions{}); err != nil { - return fmt.Errorf("failed to re-create %s/%s: %w", item.GetKind(), item.GetName(), err) - } - } - } else { - return fmt.Errorf("failed to create %s/%s: %w", item.GetKind(), item.GetName(), err) - } - } else { - logger.Info("created", "kind", item.GetKind(), "name", item.GetName()) - } - return nil -} - -func (i installer) resourceInterface(item *unstructured.Unstructured, namespace string) dynamic.ResourceInterface { - gvr := item.GroupVersionKind().GroupVersion().WithResource(util.Resource(item.GetKind())) - var resourceInterface dynamic.ResourceInterface - if strings.HasPrefix(item.GetKind(), "Cluster") { - resourceInterface = i.dynamicInterface.Resource(gvr) - } else { - resourceInterface = i.dynamicInterface.Resource(gvr).Namespace(namespace) - } - return resourceInterface -} - -func (i installer) Uninstall(ctx context.Context, name, namespace string) error { - filename := filepath.Join("config", name+".yaml") - v, err := ioutil.ReadFile(filename) - if os.IsNotExist(err) { - return nil - } else if err != nil { - return fmt.Errorf("failed to read file %s: %w", filename, err) - } - logger.Info("un-installing", "name", name, "namespace", namespace) - list, err := util.SplitYAML(v) - if err != nil { - return fmt.Errorf("failed to split YAML: %w", err) - } - for _, item := range list.Items { - if err := i._delete(ctx, namespace, &item); err != nil { - return err - } - } - return nil -} - -func (i installer) _delete(ctx context.Context, namespace string, item *unstructured.Unstructured) error { - resourceInterface := i.resourceInterface(item, namespace) - if err := resourceInterface.Delete(ctx, item.GetName(), metav1.DeleteOptions{}); err != nil { - if util.IgnoreNotFound(err) != nil { - return fmt.Errorf("failed to delete %s/%s: %w", item.GetKind(), item.GetName(), err) - } - } else { - logger.Info("deleted", "kind", item.GetKind(), "name", item.GetName()) - } - return nil -} diff --git a/manager/controllers/bus/installer_test.go b/manager/controllers/bus/installer_test.go deleted file mode 100644 index 99f9e61a..00000000 --- a/manager/controllers/bus/installer_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package bus - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func Test_imageName(t *testing.T) { - name, err := imageName("nats:foo") - assert.NoError(t, err) - assert.Equal(t, "docker.io/nats:foo", name) -} diff --git a/manager/controllers/pipeline_controller.go b/manager/controllers/pipeline_controller.go index d740d50c..f02ab97a 100644 --- a/manager/controllers/pipeline_controller.go +++ b/manager/controllers/pipeline_controller.go @@ -32,7 +32,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1" - "github.com/argoproj-labs/argo-dataflow/manager/controllers/bus" "github.com/argoproj-labs/argo-dataflow/shared/containerkiller" "github.com/argoproj-labs/argo-dataflow/shared/util" ) @@ -43,7 +42,6 @@ type PipelineReconciler struct { Log logr.Logger Scheme *runtime.Scheme ContainerKiller containerkiller.Interface - Installer bus.Installer } // +kubebuilder:rbac:groups=dataflow.argoproj.io,resources=pipelines,verbs=get;list;watch;create;update;patch;delete @@ -68,23 +66,6 @@ func (r *PipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c return ctrl.Result{}, nil } - if r.Installer != nil && pipeline.Status == nil { - r.Log.Info("first reconciliation, installing requisite buses") - for _, step := range pipeline.Spec.Steps { - for _, x := range step.Sources { - if y := x.Kafka; y != nil { - if err := r.Installer.Install(ctx, "kafka-"+y.Name, req.Namespace); err != nil { - return ctrl.Result{}, fmt.Errorf("failed to install kafka: %w", err) - } - } else if y := x.STAN; y != nil { - if err := r.Installer.Install(ctx, "stan-"+y.Name, req.Namespace); err != nil { - return ctrl.Result{}, fmt.Errorf("failed to install stan: %w", err) - } - } - } - } - } - log.Info("reconciling", "steps", len(pipeline.Spec.Steps)) for _, step := range pipeline.Spec.Steps { diff --git a/manager/main.go b/manager/main.go index cc7be9ae..ccd88955 100644 --- a/manager/main.go +++ b/manager/main.go @@ -21,11 +21,8 @@ import ( "fmt" "os" - "k8s.io/client-go/kubernetes" - - "github.com/argoproj-labs/argo-dataflow/manager/controllers/bus" - "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/kubernetes" clientgoscheme "k8s.io/client-go/kubernetes/scheme" _ "k8s.io/client-go/plugin/pkg/client/auth" ctrl "sigs.k8s.io/controller-runtime" @@ -79,7 +76,6 @@ func main() { Log: ctrl.Log.WithName("controllers").WithName("Pipeline"), Scheme: mgr.GetScheme(), ContainerKiller: containerKiller, - Installer: bus.NewInstaller(), }).SetupWithManager(mgr); err != nil { panic(fmt.Errorf("unable to create controller manager: %w", err)) }