Skip to content

feat: update controller runtime to v0.9.5 #567

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 5 commits into from
Sep 2, 2021
Merged

feat: update controller runtime to v0.9.5 #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8555854
Update codebase to reflect later k8s APIs
amisevsk Jul 30, 2021
d4677a9
Update dependencies to match controller-runtime v0.9.5
amisevsk Jul 30, 2021
62f1cb6
Regenerate deployment files and OLM bundle
amisevsk Aug 3, 2021
458c1cd
Update devworkspace configmap handling to work with the new controlle…
JPinkney Aug 31, 2021
d7387b8
Call go env GOPROXY before go mod tidy and vendor
JPinkney Sep 1, 2021
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
3 changes: 2 additions & 1 deletion .ci/openshift_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,15 @@ export CI_COMPONENT="devworkspace-operator"
# DEVWORKSPACE_OPERATOR env var exposed by Openshift CI in e2e test pod. More info about how images are builded in Openshift CI: https://github.com/openshift/ci-tools/blob/master/TEMPLATES.md#parameters-available-to-templates
# Dependencies environment are defined here: https://github.com/openshift/release/blob/master/ci-operator/config/devfile/devworkspace-operator/devfile-devworkspace-operator-master__v5.yaml#L36-L38

export DWO_IMG=${DEVWORKSPACE_OPERATOR}
export DWO_IMG="quay.io/jpinkney/devworkspace-controller-test:latest"

# Pod created by openshift ci don't have user. Using this envs should avoid errors with git user.
export GIT_COMMITTER_NAME="CI BOT"
export GIT_COMMITTER_EMAIL="[email protected]"

# For some reason go on PROW force usage vendor folder
# This workaround is here until we don't figure out cause
go env GOPROXY
go mod tidy
go mod vendor

Expand Down
4 changes: 1 addition & 3 deletions controllers/controller/devworkspacerouting/devworkspacerouting_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ type DevWorkspaceRoutingReconciler struct {
// +kubebuidler:rbac:groups=route.openshift.io,resources=routes/status,verbs=get,list,watch
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes/custom-host,verbs=create

func (r *DevWorkspaceRoutingReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()

func (r *DevWorkspaceRoutingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
reqLogger := r.Log.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)

// Fetch the DevWorkspaceRouting instance
Expand Down
19 changes: 8 additions & 11 deletions controllers/workspace/devworkspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ type DevWorkspaceReconciler struct {
// +kubebuilder:rbac:groups=workspace.devfile.io,resources=*,verbs=*
// +kubebuilder:rbac:groups=controller.devfile.io,resources=*,verbs=*
/////// Required permissions for controller
// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;create;update
// +kubebuilder:rbac:groups=apps;extensions,resources=deployments;replicasets,verbs=*
// +kubebuilder:rbac:groups="",resources=pods;serviceaccounts;secrets;configmaps;persistentvolumeclaims,verbs=*
// +kubebuilder:rbac:groups="",resources=namespaces;events,verbs=get;list;watch
Expand All @@ -82,8 +83,7 @@ type DevWorkspaceReconciler struct {
// +kubebuilder:rbac:groups=apps;extensions,resources=deployments,verbs=get;list;watch
// +kubebuilder:rbac:groups="",resources=secrets,resourceNames=workspace-credentials-secret,verbs=get;create;delete

func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ctrl.Result, err error) {
ctx := context.Background()
func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (reconcileResult ctrl.Result, err error) {
reqLogger := r.Log.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
clusterAPI := wsprovision.ClusterAPI{
Client: r.Client,
Expand Down Expand Up @@ -465,9 +465,8 @@ func getWorkspaceId(instance *dw.DevWorkspace) (string, error) {

// Mapping the pod to the devworkspace
func dwRelatedPodsHandler() handler.EventHandler {
podToDW := func(mapObj handler.MapObject) []reconcile.Request {
meta := mapObj.Meta
labels := meta.GetLabels()
podToDW := func(obj client.Object) []reconcile.Request {
labels := obj.GetLabels()
if _, ok := labels[constants.DevWorkspaceNameLabel]; !ok {
return nil
}
Expand All @@ -481,12 +480,12 @@ func dwRelatedPodsHandler() handler.EventHandler {
{
NamespacedName: types.NamespacedName{
Name: labels[constants.DevWorkspaceNameLabel],
Namespace: meta.GetNamespace(),
Namespace: obj.GetNamespace(),
},
},
}
}
return &handler.EnqueueRequestsFromMapFunc{ToRequests: handler.ToRequestsFunc(podToDW)}
return handler.EnqueueRequestsFromMapFunc(podToDW)
}

func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
Expand All @@ -495,7 +494,7 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
return err
}

var emptyMapper handler.ToRequestsFunc = func(obj handler.MapObject) []reconcile.Request {
var emptyMapper = func(obj client.Object) []reconcile.Request {
return []reconcile.Request{}
}

Expand All @@ -513,9 +512,7 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&batchv1.Job{}).
Owns(&controllerv1alpha1.DevWorkspaceRouting{}).
Watches(&source.Kind{Type: &corev1.Pod{}}, dwRelatedPodsHandler()).
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, &handler.EnqueueRequestsFromMapFunc{
ToRequests: emptyMapper,
}, configMapWatcher).
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(emptyMapper), configMapWatcher).
WithEventFilter(predicates).
WithEventFilter(podPredicates).
Complete(r)
Expand Down
Loading