forked from opendatahub-io/opendatahub-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Trusted Bundle Configmap to all namespaces (opendatahub-io#848)
* Add odh-trusted-ca-bundle CM to DSCInitialization (cherry picked from commit 5d415c2) * Update ca bundle configMap to use dscInit TrustedCABundle for the default value (cherry picked from commit 9a94ef6) * Add Trusted Bundle Configmap to all namespaces * Add ManagementState to TrustedCABundle Co-authored-by: Wen Zhou <wenzhou@redhat.com> fix --------- Co-authored-by: Landon LaSmith <LLaSmith@redhat.com> (cherry picked from commit d998839)
- Loading branch information
1 parent
d93a2dd
commit 1935074
Showing
13 changed files
with
531 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
controllers/certconfigmapgenerator/certconfigmapgenerator_controller.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| // Package certconfigmapgenerator contains generator logic of add cert configmap resource in user namespaces | ||
| package certconfigmapgenerator | ||
|
|
||
| import ( | ||
| "context" | ||
| "reflect" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| operatorv1 "github.com/openshift/api/operator/v1" | ||
| "github.com/pkg/errors" | ||
| corev1 "k8s.io/api/core/v1" | ||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/builder" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
|
|
||
| dsci "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1" | ||
| "github.com/opendatahub-io/opendatahub-operator/v2/pkg/trustedcabundle" | ||
| ) | ||
|
|
||
| var configmapGenLog = log.Log.WithName("cert-configmap-generator") | ||
|
|
||
| // CertConfigmapGeneratorReconciler holds the controller configuration. | ||
| type CertConfigmapGeneratorReconciler struct { //nolint:golint,revive // Readability | ||
| Client client.Client | ||
| Scheme *runtime.Scheme | ||
| Log logr.Logger | ||
| } | ||
|
|
||
| // SetupWithManager sets up the controller with the Manager. | ||
| func (r *CertConfigmapGeneratorReconciler) SetupWithManager(mgr ctrl.Manager) error { | ||
| configmapGenLog.Info("Adding controller for Configmap Generation.") | ||
| return ctrl.NewControllerManagedBy(mgr). | ||
| Named("cert-configmap-generator-controller"). | ||
| Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.watchTrustedCABundleConfigMapResource), builder.WithPredicates(ConfigMapChangedPredicate)). | ||
| Watches(&source.Kind{Type: &corev1.Namespace{}}, handler.EnqueueRequestsFromMapFunc(r.watchNamespaceResource), builder.WithPredicates(NamespaceCreatedPredicate)). | ||
| Complete(r) | ||
| } | ||
|
|
||
| // Reconcile will generate new configmap, odh-trusted-ca-bundle, that includes cluster-wide trusted-ca bundle and custom | ||
| // ca bundle in every new namespace created. | ||
| func (r *CertConfigmapGeneratorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| // Request includes namespace that is newly created or where odh-trusted-ca-bundle configmap is updated. | ||
| r.Log.Info("Reconciling certConfigMapGenerator.", " CertConfigMapGenerator Request.Namespace", req.NamespacedName) | ||
| // Get namespace instance | ||
| userNamespace := &corev1.Namespace{} | ||
| err := r.Client.Get(ctx, client.ObjectKey{Name: req.Namespace}, userNamespace) | ||
| if err != nil { | ||
| return ctrl.Result{}, errors.WithMessage(err, "error getting user namespace to inject trustedCA bundle ") | ||
| } | ||
|
|
||
| // Get DSCI instance | ||
| dsciInstances := &dsci.DSCInitializationList{} | ||
| err = r.Client.List(ctx, dsciInstances) | ||
| if err != nil { | ||
| r.Log.Error(err, "Failed to retrieve DSCInitialization resource for certconfigmapgenerator ", "CertConfigmapGenerator Request.Name", req.Name) | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| var dsciInstance *dsci.DSCInitialization | ||
| switch len(dsciInstances.Items) { | ||
| case 0: | ||
| return ctrl.Result{}, nil | ||
| case 1: | ||
| dsciInstance = &dsciInstances.Items[0] | ||
| default: | ||
| message := "only one instance of DSCInitialization object is allowed" | ||
| return ctrl.Result{}, errors.New(message) | ||
| } | ||
|
|
||
| if dsciInstance.Spec.TrustedCABundle.ManagementState != operatorv1.Managed { | ||
| return ctrl.Result{}, nil | ||
| } | ||
|
|
||
| // Verify if namespace did not opt out of trustedCABundle injection | ||
| if trustedcabundle.HasCABundleAnnotationDisabled(userNamespace) { | ||
| r.Log.Info("Namespace has opted-out of CA bundle injection using annotation ", "namespace", userNamespace.Name, | ||
| "annotation", trustedcabundle.InjectionOfCABundleAnnotatoion) | ||
| err := trustedcabundle.DeleteOdhTrustedCABundleConfigMap(ctx, r.Client, req.Namespace) | ||
| if err != nil { | ||
| if !apierrors.IsNotFound(err) { | ||
| r.Log.Error(err, "error deleting existing configmap from namespace", "name", trustedcabundle.CAConfigMapName, "namespace", req.Namespace) | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| return reconcile.Result{}, nil | ||
| } | ||
|
|
||
| // Verify odh-trusted-ca-bundle Configmap is created for the given namespace | ||
| if trustedcabundle.ShouldInjectTrustedBundle(userNamespace) { | ||
| r.Log.Info("Adding trusted CA bundle configmap to the new or existing namespace ", "namespace", userNamespace.Name, | ||
| "configmap", trustedcabundle.CAConfigMapName) | ||
| trustCAData := dsciInstance.Spec.TrustedCABundle.CustomCABundle | ||
| err = trustedcabundle.CreateOdhTrustedCABundleConfigMap(ctx, r.Client, req.Namespace, trustCAData) | ||
| if err != nil { | ||
| r.Log.Error(err, "error adding configmap to namespace", "name", trustedcabundle.CAConfigMapName, "namespace", req.Namespace) | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
||
| func (r *CertConfigmapGeneratorReconciler) watchNamespaceResource(a client.Object) []reconcile.Request { | ||
| if trustedcabundle.ShouldInjectTrustedBundle(a) { | ||
| return []reconcile.Request{{NamespacedName: types.NamespacedName{Name: trustedcabundle.CAConfigMapName, Namespace: a.GetName()}}} | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (r *CertConfigmapGeneratorReconciler) watchTrustedCABundleConfigMapResource(a client.Object) []reconcile.Request { | ||
| if a.GetName() == trustedcabundle.CAConfigMapName { | ||
| r.Log.Info("Cert configmap has been updated, start reconcile") | ||
| return []reconcile.Request{{NamespacedName: types.NamespacedName{Name: a.GetName(), Namespace: a.GetNamespace()}}} | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| var NamespaceCreatedPredicate = predicate.Funcs{ | ||
| CreateFunc: func(e event.CreateEvent) bool { | ||
| return trustedcabundle.ShouldInjectTrustedBundle(e.Object) | ||
| }, | ||
|
|
||
| // If user changes the annotation of namespace to opt out of CABundle injection, reconcile. | ||
| UpdateFunc: func(e event.UpdateEvent) bool { | ||
| oldNamespace, _ := e.ObjectOld.(*corev1.Namespace) | ||
| newNamespace, _ := e.ObjectNew.(*corev1.Namespace) | ||
|
|
||
| oldNsAnnValue, oldNsAnnExists := oldNamespace.GetAnnotations()[trustedcabundle.InjectionOfCABundleAnnotatoion] | ||
| newNsAnnValue, newNsAnnExists := newNamespace.GetAnnotations()[trustedcabundle.InjectionOfCABundleAnnotatoion] | ||
|
|
||
| if newNsAnnExists && !oldNsAnnExists { | ||
| return true | ||
| } else if newNsAnnExists && oldNsAnnExists && oldNsAnnValue != newNsAnnValue { | ||
| return true | ||
| } | ||
| return false | ||
| }, | ||
| } | ||
|
|
||
| var ConfigMapChangedPredicate = predicate.Funcs{ | ||
| UpdateFunc: func(e event.UpdateEvent) bool { | ||
| oldCM, _ := e.ObjectOld.(*corev1.ConfigMap) | ||
| newCM, _ := e.ObjectNew.(*corev1.ConfigMap) | ||
| return !reflect.DeepEqual(oldCM.Data, newCM.Data) | ||
| }, | ||
|
|
||
| DeleteFunc: func(deleteEvent event.DeleteEvent) bool { | ||
| return true | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.