Skip to content

Commit 8c0702c

Browse files
estrozestroz
committed
*: update CRD file names from <group>_<version>_<kind> to <group>_<resource>
1 parent 28c403d commit 8c0702c

31 files changed

+98
-83
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ $ kubectl create -f deploy/service_account.yaml
8787
$ kubectl create -f deploy/role.yaml
8888
$ kubectl create -f deploy/role_binding.yaml
8989
# Setup the CRD
90-
$ kubectl create -f deploy/crds/app_v1alpha1_appservice_crd.yaml
90+
$ kubectl create -f deploy/crds/app_appservices_crd.yaml
9191
# Deploy the app-operator
9292
$ kubectl create -f deploy/operator.yaml
9393

@@ -124,7 +124,7 @@ $ kubectl delete -f deploy/operator.yaml
124124
$ kubectl delete -f deploy/role.yaml
125125
$ kubectl delete -f deploy/role_binding.yaml
126126
$ kubectl delete -f deploy/service_account.yaml
127-
$ kubectl delete -f deploy/crds/app_v1alpha1_appservice_crd.yaml
127+
$ kubectl delete -f deploy/crds/app_appservices_crd.yaml
128128
```
129129
## Command Line Interface
130130

‎ci/tests/e2e-ansible.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ deploy_operator() {
3535
fi
3636
kubectl create -f "$OPERATORDIR/deploy/role.yaml"
3737
kubectl create -f "$OPERATORDIR/deploy/role_binding.yaml"
38-
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
39-
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_foo_crd.yaml"
38+
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
39+
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_foos_crd.yaml"
4040
kubectl create -f "$OPERATORDIR/deploy/operator.yaml"
4141
}
4242

4343
remove_operator() {
4444
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
4545
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
4646
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
47-
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
48-
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_foo_crd.yaml"
47+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
48+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_foos_crd.yaml"
4949
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/operator.yaml"
5050
}
5151

‎cmd/operator-sdk/add/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Example:
6767
├── zz_generated.openapi.go
6868
$ tree deploy/crds
6969
├── deploy/crds/app_v1alpha1_appservice_cr.yaml
70-
├── deploy/crds/app_v1alpha1_appservice_crd.yaml
70+
├── deploy/crds/app_appservices_crd.yaml
7171
`,
7272
RunE: apiRun,
7373
}

‎cmd/operator-sdk/generate/openapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Example:
4141
├── zz_generated.openapi.go
4242
$ tree deploy/crds
4343
├── deploy/crds/app_v1alpha1_appservice_cr.yaml
44-
├── deploy/crds/app_v1alpha1_appservice_crd.yaml
44+
├── deploy/crds/app_appservices_crd.yaml
4545
`,
4646
RunE: openAPIFunc,
4747
}

‎doc/ansible/dev/developer_guide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Create a Custom Resource Definition (CRD) and proper Role-Based Access Control
211211
(RBAC) definitions for resource Foo. `operator-sdk` auto-generates these files
212212
inside of the `deploy` folder:
213213
```bash
214-
$ kubectl create -f deploy/crds/foo_v1alpha1_foo_crd.yaml
214+
$ kubectl create -f deploy/crds/foo_foos_crd.yaml
215215
$ kubectl create -f deploy/service_account.yaml
216216
$ kubectl create -f deploy/role.yaml
217217
$ kubectl create -f deploy/role_binding.yaml
@@ -306,7 +306,7 @@ $ sed -i "" 's|REPLACE_IMAGE|quay.io/example/foo-operator:v0.0.1|g' deploy/opera
306306
Deploy the foo-operator:
307307

308308
```sh
309-
$ kubectl create -f deploy/crds/foo_v1alpha1_foo_crd.yaml # if CRD doesn't exist already
309+
$ kubectl create -f deploy/crds/foo_foos_crd.yaml # if CRD doesn't exist already
310310
$ kubectl create -f deploy/service_account.yaml
311311
$ kubectl create -f deploy/role.yaml
312312
$ kubectl create -f deploy/role_binding.yaml

‎doc/ansible/user-guide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ resource definition the operator will be watching.
217217
Deploy the CRD:
218218

219219
```sh
220-
$ kubectl create -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
220+
$ kubectl create -f deploy/crds/cache_memcacheds_crd.yaml
221221
```
222222

223223
Once this is done, there are two ways to run the operator:
@@ -400,7 +400,7 @@ $ kubectl delete -f deploy/operator.yaml
400400
$ kubectl delete -f deploy/role_binding.yaml
401401
$ kubectl delete -f deploy/role.yaml
402402
$ kubectl delete -f deploy/service_account.yaml
403-
$ kubectl delete -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
403+
$ kubectl delete -f deploy/crds/cache_memcacheds_crd.yaml
404404
```
405405

