Skip to content

✨ Getting cluster extension running #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2024
Merged

✨ Getting cluster extension running #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
811e0c5
Getting cluster extension running
varshaprasad96 Apr 26, 2024
2737bff
Specify namespace to create secret
varshaprasad96 Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
Expand Down Expand Up @@ -126,7 +127,9 @@ func main() {
cl := mgr.GetClient()
catalogClient := catalogclient.New(cl, cache.NewFilesystemCache(cachePath, &http.Client{Timeout: 10 * time.Second}))

cfgGetter, err := helmclient.NewActionConfigGetter(mgr.GetConfig(), mgr.GetRESTMapper(), mgr.GetLogger())
cfgGetter, err := helmclient.NewActionConfigGetter(mgr.GetConfig(), mgr.GetRESTMapper(), mgr.GetLogger(), helmclient.StorageNamespaceMapper(func(o client.Object) (string, error) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need not set the namespace of the CE anymore, figured that StorageNamespaceMapper can be used to specify the namespace of the helm secret.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually, this should come from the CE, though?

Copy link
Member Author

@varshaprasad96 varshaprasad96 Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, no need to set namespace in CE anymore. It would be whatever we specify here, and not from CE.

return systemNamespace, nil
}))
if err != nil {
setupLog.Error(err, "unable to config for creating helm client")
os.Exit(1)
Expand Down
30 changes: 12 additions & 18 deletions internal/controllers/clusterextension_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ type ClusterExtensionReconciler struct {
//+kubebuilder:rbac:groups=catalogd.operatorframework.io,resources=catalogmetadata,verbs=list;watch

func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
fmt.Println("start reconciling")

l := log.FromContext(ctx).WithName("operator-controller")
l.V(1).Info("starting")
defer l.V(1).Info("ending")
Expand Down Expand Up @@ -159,21 +157,18 @@ func checkForUnexpectedFieldChange(a, b ocv1alpha1.ClusterExtension) bool {
//nolint:unparam
func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alpha1.ClusterExtension) (ctrl.Result, error) {
// run resolution
fmt.Println("reconciling!!!")
bundle, err := r.resolve(ctx, *ext)
if err != nil {
// set right statuses
return ctrl.Result{}, fmt.Errorf("error resolving: %v", err)
return ctrl.Result{}, err
}

bundleVersion, err := bundle.Version()
if err != nil {
setInstalledStatusConditionFailed(&ext.Status.Conditions, fmt.Sprintf("%s:%v", "unable to get resolved bundle version", err), ext.Generation)
return ctrl.Result{}, fmt.Errorf("error bundleVersion: %v", err)
return ctrl.Result{}, err
}

fmt.Printf("bundle Version %q", bundleVersion)

// Now we can set the Resolved Condition, and the resolvedBundleSource field to the bundle.Image value.
ext.Status.ResolvedBundle = bundleMetadataFor(bundle)
setResolvedStatusConditionSuccess(&ext.Status.Conditions, fmt.Sprintf("resolved to %q", bundle.Image), ext.GetGeneration())
Expand All @@ -185,10 +180,9 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
bs := r.GenerateExpectedBundleSource(bundle.Image)
unpackResult, err := r.Unpacker.Unpack(ctx, bs, ext)
if err != nil {
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, fmt.Errorf("source bundle content: %v", err))
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
}

fmt.Println("unpack state", unpackResult.State)
switch unpackResult.State {
case rukpaksource.StatePending:
updateStatusUnpackPending(&ext.Status, unpackResult)
Expand All @@ -200,15 +194,15 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
return ctrl.Result{}, nil
case rukpaksource.StateUnpacked:
if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil {
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, fmt.Errorf("persist bundle content: %v", err))
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
}
contentURL, err := r.Storage.URLFor(ctx, ext)
if err != nil {
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, fmt.Errorf("get content URL: %v", err))
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
}
updateStatusUnpacked(&ext.Status, unpackResult, contentURL)
default:
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, fmt.Errorf("unknown unpack state %q: %v", unpackResult.State, err))
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
}

bundleFS, err := r.Storage.Load(ctx, ext)
Expand All @@ -233,7 +227,6 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
return ctrl.Result{}, err
}

ext.SetNamespace(r.ReleaseNamespace)
ac, err := r.ActionClientGetter.ActionClientFor(ext)
if err != nil {
setInstalledStatusConditionFailed(&ext.Status.Conditions, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonErrorGettingClient, err), ext.Generation)
Expand Down Expand Up @@ -480,6 +473,7 @@ func (r *ClusterExtensionReconciler) SetupWithManager(mgr ctrl.Manager) error {
}
r.controller = controller
r.cache = mgr.GetCache()
r.dynamicWatchGVKs = map[schema.GroupVersionKind]struct{}{}
return nil
}

Expand Down Expand Up @@ -561,7 +555,7 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh
func (r *ClusterExtensionReconciler) resolve(ctx context.Context, clusterExtension ocv1alpha1.ClusterExtension) (*catalogmetadata.Bundle, error) {
allBundles, err := r.BundleProvider.Bundles(ctx)
if err != nil {
return nil, fmt.Errorf("error listing bundles: %v", err)
return nil, err
}

// TODO: change clusterExtension spec to contain a source field.
Expand Down Expand Up @@ -590,7 +584,7 @@ func (r *ClusterExtensionReconciler) resolve(ctx context.Context, clusterExtensi
if clusterExtension.Spec.UpgradeConstraintPolicy != ocv1alpha1.UpgradeConstraintPolicyIgnore {
installedVersionSemver, err := r.getInstalledVersion(clusterExtension)
if err != nil && !apierrors.IsNotFound(err) {
return nil, fmt.Errorf("err: %v", err)
return nil, err
}
if installedVersionSemver != nil {
installedVersion = installedVersionSemver.String()
Expand Down Expand Up @@ -636,7 +630,7 @@ func (r *ClusterExtensionReconciler) getInstalledVersion(clusterExtension ocv1al
// get the chart annotations.
release, err := cl.Get(clusterExtension.GetName())
if err != nil && !errors.Is(err, driver.ErrReleaseNotFound) {
return nil, fmt.Errorf("error fetching chart: %v", err)
return nil, err
}
if release == nil {
return nil, nil
Expand Down Expand Up @@ -734,12 +728,12 @@ func (p *postrenderer) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, erro
break
}
if err != nil {
return nil, fmt.Errorf("error decoding objeccts %v", err)
return nil, err
}
obj.SetLabels(util.MergeMaps(obj.GetLabels(), p.labels))
b, err := obj.MarshalJSON()
if err != nil {
return nil, fmt.Errorf("error marshalling: %v", err)
return nil, err
}
buf.Write(b)
}
Expand Down