File tree Expand file tree Collapse file tree 11 files changed +18
-23
lines changed Expand file tree Collapse file tree 11 files changed +18
-23
lines changed Original file line number Diff line number Diff line change 4343 uses : actions/checkout@v3
4444 - name : OS Dependencies
4545 run : apt-get update && apt-get install -y tar make gcc
46- - name : Install Kubebuilder
47- run : |
48- os=$(go env GOOS)
49- arch=$(go env GOARCH)
50- curl -L https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_${os}_${arch}.tar.gz | tar -xz -C /tmp/
51- mv /tmp/kubebuilder_2.3.1_${os}_${arch} /usr/local/kubebuilder
52- export PATH=$PATH:/usr/local/kubebuilder/bin
5346 - name : Tests
54- run : go test -v ./...
47+ run : make test
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ all: manager
1717
1818# Run tests
1919test : manifests generate fmt vet envtest # # Run tests.
20- KUBEBUILDER_ASSETS=" $( shell $( ENVTEST) use $( ENVTEST_K8S_VERSION) --bin-dir $( LOCALBIN) -p path) " go test ./... -coverprofile cover.out
20+ KUBEBUILDER_ASSETS=" $( shell $( ENVTEST) use $( ENVTEST_K8S_VERSION) --bin-dir $( LOCALBIN) -p path) " go test -v ./... -coverprofile cover.out
2121
2222test-e2e :
2323 mkdir -p ./bin
@@ -107,7 +107,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
107107.PHONY : envtest
108108envtest : $(ENVTEST ) # # Download envtest-setup locally if necessary.
109109$(ENVTEST ) : $(LOCALBIN )
110- test -s $(LOCALBIN ) /setup-envtest || GOBIN=$(LOCALBIN ) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
110+ test -s $(LOCALBIN ) /setup-envtest || GOBIN=$(LOCALBIN ) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e
111111
112112# This target called from the prepare-release github action.
113113# CHANNEL - operator channel (eg. stable-3.6, candidate-3.9)
Original file line number Diff line number Diff line change 11apiVersion : apps/v1
2- kind : Deployment
2+ kind : StatefulSet
33metadata :
44 name : clair-postgres
55spec :
Original file line number Diff line number Diff line change @@ -5,4 +5,4 @@ resources:
55 - ./clair-pg-old.persistentvolumeclaim.yaml
66 - ./clair-pg-old.deployment.yaml
77patchesStrategicMerge :
8- - ./clair-pg.deployment .patch.yaml
8+ - ./clair-pg.statefulset .patch.yaml
Original file line number Diff line number Diff line change 11# Clair component adds Clair v4 security scanner and its database.
22apiVersion : kustomize.config.k8s.io/v1alpha1
33kind : Component
4- resources :
4+ resources :
55 - ./postgres.serviceaccount.yaml
66 - ./postgres.persistentvolumeclaim.yaml
7- - ./postgres.deployment .yaml
7+ - ./postgres.statefulset .yaml
88 - ./postgres.service.yaml
99 - ./clair-postgres-conf-sample.configmap.yaml
Original file line number Diff line number Diff line change 11apiVersion : apps/v1
2- kind : Deployment
2+ kind : StatefulSet
33metadata :
44 name : clair-postgres
55 labels :
66 quay-component : clair-postgres
77 annotations :
88 quay-component : clair-postgres
99spec :
10+ serviceName : clair-postgres
1011 replicas : 1
11- strategy :
12- type : Recreate
1312 selector :
1413 matchLabels :
1514 quay-component : clair-postgres
5756 requests :
5857 cpu : 500m
5958 memory : 2Gi
59+ volumeClaimTemplates : []
Original file line number Diff line number Diff line change @@ -7,4 +7,4 @@ resources:
77 - ./quay-pg-old.deployment.yaml
88patchesStrategicMerge :
99 - ./quay.deployment.patch.yaml
10- - ./quay-pg.deployment .patch.yaml
10+ - ./quay-pg.statefulset .patch.yaml
Original file line number Diff line number Diff line change 11apiVersion : apps/v1
2- kind : Deployment
2+ kind : StatefulSet
33metadata :
44 name : quay-database
55spec :
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ kind: Component
44resources :
55 - ./postgres.serviceaccount.yaml
66 - ./postgres.persistentvolumeclaim.yaml
7- - ./postgres.deployment .yaml
7+ - ./postgres.statefulset .yaml
88 - ./postgres.service.yaml
99 - ./postgres-conf-sample.configmap.yaml
1010secretGenerator :
Original file line number Diff line number Diff line change 11apiVersion : apps/v1
2- kind : Deployment
2+ kind : StatefulSet
33metadata :
44 name : quay-database
55 labels :
66 quay-component : postgres
77 annotations :
88 quay-component : postgres
99spec :
10+ serviceName : quay-database
1011 replicas : 1
11- strategy :
12- type : Recreate
1312 selector :
1413 matchLabels :
1514 quay-component : postgres
7675 requests :
7776 cpu : 500m
7877 memory : 2Gi
78+ volumeClaimTemplates : []
You can’t perform that action at this time.
0 commit comments