*: rename sa.yaml to service_account.yaml

Author: AlexNPavel

README.md

@@ -77,7 +77,7 @@ $ docker push quay.io/example/app-operator
 $ sed -i 's|REPLACE_IMAGE|quay.io/example/app-operator|g' deploy/operator.yaml
 
 # Setup Service Account
-$ kubectl create -f deploy/sa.yaml
+$ kubectl create -f deploy/service_account.yaml
 # Setup RBAC
 $ kubectl create -f deploy/role.yaml
 $ kubectl create -f deploy/role_binding.yaml
@@ -100,7 +100,7 @@ $ kubectl delete -f deploy/app_v1alpha1_appservice_cr.yaml
 $ kubectl delete -f deploy/operator.yaml
 $ kubectl delete -f deploy/role.yaml
 $ kubectl delete -f deploy/role_binding.yaml
-$ kubectl delete -f deploy/sa.yaml
+$ kubectl delete -f deploy/service_account.yaml
 $ kubectl delete -f deploy/crds/app_v1alpha1_appservice_crd.yaml
 ```
 

commands/operator-sdk/cmd/test/local.go

@@ -63,15 +63,15 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	if len(args) != 1 {
 		log.Fatalf("operator-sdk test local requires exactly 1 argument")
 	}
-	// if no namespaced manifest path is given, combine deploy/sa.yaml, deploy/role.yaml, deploy/role_binding.yaml and deploy/operator.yaml
+	// if no namespaced manifest path is given, combine deploy/service_account.yaml, deploy/role.yaml, deploy/role_binding.yaml and deploy/operator.yaml
 	if tlConfig.namespacedManPath == "" {
 		err := os.MkdirAll("deploy/test", os.FileMode(cmdutil.DefaultDirFileMode))
 		if err != nil {
 			log.Fatalf("could not create deploy/test: %v", err)
 		}
 		tlConfig.namespacedManPath = "deploy/test/namespace-manifests.yaml"
 
-		sa, err := ioutil.ReadFile("deploy/sa.yaml")
+		sa, err := ioutil.ReadFile("deploy/service_account.yaml")
 		if err != nil {
 			log.Fatalf("could not find sa manifest: %v", err)
 		}

doc/ansible/user-guide.md

@@ -207,7 +207,7 @@ $ sed -i 's|REPLACE_IMAGE|quay.io/example/memcached-operator:v0.0.1|g' deploy/op
 Deploy the memcached-operator:
 
 ```sh
-$ kubectl create -f deploy/sa.yaml
+$ kubectl create -f deploy/service_account.yaml
 $ kubectl create -f deploy/role.yaml
 $ kubectl create -f deploy/role_binding.yaml
 $ kubectl create -f deploy/operator.yaml
@@ -327,7 +327,7 @@ $ kubectl delete -f deploy/crds/cache_v1alpha1_memcached_cr.yaml
 $ kubectl delete -f deploy/operator.yaml
 $ kubectl delete -f deploy/role_binding.yaml
 $ kubectl delete -f deploy/role.yaml
-$ kubectl delete -f deploy/sa.yaml
+$ kubectl delete -f deploy/service_account.yaml
 $ kubectl delete -f deploy/crds/cache_v1alpha1_memcached_cr.yaml
 ```
 

doc/sdk-cli-reference.md

@@ -199,7 +199,7 @@ Runs the tests locally
 ##### Flags
 * `--kubeconfig` string - location of kubeconfig for kubernetes cluster (default "~/.kube/config")
 * `--global-manifest` string - path to manifest for global resources (default "deploy/crd.yaml)
-* `--namespaced-manifest` string - path to manifest for per-test, namespaced resources (default: combines deploy/sa.yaml, deploy/rbac.yaml, and deploy/operator.yaml)
+* `--namespaced-manifest` string - path to manifest for per-test, namespaced resources (default: combines deploy/service_account.yaml, deploy/rbac.yaml, and deploy/operator.yaml)
 *  `--namespace` string - if non-empty, single namespace to run tests in (e.g. "operator-test") (default: "")
 * `--go-test-flags` string - extra arguments to pass to `go test` (e.g. -f "-v -parallel=2")
 * `-h, --help` - help for local

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

@@ -224,7 +224,7 @@ functions will automatically be run since they were deferred when the TestCtx wa
 
 To make running the tests simpler, the `operator-sdk` CLI tool has a `test` subcommand that can configure
 default test settings, such as locations of your global resource manifest file (by default
-`deploy/crd.yaml`) and your namespaced resource manifest file (by default `deploy/sa.yaml` concatenated with
+`deploy/crd.yaml`) and your namespaced resource manifest file (by default `deploy/service_account.yaml` concatenated with
 `deploy/rbac.yaml` and `deploy/operator.yaml`), and allows the user to configure runtime options. There are 2 ways to use the
 subcommand: local and cluster.
 ### Local
@@ -249,8 +249,8 @@ in [MainEntry][main-entry-link] are declared, the tests will run correctly. Runn
 will result in undefined behavior. This is an example `go test` equivalent to the `operator-sdk test local` example above:
 
 ```shell