406406
[operator-scope]:./../operator-scope.md

‎doc/dev/testing/running-the-tests.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ during the go tests can cause these cleanups to fail (the ansible and helm E2E t
127127
always clean up correctly). For example, if a segfault occurs or a user kills the
128128
testing process, the cleanup functions for the go tests will not run. To manually clean up a test:
129129

130-
1. Delete the CRD (`kubectl delete -f $HOME/projects/example.com/memcached-operator/deploy/crds/cache_v1alpha1_memcached_crd.yaml`).
130+
1. Delete the CRD (`kubectl delete -f $HOME/projects/example.com/memcached-operator/deploy/crds/cache_memcacheds_crd.yaml`).
131131
2. Delete the created project in `$HOME/projects/example.com/memcached-operator`
132132
3. Delete the namespaces that the tests run in, which also deletes any resources created within the namespaces. The namespaces start with `memcached-memcached-group` or `main` and are appended with a unix timestamp (seconds since Jan 1 1970). The kubectl command can be used to delete namespaces: `kubectl delete namespace $NAMESPACE`.
133133

‎doc/helm/dev/developer_guide.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ INFO[0000] Created deploy/service_account.yaml
3737
INFO[0000] Created deploy/role.yaml
3838
INFO[0000] Created deploy/role_binding.yaml
3939
INFO[0000] Created deploy/operator.yaml
40-
INFO[0000] Created deploy/crds/foo_v1alpha1_foo_crd.yaml
40+
INFO[0000] Created deploy/crds/foo_foos_crd.yaml
4141
INFO[0000] Created deploy/crds/foo_v1alpha1_foo_cr.yaml
4242
INFO[0000] Created helm-charts/foo/
4343
INFO[0000] Run git init ...
@@ -284,7 +284,7 @@ Create a Custom Resource Definition (CRD) and proper Role-Based Access Control
284284
inside of the `deploy` folder:
285285

286286
```sh
287-
kubectl create -f deploy/crds/foo_v1alpha1_foo_crd.yaml
287+
kubectl create -f deploy/crds/foo_foos_crd.yaml
288288
kubectl create -f deploy/service_account.yaml
289289
kubectl create -f deploy/role.yaml
290290
kubectl create -f deploy/role_binding.yaml
@@ -409,7 +409,7 @@ sed -i "" 's|REPLACE_IMAGE|quay.io/example/foo-operator:v0.0.1|g' deploy/operato
409409
Deploy the foo-operator:
410410

411411
```sh
412-
kubectl create -f deploy/crds/foo_v1alpha1_foo_crd.yaml # if CRD doesn't exist already
412+
kubectl create -f deploy/crds/foo_foos_crd.yaml # if CRD doesn't exist already
413413
kubectl create -f deploy/service_account.yaml
414414
kubectl create -f deploy/role.yaml
415415
kubectl create -f deploy/role_binding.yaml

‎doc/helm/user-guide.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ resource definition the operator will be watching.
156156
Deploy the CRD:
157157

158158
```sh
159-
kubectl create -f deploy/crds/example_v1alpha1_nginx_crd.yaml
159+
kubectl create -f deploy/crds/example_nginxes_crd.yaml
160160
```
161161

