Skip to content

Commit 4c87973

Browse files
Merge pull request #485 from reedcort/SREP-4236-fix-goflags
SREP-4236: Fix GOFLAGS and regenerate package resources
2 parents 76d548c + 562ff10 commit 4c87973

2 files changed

Lines changed: 34 additions & 0 deletions

File tree

config/package/resources.yaml.gotmpl

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,36 @@ webhooks:
227227
timeoutSeconds: 2
228228
---
229229
apiVersion: admissionregistration.k8s.io/v1
230+
kind: ValidatingWebhookConfiguration
231+
metadata:
232+
annotations:
233+
package-operator.run/phase: webhooks
234+
service.beta.openshift.io/inject-cabundle: "false"
235+
name: sre-network-operator-validation
236+
webhooks:
237+
- admissionReviewVersions:
238+
- v1
239+
clientConfig:
240+
caBundle: '{{.config.serviceca | b64enc }}'
241+
url: https://validation-webhook.{{.package.metadata.namespace}}.svc.cluster.local/network-operator-validation
242+
failurePolicy: Ignore
243+
matchPolicy: Equivalent
244+
name: network-operator-validation.managed.openshift.io
245+
rules:
246+
- apiGroups:
247+
- operator.openshift.io
248+
apiVersions:
249+
- '*'
250+
operations:
251+
- UPDATE
252+
resources:
253+
- network
254+
- networks
255+
scope: Cluster
256+
sideEffects: None
257+
timeoutSeconds: 2
258+
---
259+
apiVersion: admissionregistration.k8s.io/v1
230260
kind: MutatingWebhookConfiguration
231261
metadata:
232262
annotations:

hack/prow_pr_check.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ echo "Using go version $(go version)"
99

1010
cd "${REPO_ROOT}"
1111

12+
# Prow may set GOFLAGS=-mod=vendor which breaks us since we use modules
13+
unset GOFLAGS
14+
export GOFLAGS=-mod=mod
15+
1216
# Run tests
1317
make test
1418

0 commit comments

Comments
 (0)