Skip to content

Commit 9fa11ed

Browse files
ciarams87ciarams87
committed
PR feedback round 2
1 parent 8d90b1a commit 9fa11ed

File tree

15 files changed

+393
-264
lines changed

15 files changed

+393
-264
lines changed

‎cmd/nginx-ingress/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ func main() {
665665
controllerNamespace := os.Getenv("POD_NAMESPACE")
666666

667667
transportServerValidator := cr_validation.NewTransportServerValidator(*enableTLSPassthrough, *enableSnippets, *nginxPlus)
668-
virtualServerValidator := cr_validation.NewVirtualServerValidator(*nginxPlus, *appProtectDos, *enableCertManager)
668+
virtualServerValidator := cr_validation.NewVirtualServerValidator(cr_validation.IsPlus(*nginxPlus), cr_validation.IsDosEnabled(*appProtectDos), cr_validation.IsCertManagerEnabled(*enableCertManager))
669669

670670
lbcInput := k8s.NewLoadBalancerControllerInput{
671671
KubeClient: kubeClient,

‎deployments/rbac/rbac.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ rules:
104104
- get
105105
- update
106106
- create
107+
- delete
107108
---
108109
kind: ClusterRoleBinding
109110
apiVersion: rbac.authorization.k8s.io/v1

‎docs/content/configuration/virtualserver-and-virtualserverroute-resources.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ cert-manager:
112112
|``issuer-kind`` | The kind of the external issuer resource, for example AWSPCAIssuer. This is only necessary for out-of-tree issuers. This cannot be defined if `cluster-issuer` is also defined. | ``string`` | No |
113113
|``issuer-group`` | The API group of the external issuer controller, for example awspca.cert-manager.io. This is only necessary for out-of-tree issuers. This cannot be defined if `cluster-issuer` is also defined. | ``string`` | No |
114114
|``common-name`` | This field allows you to configure spec.commonName for the Certificate to be generated. This configuration adds a CN to the x509 certificate. | ``string`` | No |
115-
|``duration`` | This field allows you to configure spec.duration field for the Certificate to be generated. | ``string`` | No |
116-
|``renew-before`` | this annotation allows you to configure spec.renewBefore field for the Certificate to be generated. | ``string`` | No |
117-
|``usages`` | This field allows you to configure spec.usages field for the Certificate to be generated. Pass a string with comma-separated values i.e. ``key agreement,digital signature, server auth``. | ``string`` | No |
115+
|``duration`` | This field allows you to configure spec.duration field for the Certificate to be generated. Must be specified using a [Go time.Duration](https://pkg.go.dev/time#ParseDuration) string format, which does not allow the d (days) suffix. You must specify these values using s, m, and h suffixes instead. | ``string`` | No |
116+
|``renew-before`` | this annotation allows you to configure spec.renewBefore field for the Certificate to be generated. Must be specified using a [Go time.Duration](https://pkg.go.dev/time#ParseDuration) string format, which does not allow the d (days) suffix. You must specify these values using s, m, and h suffixes instead. | ``string`` | No |
117+
|``usages`` | This field allows you to configure spec.usages field for the Certificate to be generated. Pass a string with comma-separated values i.e. ``key agreement,digital signature, server auth``. An exhaustive list of supported key usages can be found in the [the cert-manager api documentation](https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.KeyUsage). | ``string`` | No |
118118
{{% /table %}}
119119

120120
### VirtualServer.Policy

‎go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.18
55
require (
66
github.com/aws/aws-sdk-go-v2/config v1.15.3
77
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.3
8+
github.com/cert-manager/cert-manager v1.8.0
89
github.com/golang-jwt/jwt/v4 v4.4.1
910
github.com/golang/glog v1.0.0
1011
github.com/google/go-cmp v0.5.7
11-
github.com/jetstack/cert-manager v1.7.2
1212
github.com/kr/pretty v0.3.0
1313
github.com/nginxinc/nginx-plus-go-client v0.9.0
1414
github.com/nginxinc/nginx-prometheus-exporter v0.10.0
@@ -44,7 +44,7 @@ require (
4444
github.com/davecgh/go-spew v1.1.1 // indirect
4545
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
4646
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
47-
github.com/fatih/color v1.12.0 // indirect
47+
github.com/fatih/color v1.13.0 // indirect
4848
github.com/felixge/httpsnoop v1.0.1 // indirect
4949
github.com/go-logr/logr v1.2.0 // indirect
5050
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -65,8 +65,8 @@ require (
6565
github.com/json-iterator/go v1.1.12 // indirect
6666
github.com/kr/text v0.2.0 // indirect
6767
github.com/mailru/easyjson v0.7.6 // indirect
68-
github.com/mattn/go-colorable v0.1.8 // indirect
69-
github.com/mattn/go-isatty v0.0.12 // indirect
68+
github.com/mattn/go-colorable v0.1.12 // indirect
69+
github.com/mattn/go-isatty v0.0.14 // indirect
7070
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7272
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -76,10 +76,10 @@ require (
7676
github.com/prometheus/common v0.32.1 // indirect
7777
github.com/prometheus/procfs v0.7.3 // indirect
7878
github.com/rogpeppe/go-internal v1.6.1 // indirect
79-
github.com/spf13/cobra v1.2.1 // indirect
79+
github.com/spf13/cobra v1.3.0 // indirect
8080
github.com/spf13/pflag v1.0.5 // indirect
81-
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
82-
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
81+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
82+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
8383
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
8484
go.opentelemetry.io/contrib v0.20.0 // indirect
8585
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
@@ -95,12 +95,12 @@ require (
9595
go.uber.org/atomic v1.7.0 // indirect
9696
go.uber.org/multierr v1.6.0 // indirect
9797
go.uber.org/zap v1.19.1 // indirect
98-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
99-
golang.org/x/mod v0.4.2 // indirect
100-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
101-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
98+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
99+
golang.org/x/mod v0.5.0 // indirect
100+
golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect
101+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
102102
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
103-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
103+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
104104
golang.org/x/text v0.3.7 // indirect
105105
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
106106
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
@@ -112,15 +112,15 @@ require (
112112
gopkg.in/inf.v0 v0.9.1 // indirect
113113
gopkg.in/yaml.v2 v2.4.0 // indirect
114114
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
115-
k8s.io/apiextensions-apiserver v0.23.1 // indirect
116-
k8s.io/apiserver v0.23.1 // indirect
117-
k8s.io/component-base v0.23.1 // indirect
115+
k8s.io/apiextensions-apiserver v0.23.4 // indirect
116+
k8s.io/apiserver v0.23.4 // indirect
117+
k8s.io/component-base v0.23.4 // indirect
118118
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
119119
k8s.io/klog/v2 v2.30.0 // indirect
120-
k8s.io/kube-aggregator v0.23.1 // indirect
120+
k8s.io/kube-aggregator v0.23.4 // indirect
121121
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
122-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
123-
sigs.k8s.io/gateway-api v0.3.0 // indirect
122+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect
123+
sigs.k8s.io/gateway-api v0.4.1 // indirect
124124
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
125125
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
126126
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)