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.

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

chore(deps): bump conftest from v0.25.0 to v0.28.2 #785

Merged
merged 1 commit into from
Oct 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ polaris:

conftest:
# imageRef the image reference
imageRef: docker.io/openpolicyagent/conftest:v0.25.0
imageRef: docker.io/openpolicyagent/conftest:v0.28.2
# resources resource requests and limits
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ metadata:
namespace: starboard-operator
name: starboard-conftest-config
data:
conftest.imageRef: openpolicyagent/conftest:v0.25.0
conftest.imageRef: openpolicyagent/conftest:v0.28.2
conftest.resources.requests.cpu: 50
conftest.resources.requests.memory: 50M
conftest.resources.limits.cpu: 300m
Expand Down Expand Up @@ -84,7 +84,7 @@ metadata:
# Introduce a way to version configuration schema.
starboard.plugin.config.version: "v2"
data:
conftest.imageRef: openpolicyagent/conftest:v0.25.0
conftest.imageRef: openpolicyagent/conftest:v0.28.2
conftest.resources.requests.cpu: 50
conftest.resources.requests.memory: 50M
conftest.resources.limits.cpu: 300m
Expand Down
4 changes: 2 additions & 2 deletions docs/integrations/config-checkers/conftest.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ As an example, let's create the `starboard-conftest-config` ConfigMap with [file

```
kubectl create configmap starboard-conftest-config -n <starboard_namespace> \
--from-literal=conftest.imageRef=openpolicyagent/conftest:v0.25.0 \
--from-literal=conftest.imageRef=openpolicyagent/conftest:v0.28.2 \
--from-file=conftest.library.kubernetes.rego=kubernetes/lib/kubernetes.rego \
--from-file=conftest.library.utils.rego=kubernetes/lib/utils.rego \
--from-file=conftest.policy.file_system_not_read_only.rego=kubernetes/policies/general/file_system_not_read_only.rego \
Expand Down Expand Up @@ -137,7 +137,7 @@ report:

| CONFIGMAP KEY | DEFAULT | DESCRIPTION |
| ------------------------------------ | -------------------------------------------- | ----------- |
| `conftest.imageRef` | `docker.io/openpolicyagent/conftest:v0.25.0` | Conftest image reference |
| `conftest.imageRef` | `docker.io/openpolicyagent/conftest:v0.28.2` | Conftest image reference |
| `conftest.resources.requests.cpu` | `50m` | The minimum amount of CPU required to run Conftest scanner pod. |
| `conftest.resources.requests.memory` | `50M` | The minimum amount of memory required to run Conftest scanner pod. |
| `conftest.resources.limits.cpu` | `300m` | The maximum amount of CPU allowed to run Conftest scanner pod. |
Expand Down
2 changes: 1 addition & 1 deletion itest/matcher/matcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var (
conftestScanner = v1alpha1.Scanner{
Name: "Conftest",
Vendor: "Open Policy Agent",
Version: "v0.25.0",
Version: "v0.28.2",
}
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ var _ = BeforeSuite(func() {
},
Data: map[string]string{
"configAuditReports.scanner": "Conftest",
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.28.2",
},
}
err = kubeClient.Create(context.Background(), starboardCM)
Expand All @@ -111,7 +111,7 @@ var _ = BeforeSuite(func() {
Name: starboard.GetPluginConfigMapName("Conftest"),
},
Data: map[string]string{
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.28.2",

"conftest.policy.runs_as_root.rego": runAsRootPolicy,
"conftest.policy.runs_as_root.kinds": "Workload",
Expand Down
2 changes: 1 addition & 1 deletion itest/starboard/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var (
Namespace: "starboard",
},
Data: map[string]string{
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "docker.io/openpolicyagent/conftest:v0.28.2",
"conftest.policy.runs_as_root.kinds": "Workload",
"conftest.policy.runs_as_root.rego": `
package main
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/conftest/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func (p *plugin) IsApplicable(ctx starboard.PluginContext, obj client.Object) (b
func (p *plugin) Init(ctx starboard.PluginContext) error {
return ctx.EnsureConfig(starboard.PluginConfig{
Data: map[string]string{
keyImageRef: "openpolicyagent/conftest:v0.25.0",
keyImageRef: "openpolicyagent/conftest:v0.28.2",
keyResourcesRequestsCPU: "50m",
keyResourcesRequestsMemory: "50M",
keyResourcesLimitsCPU: "300m",
Expand Down
14 changes: 7 additions & 7 deletions pkg/plugin/conftest/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestPlugin_IsApplicable(t *testing.T) {
{
name: "Should return false if there are no policies",
configData: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
},
obj: &corev1.Pod{
TypeMeta: metav1.TypeMeta{
Expand All @@ -146,7 +146,7 @@ func TestPlugin_IsApplicable(t *testing.T) {
{
name: "Should return true if there is at least one policy",
configData: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
"conftest.policy.kubernetes.kinds": "Pod",
"conftest.policy.kubernetes.rego": `package main

Expand Down Expand Up @@ -240,7 +240,7 @@ func TestPlugin_Init(t *testing.T) {
ResourceVersion: "1",
},
Data: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
"conftest.resources.requests.cpu": "50m",
"conftest.resources.requests.memory": "50M",
"conftest.resources.limits.cpu": "300m",
Expand All @@ -260,7 +260,7 @@ func TestPlugin_Init(t *testing.T) {
ResourceVersion: "0",
},
Data: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
},
}).Build()

Expand Down Expand Up @@ -292,7 +292,7 @@ func TestPlugin_Init(t *testing.T) {
ResourceVersion: "0",
},
Data: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
},
}))
})
Expand Down Expand Up @@ -562,7 +562,7 @@ func TestPlugin_ParseConfigAuditReportData(t *testing.T) {
Namespace: "starboard-ns",
},
Data: map[string]string{
"conftest.imageRef": "openpolicyagent/conftest:v0.25.0",
"conftest.imageRef": "openpolicyagent/conftest:v0.28.2",
},
}).Build()).
Get()
Expand All @@ -583,7 +583,7 @@ func TestPlugin_ParseConfigAuditReportData(t *testing.T) {
"Scanner": Equal(v1alpha1.Scanner{
Name: "Conftest",
Vendor: "Open Policy Agent",
Version: "v0.25.0",
Version: "v0.28.2",
}),
"Summary": Equal(v1alpha1.ConfigAuditSummary{
DangerCount: 6,
Expand Down