162162
Once this is done, there are two ways to run the operator:
@@ -318,7 +318,7 @@ kubectl delete -f deploy/operator.yaml
318318
kubectl delete -f deploy/role_binding.yaml
319319
kubectl delete -f deploy/role.yaml
320320
kubectl delete -f deploy/service_account.yaml
321-
kubectl delete -f deploy/crds/example_v1alpha1_nginx_crd.yaml
321+
kubectl delete -f deploy/crds/example_nginxes_crd.yaml
322322
```
323323

324324
[operator-scope]:./../operator-scope.md

‎doc/operator-scope.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ With the above changes the specified manifests should look as follows:
7373
name: memcached-operator
7474
apiGroup: rbac.authorization.k8s.io
7575
```
76-
* `deploy/crds/cache_v1alpha1_memcached_crd.yaml`
76+
* `deploy/crds/cache_memcacheds_crd.yaml`
7777
```YAML
7878
apiVersion: apiextensions.k8s.io/v1beta1
7979
kind: CustomResourceDefinition

‎doc/sdk-cli-reference.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ pkg/apis/app/v1alpha1/
175175

176176
$ operator-sdk generate openapi
177177
INFO[0000] Running OpenAPI code-generation for Custom Resource group versions: [app:[v1alpha1], ]
178-
INFO[0001] Created deploy/crds/app_v1alpha1_appservice_crd.yaml
178+
INFO[0001] Created deploy/crds/app_appservices_crd.yaml
179179
INFO[0001] Code-generation complete.
180180

181181
$ tree pkg/apis/app/v1alpha1/
@@ -344,11 +344,11 @@ INFO[0000] Created pkg/apis/addtoscheme_app_v1alpha1.go
344344
INFO[0000] Created pkg/apis/app/v1alpha1/register.go
345345
INFO[0000] Created pkg/apis/app/v1alpha1/doc.go
346346
INFO[0000] Created deploy/crds/app_v1alpha1_appservice_cr.yaml
347-
INFO[0000] Created deploy/crds/app_v1alpha1_appservice_crd.yaml
347+
INFO[0000] Created deploy/crds/app_appservices_crd.yaml
348348
INFO[0001] Running deepcopy code-generation for Custom Resource group versions: [app:[v1alpha1], ]
349349
INFO[0002] Code-generation complete.
350350
INFO[0002] Running OpenAPI code-generation for Custom Resource group versions: [app:[v1alpha1], ]
351-
INFO[0004] Created deploy/crds/app_v1alpha1_appservice_crd.yaml
351+
INFO[0004] Created deploy/crds/app_appservices_crd.yaml
352352
INFO[0004] Code-generation complete.
353353
INFO[0004] API generation complete.
354354
```
@@ -385,7 +385,7 @@ Generates the CRD and the CR files for the specified api-version and kind.
385385
```console
386386
$ operator-sdk add crd --api-version app.example.com/v1alpha1 --kind AppService
387387
Generating custom resource definition (CRD) files
388-
Created deploy/crds/app_v1alpha1_appservice_crd.yaml
388+
Created deploy/crds/app_appservices_crd.yaml
389389
Created deploy/crds/app_v1alpha1_appservice_cr.yaml
390390
```
391391

‎doc/test-framework/writing-e2e-tests.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ $ operator-sdk test local ./test/e2e --namespace operator-test --up-local
263263
If you would prefer to create the resources yourself and skip resource creation, you can use the `--no-setup` flag:
264264
```shell
265265
$ kubectl create namespace operator-test
266-
$ kubectl create -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
266+
$ kubectl create -f deploy/crds/cache_memcacheds_crd.yaml
267267
$ kubectl create -f deploy/service_account.yaml --namespace operator-test
268268
$ kubectl create -f deploy/role.yaml --namespace operator-test
269269
$ kubectl create -f deploy/role_binding.yaml --namespace operator-test
@@ -289,7 +289,7 @@ $ cat deploy/role_binding.yaml >> deploy/namespace-init.yaml
289289
$ echo -e "\n---\n" >> deploy/namespace-init.yaml
290290
$ cat deploy/operator.yaml >> deploy/namespace-init.yaml
291291
# Run tests
292-
$ go test ./test/e2e/... -root=$(pwd) -kubeconfig=$HOME/.kube/config -globalMan deploy/crds/example_v1alpha1_app_crd.yaml -namespacedMan deploy/namespace-init.yaml -v -parallel=2
292+
$ go test ./test/e2e/... -root=$(pwd) -kubeconfig=$HOME/.kube/config -globalMan deploy/crds/example_apps_crd.yaml -namespacedMan deploy/namespace-init.yaml -v -parallel=2
293293
```
294294

295295
## Manual Cleanup
@@ -323,7 +323,7 @@ $ kubectl delete namespace main-153428703
323323
Since the CRD is not namespaced, it must be deleted separately. Clean up the CRD created by the tests using the CRD manifest `deploy/crd.yaml`:
324324

325325
```shell
326-
$ kubectl delete -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
326+
$ kubectl delete -f deploy/crds/cache_memcacheds_crd.yaml
327327
```
328328

329329
[memcached-sample]:https://github.com/operator-framework/operator-sdk-samples/tree/master/memcached-operator

‎doc/user-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ For a guide on Reconcilers, Clients, and interacting with resource Events, see t
192192
Before running the operator, the CRD must be registered with the Kubernetes apiserver:
193193

194194
```sh
195-
$ kubectl create -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
195+
$ kubectl create -f deploy/crds/cache_memcacheds_crd.yaml
196196
```
197197

198198
Once this is done, there are two ways to run the operator:

‎doc/user/olm-catalog/generating-a-csv.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ A note on `specDescriptors` and `statusDescriptors` fields in `spec.customresour
6060

6161
## Updating your CSV
6262

63-
Let's say you added a new CRD `deploy/crds/group_v1beta1_yourkind_crd.yaml` to your Operator project, and added a port to your Deployment manifest `operator.yaml`. Assuming you're using the same version as above, updating your CSV is as simple as running `operator-sdk olm-catalog gen-csv --csv-version 0.0.1`. `gen-csv` will append your new CRD to `spec.customresourcedefinitions.owned`, replace the old data at `spec.install.spec.deployments` with your updated Deployment, and write an updated CSV to the same location.
63+
Let's say you added a new CRD `deploy/crds/group_yourkindplural_crd.yaml` to your Operator project, and added a port to your Deployment manifest `operator.yaml`. Assuming you're using the same version as above, updating your CSV is as simple as running `operator-sdk olm-catalog gen-csv --csv-version 0.0.1`. `gen-csv` will append your new CRD to `spec.customresourcedefinitions.owned`, replace the old data at `spec.install.spec.deployments` with your updated Deployment, and write an updated CSV to the same location.
6464

6565
The SDK will not overwrite user-defined fields like `spec.maintainers` or descriptions of CSV elements, with the exception of `specDescriptors[].displayName` and `statusDescriptors[].displayName` in `spec.customresourcedefinitions.owned`, as mentioned [above](#first-generation).
6666

‎hack/tests/e2e-ansible-molecule.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ deploy_prereqs() {
1616
oc adm policy add-cluster-role-to-user cluster-admin -z memcached-operator || :
1717
kubectl create -f "$OPERATORDIR/deploy/role.yaml"
1818
kubectl create -f "$OPERATORDIR/deploy/role_binding.yaml"
19-
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
19+
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
2020
}
2121

2222
remove_prereqs() {
2323
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
2424
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
2525
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
26-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
26+
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
2727
}
2828

2929
pushd "$GOTMP"

‎hack/tests/e2e-ansible.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ deploy_operator() {
1717
oc adm policy add-cluster-role-to-user cluster-admin -z memcached-operator || :
1818
kubectl create -f "$OPERATORDIR/deploy/role.yaml"
1919
kubectl create -f "$OPERATORDIR/deploy/role_binding.yaml"
20-
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
21-
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_foo_crd.yaml"
20+
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
21+
kubectl create -f "$OPERATORDIR/deploy/crds/ansible_foos_crd.yaml"
2222
kubectl create -f "$OPERATORDIR/deploy/operator.yaml"
2323
}
2424

2525
remove_operator() {
2626
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
2727
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
2828
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
29-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_memcached_crd.yaml"
30-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_v1alpha1_foo_crd.yaml"
29+
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_memcacheds_crd.yaml"
30+
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible_foos_crd.yaml"
3131
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/operator.yaml"
3232
}
3333

‎hack/tests/e2e-helm.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ deploy_operator() {
1313
kubectl create -f "$OPERATORDIR/deploy/service_account.yaml"
1414
kubectl create -f "$OPERATORDIR/deploy/role.yaml"
1515
kubectl create -f "$OPERATORDIR/deploy/role_binding.yaml"
16-
kubectl create -f "$OPERATORDIR/deploy/crds/helm_v1alpha1_nginx_crd.yaml"
16+
kubectl create -f "$OPERATORDIR/deploy/crds/helm_nginxes_crd.yaml"
1717
kubectl create -f "$OPERATORDIR/deploy/operator.yaml"
1818
}
1919

2020
remove_operator() {
2121
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
2222
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
2323
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
24-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/helm_v1alpha1_nginx_crd.yaml"
24+
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/helm_nginxes_crd.yaml"
2525
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/operator.yaml"
2626
}
2727

‎hack/tests/test-subcommand.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pushd test/test-framework
88
operator-sdk test local ./test/e2e
99

1010
# test operator-sdk test flags
11-
operator-sdk test local ./test/e2e --global-manifest deploy/crds/cache_v1alpha1_memcached_crd.yaml --namespaced-manifest deploy/namespace-init.yaml --go-test-flags "-parallel 1" --kubeconfig $HOME/.kube/config --image=quay.io/coreos/operator-sdk-dev:test-framework-operator-runtime
11+
operator-sdk test local ./test/e2e --global-manifest deploy/crds/cache_memcacheds_crd.yaml --namespaced-manifest deploy/namespace-init.yaml --go-test-flags "-parallel 1" --kubeconfig $HOME/.kube/config --image=quay.io/coreos/operator-sdk-dev:test-framework-operator-runtime
1212

1313
# we use the test-memcached namespace for all future tests, so we only need to set this trap once
1414
kubectl create namespace test-memcached
@@ -28,12 +28,12 @@ kubectl delete namespace test-memcached
2828

2929
# test operator in no-setup mode
3030
kubectl create namespace test-memcached
31-
kubectl create -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
31+
kubectl create -f deploy/crds/cache_memcacheds_crd.yaml
3232
# this runs after the popd at the end, so it needs the path from the project root
33-
trap_add 'kubectl delete -f test/test-framework/deploy/crds/cache_v1alpha1_memcached_crd.yaml' EXIT
34-
kubectl create -f deploy/crds/cache_v1alpha1_memcachedrs_crd.yaml
33+
trap_add 'kubectl delete -f test/test-framework/deploy/crds/cache_memcacheds_crd.yaml' EXIT
34+
kubectl create -f deploy/crds/cache_memcachedrs_crd.yaml
3535
# this runs after the popd at the end, so it needs the path from the project root
36-
trap_add 'kubectl delete -f test/test-framework/deploy/crds/cache_v1alpha1_memcachedrs_crd.yaml' EXIT
36+
trap_add 'kubectl delete -f test/test-framework/deploy/crds/cache_memcachedrs_crd.yaml' EXIT
3737
kubectl create -f deploy/service_account.yaml --namespace test-memcached
3838
kubectl create -f deploy/role.yaml --namespace test-memcached
3939
kubectl create -f deploy/role_binding.yaml --namespace test-memcached

‎internal/pkg/scaffold/crd.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ func (s *CRD) GetInput() (input.Input, error) {
7070
}
7171

7272
func crdPathForResource(dir string, r *Resource) string {
73-
lv := strings.ToLower(r.Version)
74-
file := fmt.Sprintf("%s_%s_%s_crd.yaml", r.GoImportGroup, lv, r.LowerKind)
73+
file := fmt.Sprintf("%s_%s_crd.yaml", r.GoImportGroup, r.Resource)
7574
return filepath.Join(dir, file)
7675
}
7776

‎internal/pkg/scaffold/olm-catalog/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ func TestConfig(t *testing.T) {
3636
}
3737

3838
cfg = &CSVConfig{
39-
CRDCRPaths: []string{crdsDir, filepath.Join(crdsDir, "app_v1alpha1_app_crd.yaml")},
39+
CRDCRPaths: []string{crdsDir, filepath.Join(crdsDir, "app_appservices_crd.yaml")},
4040
}
4141
if err := cfg.setFields(); err != nil {
4242
t.Errorf("Set fields crd-cr paths dir file mix: (%v)", err)
4343
}
4444
want := []string{
45-
filepath.Join(crdsDir, "app_v1alpha1_app_cr.yaml"),
46-
filepath.Join(crdsDir, "app_v1alpha1_app_crd.yaml"),
47-
filepath.Join(crdsDir, "app_v1alpha2_app_crd.yaml"),
45+
filepath.Join(crdsDir, "app_appservices2_crd.yaml"),
46+
filepath.Join(crdsDir, "app_appservices_crd.yaml"),
47+
filepath.Join(crdsDir, "app_v1alpha1_appservice_cr.yaml"),
4848
}
4949
if !reflect.DeepEqual(want, cfg.CRDCRPaths) {
5050
t.Errorf("Wanted crd/cr files %v, got %v", want, cfg.CRDCRPaths)

‎internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_appservices2_crd.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: appservice2.example.com
5+
spec:
6+
group: app.example.com
7+
names:
8+
kind: AppService2
9+
listKind: AppService2List
10+
plural: appservices2
11+
singular: appservice2
12+
scope: Namespaced
13+
version: v1alpha2
14+
versions:
15+
- name: v1alpha2
16+
served: true
17+
storage: true

‎internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_appservices_crd.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: appservice.example.com
5+
spec:
6+
group: app.example.com
7+
names:
8+
kind: AppService
9+
listKind: AppServiceList
10+
plural: appservices
11+
singular: appservice
12+
scope: Namespaced
13+
version: v1alpha1
14+
versions:
15+
- name: v1alpha1
16+
served: true
17+
storage: true

‎internal/pkg/scaffold/olm-catalog/testdata/deploy/crds/app_v1alpha1_app_crd.yaml

-13
This file was deleted.

0 commit comments

Comments
 (0)