Add Support for Observe Only Resources #1744

chlunde · 2023-04-27T20:13:10Z

Description of your changes

commits:

crossplane-{tools,runtime}@master, go generate
Add --enable-management-policies flag
Pass management policy flag to the controllers

Fixes #1726

I have:

Read and followed Crossplane's contribution process.
Run make reviewable test to ensure this PR is ready for review.

I got "too many open files" for make reviewable, so I'll check CI.

How has this code been tested

Not yet tested in any way.

haarchri · 2023-06-19T06:46:56Z

@chlunde awesome - what are the openpoints because of Draft ?

chlunde · 2023-06-23T09:41:49Z

@haarchri I was waiting for what @turkenh would do with crossplane-contrib/provider-gcp#503, as I just mechanically reproduced his changes :)

@turkenh what are your thoughts?

turkenh · 2023-06-23T13:30:56Z

@chlunde I don't expect further changes and just waiting for an approval there.

haarchri · 2023-07-03T19:42:35Z

so @chlunde can we rebase ? lookd great

chlunde · 2023-07-04T10:34:28Z

@haarchri I think we should wait for crossplane/crossplane-runtime#456

adamjohnson01 · 2023-08-04T07:44:47Z

@haarchri and @chlunde, this is great! Do you have a timeline for this? It is something that we are really interested in using.

kaessert · 2023-08-04T09:42:56Z

Great piece of work! Would be really great to have this :)

go get github.com/crossplane/crossplane-tools@master go mod tidy make generate # failed go get github.com/crossplane/crossplane-runtime@master go mod tidy make generate # retry, OK https://github.com/upbound/upjet/blob/main/docs/adding-support-for-observe-only.md Signed-off-by: Carl Henrik Lunde <[email protected]>

Signed-off-by: Carl Henrik Lunde <[email protected]>

Fixes crossplane-contrib#1726 hacked using emacs: for f in $(grep -lr 'func Setup' pkg/controller/ ); do emacs --load refactor.el "$f"; done refactor.el: (defun last-macro () (interactive) (atomic-change-group (search-forward "func Setup") (search-forward "managed.NewReconciler") (search-backward "m") (set-mark-command nil) (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (kill-region nil nil 'region) (insert "r") (search-backward "return") (previous-line 1 1) (end-of-line) (newline nil 1) (insert "r := ") (yank nil) (newline nil 1) (search-backward "r := ") (search-forward "resource.ManagedKind") (forward-sexp 1 (point)) (move-end-of-line 1) (newline nil 1) (insert "reconcilerOpts...") (set-mark-command nil) (search-backward "managed.NewReconciler") (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (left-char 1) (kill-region nil nil 'region) (search-backward "r :=") (previous-line 1 1) (insert " reconcilerOpts := []managed.ReconcilerOption{") (yank nil) (insert ", } ") (insert "if o.Features.Enabled(features.EnableAlphaManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } ") (goto-line 1) (search-forward "github.com/crossplane-contrib/provider-aws") (end-of-line) (insert "\n\"github.com/crossplane-contrib/provider-aws/pkg/features\"") (save-buffer 1) )) (add-hook 'go-mode-hook #'last-macro) Signed-off-by: Carl Henrik Lunde <[email protected]>

Signed-off-by: Christopher Haar <[email protected]>

haarchri · 2023-08-04T16:54:24Z

@chlunde i made two commits, rebased onto the master branch, and updated crossplane-runtime and crossplane-tools to their latest versions for more precise management policies. I also tested the provider with some resources:

kubectl get filesystem.efs.aws.crossplane.io/example   -o yaml
apiVersion: efs.aws.crossplane.io/v1alpha1
kind: FileSystem
metadata:
  annotations:
    crossplane.io/external-create-pending: "2023-08-04T18:45:39+02:00"
    crossplane.io/external-create-succeeded: "2023-08-04T18:45:40+02:00"
    crossplane.io/external-name: fs-038dc3b8e3c7d6cf6
    kubectl.kubernetes.io/last-applied-configuration: |
      {"apiVersion":"efs.aws.crossplane.io/v1alpha1","kind":"FileSystem","metadata":{"annotations":{},"name":"example"},"spec":{"forProvider":{"region":"us-east-1","tags":[{"key":"customKey","value":"customValue"},{"key":"Name","value":"DisplayNameInAWS"}]},"providerConfigRef":{"name":"example"}}}
  creationTimestamp: "2023-08-04T16:45:39Z"
  finalizers:
  - finalizer.managedresource.crossplane.io
  generation: 1
  name: example
  resourceVersion: "97551"
  uid: 253a259f-b03b-4a0d-bc41-b803cda09fc8
