Skip to content
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

Filter only if CM field is set #37

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Filter only if CM field is set #37

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
747b141
Filter only if CM field is set
Dec 18, 2019
680e265
Next try
Dec 19, 2019
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
95 changes: 95 additions & 0 deletions config/samples/oathkeeper_v1alpha1_rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,105 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: test-ns-1
---
apiVersion: oathkeeper.ory.sh/v1alpha1
kind: Rule
metadata:
name: sample-rule-1
namespace: test-ns-1
spec:
description: Sample rule
upstream:
url: "http://abc.ef"
preserveHost: false
match:
methods: ["GET"]
url: <http|https>://foo.bar
authenticators:
- handler: anonymous
authorizer:
handler: allow
mutators:
- handler: noop
config: {}
---
apiVersion: oathkeeper.ory.sh/v1alpha1
kind: Rule
metadata:
name: sample-rule-2
namespace: test-ns-1
spec:
description: Sample rule
upstream:
url: "http://abc.ef"
preserveHost: false
match:
methods: ["GET"]
url: <http|https>://foo.bar
authenticators:
- handler: anonymous
authorizer:
handler: allow
mutators:
- handler: noop
config: {}
---
apiVersion: v1
kind: Namespace
metadata:
name: test-ns-2
---
apiVersion: oathkeeper.ory.sh/v1alpha1
kind: Rule
metadata:
name: sample-rule-1
namespace: test-ns-2
spec:
description: Sample rule
upstream:
url: "http://abc.ef"
preserveHost: false
match:
methods: ["GET"]
url: <http|https>://foo.bar
authenticators:
- handler: anonymous
authorizer:
handler: allow
mutators:
- handler: noop
config: {}
---
apiVersion: oathkeeper.ory.sh/v1alpha1
kind: Rule
metadata:
name: sample-rule-2
namespace: test-ns-2
spec:
description: Sample rule
upstream:
url: "http://abc.ef"
preserveHost: false
match:
methods: ["GET"]
url: <http|https>://foo.bar
authenticators:
- handler: anonymous
authorizer:
handler: allow
mutators:
- handler: noop
config: {}
---
apiVersion: oathkeeper.ory.sh/v1alpha1
kind: Rule
metadata:
name: sample-rule-cm
namespace: default
spec:
configMapName: some-cm
description: Sample rule
upstream:
url: "http://abc.ef"
Expand Down
30 changes: 23 additions & 7 deletions controllers/rule_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (r *RuleReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
_ = r.Log.WithValues("rule", req.NamespacedName)

var rule oathkeeperv1alpha1.Rule

skipValidation := false

if err := r.Get(ctx, req.NamespacedName, &rule); err != nil {
Expand Down Expand Up @@ -94,8 +95,14 @@ func (r *RuleReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {

var rulesList oathkeeperv1alpha1.RuleList

if err := r.List(ctx, &rulesList, client.InNamespace(req.NamespacedName.Namespace)); err != nil {
return ctrl.Result{}, err
if rule.Spec.ConfigMapName != nil {
if err := r.List(ctx, &rulesList, client.InNamespace(req.NamespacedName.Namespace)); err != nil {
return ctrl.Result{}, err
}
} else {
if err := r.List(ctx, &rulesList); err != nil {
return ctrl.Result{}, err
}
}

// examine DeletionTimestamp to determine if object is under deletion
Expand Down Expand Up @@ -123,11 +130,20 @@ func (r *RuleReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
}
}

oathkeeperRulesJSON, err := rulesList.FilterNotValid().
FilterConfigMapName(rule.Spec.ConfigMapName).
ToOathkeeperRules()
if err != nil {
return ctrl.Result{}, err
var err error
var oathkeeperRulesJSON []byte

if rule.Spec.ConfigMapName != nil {
r.Log.Info(fmt.Sprintf("Found ConfigMap definition in Rule %s/%s: Writing data to \"%s\"", rule.Namespace, rule.Name, *rule.Spec.ConfigMapName))
oathkeeperRulesJSON, err = rulesList.FilterNotValid().FilterConfigMapName(rule.Spec.ConfigMapName).ToOathkeeperRules()
if err != nil {
return ctrl.Result{}, err
}
} else {
oathkeeperRulesJSON, err = rulesList.FilterNotValid().ToOathkeeperRules()
if err != nil {
return ctrl.Result{}, err
}
}

if err := r.OperatorMode.CreateOrUpdate(ctx, oathkeeperRulesJSON, &rule); err != nil {
Expand Down