Skip to content

Commit

Permalink
vendor frameworks e35c157
Browse files Browse the repository at this point in the history 
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
  • Loading branch information
@sozercan
sozercan committed Aug 22, 2021
1 parent b99bf13 commit 24434e8
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 28 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ require (
sigs.k8s.io/yaml v1.2.0
)

replace github.com/open-policy-agent/frameworks/constraint => github.com/sozercan/frameworks/constraint v0.0.0-20210818181827-bf04f25ec1e9
replace github.com/open-policy-agent/frameworks/constraint => github.com/sozercan/frameworks/constraint v0.0.0-20210822004714-e35c15710b01
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI=
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
github.com/sozercan/frameworks/constraint v0.0.0-20210818181827-bf04f25ec1e9 h1:vOIs6ujmDVNq1+9v7AeJRYN70RjBA3Tat7kXOKYnv3I=
github.com/sozercan/frameworks/constraint v0.0.0-20210818181827-bf04f25ec1e9/go.mod h1:sxECOn2E9o4DIK6ttinq1frfiErxi0Z8oIgtz7VDVBc=
github.com/sozercan/frameworks/constraint v0.0.0-20210822004714-e35c15710b01 h1:Buj/I/FdzjuxERswWSkDKBWM1PKp7p7jpsAwzAMKY8U=
github.com/sozercan/frameworks/constraint v0.0.0-20210822004714-e35c15710b01/go.mod h1:sxECOn2E9o4DIK6ttinq1frfiErxi0Z8oIgtz7VDVBc=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
Expand Down
13 changes: 3 additions & 10 deletions pkg/controller/externaldata/externaldata_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,15 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
deleted = deleted || !provider.GetDeletionTimestamp().IsZero()
tracker := r.tracker.For(gvkExternalData)

if err != nil {
log.Error(err, "Creating provider for resource failed", "resource", request.NamespacedName)
tracker.CancelExpect(provider)
return ctrl.Result{}, err
}
if !deleted {
if err := r.providerCache.Upsert(provider); err != nil {
log.Error(err, "Upsert failed", "resource", request.NamespacedName)
tracker.TryCancelExpect(provider)
} else {
tracker.Observe(provider)
return reconcile.Result{}, err
}
tracker.Observe(provider)
} else {
if err := r.providerCache.Remove(provider.Name); err != nil {
log.Error(err, "Remove failed", "resource", request.NamespacedName)
}
r.providerCache.Remove(provider.Name)
tracker.CancelExpect(provider)
}

Expand Down
3 changes: 3 additions & 0 deletions vendor/github.com/open-policy-agent/frameworks/constraint/deploy/crds.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .../open-policy-agent/frameworks/constraint/pkg/apis/externaldata/v1alpha1/provider_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions ...or/github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/yaml_constant.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/drivers/local/local.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 43 additions & 10 deletions vendor/github.com/open-policy-agent/frameworks/constraint/pkg/externaldata/cache.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ github.com/onsi/gomega/types
# github.com/open-policy-agent/cert-controller v0.2.0
## explicit
github.com/open-policy-agent/cert-controller/pkg/rotator
# github.com/open-policy-agent/frameworks/constraint v0.0.0-20210701194838-1dbe2618668d => github.com/sozercan/frameworks/constraint v0.0.0-20210818181827-bf04f25ec1e9
# github.com/open-policy-agent/frameworks/constraint v0.0.0-20210701194838-1dbe2618668d => github.com/sozercan/frameworks/constraint v0.0.0-20210822004714-e35c15710b01
## explicit
github.com/open-policy-agent/frameworks/constraint/deploy
github.com/open-policy-agent/frameworks/constraint/pkg/apis
Expand Down Expand Up @@ -747,4 +747,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit
sigs.k8s.io/yaml
# github.com/open-policy-agent/frameworks/constraint => github.com/sozercan/frameworks/constraint v0.0.0-20210818181827-bf04f25ec1e9
# github.com/open-policy-agent/frameworks/constraint => github.com/sozercan/frameworks/constraint v0.0.0-20210822004714-e35c15710b01

0 comments on commit 24434e8

Please sign in to comment.