spec:
  deletionPolicy: Delete
  forProvider:
    region: us-east-1
    tags:
    - key: customKey
      value: customValue
    - key: Name
      value: DisplayNameInAWS
  managementPolicies:
  - '*'
  providerConfigRef:
    name: example
status:
  atProvider:
    creationTime: "2023-08-04T16:45:39Z"
    creationToken: 253a259f-b03b-4a0d-bc41-b803cda09fc8
    fileSystemARN: arn:aws:elasticfilesystem:us-east-1:609897127049:file-system/fs-038dc3b8e3c7d6cf6
    fileSystemID: fs-038dc3b8e3c7d6cf6
    lifeCycleState: available
    name: DisplayNameInAWS
    numberOfMountTargets: 0
    ownerID: "609897127049"
    sizeInBytes:
      value: 6144
      valueInIA: 0
      valueInStandard: 6144
  conditions:
  - lastTransitionTime: "2023-08-04T16:46:41Z"
    reason: Available
    status: "True"
    type: Ready
  - lastTransitionTime: "2023-08-04T16:45:40Z"
    reason: ReconcileSuccess
    status: "True"
    type: Synced

Signed-off-by: Christopher Haar <[email protected]>

chlunde · 2023-08-07T18:25:11Z

@haarchri nice!

@master

* crossplane-{tools,runtime}@master, go generate go get github.com/crossplane/crossplane-tools@master go mod tidy make generate # failed go get github.com/crossplane/crossplane-runtime@master go mod tidy make generate # retry, OK https://github.com/upbound/upjet/blob/main/docs/adding-support-for-observe-only.md Signed-off-by: Carl Henrik Lunde <[email protected]> * Add --enable-management-policies flag Signed-off-by: Carl Henrik Lunde <[email protected]> * Pass management policy flag to the controllers Fixes crossplane-contrib#1726 hacked using emacs: for f in $(grep -lr 'func Setup' pkg/controller/ ); do emacs --load refactor.el "$f"; done refactor.el: (defun last-macro () (interactive) (atomic-change-group (search-forward "func Setup") (search-forward "managed.NewReconciler") (search-backward "m") (set-mark-command nil) (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (kill-region nil nil 'region) (insert "r") (search-backward "return") (previous-line 1 1) (end-of-line) (newline nil 1) (insert "r := ") (yank nil) (newline nil 1) (search-backward "r := ") (search-forward "resource.ManagedKind") (forward-sexp 1 (point)) (move-end-of-line 1) (newline nil 1) (insert "reconcilerOpts...") (set-mark-command nil) (search-backward "managed.NewReconciler") (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (left-char 1) (kill-region nil nil 'region) (search-backward "r :=") (previous-line 1 1) (insert " reconcilerOpts := []managed.ReconcilerOption{") (yank nil) (insert ", } ") (insert "if o.Features.Enabled(features.EnableAlphaManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } ") (goto-line 1) (search-forward "github.com/crossplane-contrib/provider-aws") (end-of-line) (insert "\n\"github.com/crossplane-contrib/provider-aws/pkg/features\"") (save-buffer 1) )) (add-hook 'go-mode-hook #'last-macro) Signed-off-by: Carl Henrik Lunde <[email protected]> * feat(bump): bump crossplane-runtime and crospslane-tools Signed-off-by: Christopher Haar <[email protected]> * feat(bump): rebase and bump Signed-off-by: Christopher Haar <[email protected]> * feat(bump): set up_version v0.18.0 to fits build module Signed-off-by: Christopher Haar <[email protected]> * feat(bump): set golangci_version to v1.53.3 Signed-off-by: Christopher Haar <[email protected]> --------- Signed-off-by: Carl Henrik Lunde <[email protected]> Signed-off-by: Christopher Haar <[email protected]> Co-authored-by: Christopher Haar <[email protected]>

@master

