open-policy-agent · willbeason · Jul 14, 2021 · Jun 2, 2021 · ritazh · Jun 9, 2021
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.a filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -30,10 +30,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

diff --git a/constraint/Dockerfile b/constraint/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.16 as builder
 
 RUN apt-get update &&\
     apt-get install -y apt-utils make
@@ -21,15 +21,8 @@ RUN curl -L -O "https://github.com/kubernetes-sigs/kustomize/releases/download/v
     mv kustomize_${version}_linux_${arch} /usr/bin/kustomize &&\
     chmod u+x /usr/bin/kustomize
 
-# Install OPA
-WORKDIR /usr/bin
-RUN curl -L -o opa https://github.com/open-policy-agent/opa/releases/download/v0.10.5/opa_linux_amd64 &&\
-    chmod 755 opa
-
 # Copy in the go src
 WORKDIR /go/src/github.com/open-policy-agent/frameworks/constraint
 COPY .    .
 
-ENV GO111MODULE=off
-
 ENTRYPOINT ["make", "docker-internal-test"]
diff --git a/constraint/Makefile b/constraint/Makefile
@@ -31,8 +31,8 @@ install: manifests
 
 # Install the generation dependencies on the local machine
 gen-dependencies:
-	GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
-	GO111MODULE=on go get k8s.io/code-generator/cmd/conversion-gen@v0.20.2
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
+	go install k8s.io/code-generator/cmd/conversion-gen@v0.20.2
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests:

diff --git a/constraint/config/crds/templates.gatekeeper.sh_constrainttemplates.yaml b/constraint/config/crds/templates.gatekeeper.sh_constrainttemplates.yaml
@@ -120,18 +120,13 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: ConstraintTemplate is the Schema for the constrainttemplates
-          API
+        description: ConstraintTemplate is the Schema for the constrainttemplates API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -181,13 +176,11 @@ spec:
             properties:
               byPod:
                 items:
-                  description: ByPodStatus defines the observed state of ConstraintTemplate
-                    as seen by an individual controller
+                  description: ByPodStatus defines the observed state of ConstraintTemplate as seen by an individual controller
                   properties:
                     errors:
                       items:
-                        description: CreateCRDError represents a single error caught
-                          during parsing, compiling, etc.
+                        description: CreateCRDError represents a single error caught during parsing, compiling, etc.
                         properties:
                           code:
                             type: string
@@ -201,8 +194,7 @@ spec:
                         type: object
                       type: array
                     id:
-                      description: a unique identifier for the pod that wrote the
-                        status
+                      description: a unique identifier for the pod that wrote the status
                       type: string
                     observedGeneration:
                       format: int64
@@ -221,18 +213,13 @@ spec:
   - name: v1beta1
     schema:
       openAPIV3Schema:
-        description: ConstraintTemplate is the Schema for the constrainttemplates
-          API
+        description: ConstraintTemplate is the Schema for the constrainttemplates API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -282,13 +269,11 @@ spec:
             properties:
               byPod:
                 items:
-                  description: ByPodStatus defines the observed state of ConstraintTemplate
-                    as seen by an individual controller
+                  description: ByPodStatus defines the observed state of ConstraintTemplate as seen by an individual controller
                   properties:
                     errors:
                       items:
-                        description: CreateCRDError represents a single error caught
-                          during parsing, compiling, etc.
+                        description: CreateCRDError represents a single error caught during parsing, compiling, etc.
                         properties:
                           code:
                             type: string
@@ -302,8 +287,7 @@ spec:
                         type: object
                       type: array
                     id:
-                      description: a unique identifier for the pod that wrote the
-                        status
+                      description: a unique identifier for the pod that wrote the status
                       type: string
                     observedGeneration:
                       format: int64

diff --git a/constraint/deploy/crds.yaml b/constraint/deploy/crds.yaml
@@ -17,18 +17,13 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: ConstraintTemplate is the Schema for the constrainttemplates
-          API
+        description: ConstraintTemplate is the Schema for the constrainttemplates API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -78,13 +73,11 @@ spec:
             properties:
               byPod:
                 items:
-                  description: ByPodStatus defines the observed state of ConstraintTemplate
-                    as seen by an individual controller
+                  description: ByPodStatus defines the observed state of ConstraintTemplate as seen by an individual controller
                   properties:
                     errors:
                       items:
-                        description: CreateCRDError represents a single error caught
-                          during parsing, compiling, etc.
+                        description: CreateCRDError represents a single error caught during parsing, compiling, etc.
                         properties:
                           code:
                             type: string
@@ -98,8 +91,7 @@ spec:
                         type: object
                       type: array
                     id:
-                      description: a unique identifier for the pod that wrote the
-                        status
+                      description: a unique identifier for the pod that wrote the status
                       type: string
                     observedGeneration:
                       format: int64

diff --git a/constraint/go.mod b/constraint/go.mod
@@ -1,33 +1,40 @@
 module github.com/open-policy-agent/frameworks/constraint
 
-go 1.13
+go 1.16
 
 require (
-	github.com/OneOfOne/xxhash v1.2.8 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/davecgh/go-spew v1.1.1
-	github.com/go-openapi/spec v0.19.5 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/go-cmp v0.5.2
-	github.com/kr/text v0.2.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/onsi/gomega v1.10.2
-	github.com/open-policy-agent/opa v0.24.0
+	github.com/go-openapi/spec v0.20.3 // indirect
+	github.com/go-openapi/swag v0.19.15 // indirect
+	github.com/golang/glog v0.0.0-20210429001901-424d2337a529
+	github.com/google/go-cmp v0.5.6
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/onsi/gomega v1.10.5
+	github.com/open-policy-agent/opa v0.29.4
 	github.com/pkg/errors v0.9.1
-	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
-	github.com/spf13/cobra v1.1.1
+	github.com/prometheus/client_golang v1.10.0 // indirect
+	github.com/prometheus/common v0.25.0 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 // indirect
-	golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
-	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect
-	golang.org/x/tools v0.1.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
+	golang.org/x/sys v0.0.0-20210601080250-7ecdf8ef093b // indirect
+	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
 	k8s.io/apiextensions-apiserver v0.20.2
 	k8s.io/apimachinery v0.20.2
 	k8s.io/client-go v0.20.2
-	k8s.io/klog/v2 v2.8.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
-	sigs.k8s.io/controller-runtime v0.8.2
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d // indirect
+	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19 // indirect
+	sigs.k8s.io/controller-runtime v0.8.3
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
 )