-# Combine sa, rbac, operator manifest into namespaced manifest
-$ cp deploy/sa.yaml deploy/namespace-init.yaml
+# Combine service_account, rbac, operator manifest into namespaced manifest
+$ cp deploy/service_account.yaml deploy/namespace-init.yaml
 $ echo -e "\n---\n" >> deploy/namespace-init.yaml
 $ cat deploy/rbac.yaml >> deploy/namespace-init.yaml
 $ echo -e "\n---\n" >> deploy/namespace-init.yaml
@@ -279,7 +279,7 @@ and a namespace with proper rbac configured:
 ```shell
 $ kubectl create -f deploy/crds/cache_v1alpha1_memcached_crd.yaml
 $ kubectl create namespace memcached-test
-$ kubectl create -f deploy/sa.yaml -n memcached-test
+$ kubectl create -f deploy/service_account.yaml -n memcached-test
 $ kubectl create -f deploy/role.yaml -n memcached-test
 $ kubectl create -f deploy/role_binding.yaml -n memcached-test
 ```

doc/user-guide.md

@@ -185,7 +185,7 @@ The Deployment manifest is generated at `deploy/operator.yaml`. Be sure to updat
 Setup RBAC and deploy the memcached-operator:
 
 ```sh
-$ kubectl create -f deploy/sa.yaml
+$ kubectl create -f deploy/service_account.yaml
 $ kubectl create -f deploy/role.yaml
 $ kubectl create -f deploy/role_binding.yaml
 $ kubectl create -f deploy/operator.yaml
@@ -313,7 +313,7 @@ $ kubectl delete -f deploy/crds/cache_v1alpha1_memcached_cr.yaml
 $ kubectl delete -f deploy/operator.yaml
 $ kubectl delete -f deploy/role_binding.yaml
 $ kubectl delete -f deploy/role.yaml
-$ kubectl delete -f deploy/sa.yaml
+$ kubectl delete -f deploy/service_account.yaml
 ```
 
 ## Advanced Topics

pkg/scaffold/constants.go

@@ -48,7 +48,7 @@ const (
 	versionFile            = "version.go"
 	docFile                = "doc.go"
 	registerFile           = "register.go"
-	serviceAccountYamlFile = "sa.yaml"
+	serviceAccountYamlFile = "service_account.yaml"
 	roleYamlFile           = "role.yaml"
 	roleBindingYamlFile    = "role_binding.yaml"
 	operatorYamlFile       = "operator.yaml"

pkg/scaffold/sa.go renamed to pkg/scaffold/service_account.go

@@ -320,7 +320,7 @@ func MemcachedCluster(t *testing.T) {
 	}
 
 	// create sa
-	saYAML, err := ioutil.ReadFile("deploy/sa.yaml")
+	saYAML, err := ioutil.ReadFile("deploy/service_account.yaml")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -383,7 +383,7 @@ func MemcachedClusterTest(t *testing.T) {
 	defer ctx.Cleanup(t)
 
 	// create sa
-	saYAML, err := ioutil.ReadFile("deploy/sa.yaml")
+	saYAML, err := ioutil.ReadFile("deploy/service_account.yaml")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/scaffold/sa_test.go renamed to pkg/scaffold/service_account_test.go

@@ -27,7 +27,7 @@ sed -i "s|REPLACE_IMAGE|$DEST_IMAGE|g" deploy/operator.yaml
 sed -i 's|Always|Never|g' deploy/operator.yaml
 
 # deploy the operator
-kubectl create -f deploy/sa.yaml
+kubectl create -f deploy/service_account.yaml
 kubectl create -f deploy/role.yaml
 kubectl create -f deploy/role_binding.yaml
 kubectl create -f deploy/crds/ansible_v1alpha1_memcached_crd.yaml