* crossplane-{tools,runtime}@master, go generate go get github.com/crossplane/crossplane-tools@master go mod tidy make generate # failed go get github.com/crossplane/crossplane-runtime@master go mod tidy make generate # retry, OK https://github.com/upbound/upjet/blob/main/docs/adding-support-for-observe-only.md Signed-off-by: Carl Henrik Lunde <[email protected]> * Add --enable-management-policies flag Signed-off-by: Carl Henrik Lunde <[email protected]> * Pass management policy flag to the controllers Fixes crossplane-contrib#1726 hacked using emacs: for f in $(grep -lr 'func Setup' pkg/controller/ ); do emacs --load refactor.el "$f"; done refactor.el: (defun last-macro () (interactive) (atomic-change-group (search-forward "func Setup") (search-forward "managed.NewReconciler") (search-backward "m") (set-mark-command nil) (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (kill-region nil nil 'region) (insert "r") (search-backward "return") (previous-line 1 1) (end-of-line) (newline nil 1) (insert "r := ") (yank nil) (newline nil 1) (search-backward "r := ") (search-forward "resource.ManagedKind") (forward-sexp 1 (point)) (move-end-of-line 1) (newline nil 1) (insert "reconcilerOpts...") (set-mark-command nil) (search-backward "managed.NewReconciler") (search-forward "(") (left-char 1) (forward-sexp 1 (point)) (left-char 1) (kill-region nil nil 'region) (search-backward "r :=") (previous-line 1 1) (insert " reconcilerOpts := []managed.ReconcilerOption{") (yank nil) (insert ", } ") (insert "if o.Features.Enabled(features.EnableAlphaManagementPolicies) { reconcilerOpts = append(reconcilerOpts, managed.WithManagementPolicies()) } ") (goto-line 1) (search-forward "github.com/crossplane-contrib/provider-aws") (end-of-line) (insert "\n\"github.com/crossplane-contrib/provider-aws/pkg/features\"") (save-buffer 1) )) (add-hook 'go-mode-hook #'last-macro) Signed-off-by: Carl Henrik Lunde <[email protected]> * feat(bump): bump crossplane-runtime and crospslane-tools Signed-off-by: Christopher Haar <[email protected]> * feat(bump): rebase and bump Signed-off-by: Christopher Haar <[email protected]> * feat(bump): set up_version v0.18.0 to fits build module Signed-off-by: Christopher Haar <[email protected]> * feat(bump): set golangci_version to v1.53.3 Signed-off-by: Christopher Haar <[email protected]> --------- Signed-off-by: Carl Henrik Lunde <[email protected]> Signed-off-by: Christopher Haar <[email protected]> Co-authored-by: Christopher Haar <[email protected]>

chlunde force-pushed the o_o branch from 5af8f50 to 3c79ada Compare April 28, 2023 17:12

chlunde and others added 5 commits August 4, 2023 18:25

Add --enable-management-policies flag

0f50d13

Signed-off-by: Carl Henrik Lunde <[email protected]>

feat(bump): bump crossplane-runtime and crospslane-tools

a8fe545

Signed-off-by: Christopher Haar <[email protected]>

feat(bump): rebase and bump

7419056

Signed-off-by: Christopher Haar <[email protected]>

haarchri force-pushed the o_o branch from 36f3b65 to 7419056 Compare August 4, 2023 16:52

haarchri marked this pull request as ready for review August 4, 2023 16:52

haarchri added 2 commits August 4, 2023 19:07

feat(bump): set up_version v0.18.0 to fits build module

19353c3

Signed-off-by: Christopher Haar <[email protected]>

feat(bump): set golangci_version to v1.53.3

bd916f6

Signed-off-by: Christopher Haar <[email protected]>

haarchri requested review from MisterMX, ulucinar and turkenh August 4, 2023 17:37

turkenh approved these changes Aug 7, 2023

View reviewed changes

haarchri merged commit ee18522 into crossplane-contrib:master Aug 7, 2023
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Support for Observe Only Resources #1744

Add Support for Observe Only Resources #1744

chlunde commented Apr 27, 2023

haarchri commented Jun 19, 2023

chlunde commented Jun 23, 2023

turkenh commented Jun 23, 2023

haarchri commented Jul 3, 2023

chlunde commented Jul 4, 2023

adamjohnson01 commented Aug 4, 2023

kaessert commented Aug 4, 2023

haarchri commented Aug 4, 2023

chlunde commented Aug 7, 2023

Add Support for Observe Only Resources #1744

Add Support for Observe Only Resources #1744

Conversation

chlunde commented Apr 27, 2023

Description of your changes

How has this code been tested

haarchri commented Jun 19, 2023

chlunde commented Jun 23, 2023

turkenh commented Jun 23, 2023

haarchri commented Jul 3, 2023

chlunde commented Jul 4, 2023

adamjohnson01 commented Aug 4, 2023

kaessert commented Aug 4, 2023

haarchri commented Aug 4, 2023

chlunde commented Aug 7, 2023