upkeep: NAIS til Nais

Author: Kyrremann

README.md

@@ -1,11 +1,11 @@
-# NAIS deployment
+# Nais deployment
 
 ## Overview
-NAIS deploy facilitates application deployment into NAV's Kubernetes clusters.
+Nais deploy facilitates application deployment into NAV's Kubernetes clusters.
 
 Developers push or merge code into the master branch of a Git repository, triggering an automated build using (preferably) Github actions.
 A successful build produces a Docker image artifact, which is uploaded onto Github package registry.
-The final step in the build pipeline sends an API request to NAIS deploy to deploy the Docker image onto one of our Kubernetes clusters.
+The final step in the build pipeline sends an API request to Nais deploy to deploy the Docker image onto one of our Kubernetes clusters.
 
 ![Sequence diagram of deployment components](doc/sequence.png)
 
@@ -19,7 +19,7 @@ Any fatal error will short-circuit the process with a `error` or `failure` statu
 Intermediary statuses will be posted, indicating the current state of the deployment.
 
 ## Usage
-The usage documentation has been moved to [NAIS platform documentation](https://doc.nais.io/build).
+The usage documentation has been moved to [Nais platform documentation](https://doc.nais.io/build).
 
 ### Deploy API
 _We strongly recommend that teams use the `deploy` cli to deploy, rather than posting directly to `hookd`._
@@ -54,15 +54,15 @@ to track the status of your deployment.
 |-------|------|-----------------------------------------------------------------------------------------------|
 | resources | list[object] | Array of Kubernetes resources                                                                 |
 | team | string | Team tag                                                                                      |
-| cluster | string | Kubernetes cluster, see [NAIS clusters](https://doc.nais.io/workloads/reference/environments) |
+| cluster | string | Kubernetes cluster, see [Nais clusters](https://doc.nais.io/workloads/reference/environments) |
 | environment | string | GitHub environment                                                                            |
 | owner | string | GitHub repository owner                                                                       |
 | repository | string | GitHub repository name                                                                        |
 | ref | string | GitHub commit hash or tag                                                                     |
 | timestamp | int64 | Current Unix timestamp                                                                        |
 
 Additionally, the header `X-NAIS-Signature` must contain a keyed-hash message authentication code (HMAC).
-The code can be derived by hashing the request body using the SHA256 algorithm together with your team's NAIS Deploy API key.
+The code can be derived by hashing the request body using the SHA256 algorithm together with your team's Nais Deploy API key.
 
 #### Response specification
 
@@ -90,7 +90,7 @@ The code can be derived by hashing the request body using the SHA256 algorithm t
 | 400 | NO | The request contains errors and cannot be processed. Check the `message` field for details.
 | 403 | MAYBE | Authentication failed. Check that you're supplying the correct `team`; that the team is present on GitHub and has admin access to your repository; that you're using the correct API key; and properly HMAC signing the request. |
 | 404 | NO | Wrong URL. |
-| 5xx | YES | NAIS deploy is having problems and is currently being fixed. Retry later. |
+| 5xx | YES | Nais deploy is having problems and is currently being fixed. Retry later. |
 
 
 ## Application components

actions/deploy/README.md

@@ -2,11 +2,11 @@
 
 ## Usage
 
-See the [NAIS documentation](https://doc.nais.io/build/how-to/build-and-deploy).
+See the [Nais documentation](https://doc.nais.io/build/how-to/build-and-deploy).
 
 ## Configuration options
 
-The available configuration options for the NAIS deploy GitHub action.
+The available configuration options for the Nais deploy GitHub action.
 
 | Environment variable | Default                  | Description                                                                                                                                                                                                                 |
 |:---------------------|:-------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

actions/deploy/action.yml

@@ -1,5 +1,5 @@
-name: 'NAIS deploy'
-description: 'Deploy to a NAIS cluster'
+name: 'Nais deploy'
+description: 'Deploy to a Nais cluster'
 author: '@nais'
 color: purple
 icon: zap

charts/canary-deployer/templates/NOTES.txt

@@ -1,3 +1,3 @@
-Canary deployer is a CronJob that tries to use NAIS deploy to deploy a canary image to a set of clusters.
+Canary deployer is a CronJob that tries to use Nais deploy to deploy a canary image to a set of clusters.
 
 The monitoring system reads metrics from the canary image, and can tell if the deploy system is lagging.

charts/deployd/templates/alerts.yaml

@@ -7,7 +7,7 @@ spec:
   groups:
     - name: deployd
       rules:
-        - alert: NAIS deploy canary does not sing
+        - alert: Nais deploy canary does not sing
           expr: |
             min(nais_testapp_time_since_deploy{app="nais-deploy-canary",namespace="nais-verification"}) > 900
           for: 5m
@@ -16,10 +16,10 @@ spec:
             severity: critical
           annotations:
             summary: |
-              Problem with NAIS deploy
+              Problem with Nais deploy
 
               Canary application should deploy every 5 minutes, but has not been deployed successfully in over 20 minutes.
-            consequence: NAIS deploy is probably unavailable. Some or all users might not be able to deploy
+            consequence: Nais deploy is probably unavailable. Some or all users might not be able to deploy
             action: |
               * `kubectl --context management -n nais-system describe job -l app=canary-deployer`
               * `kubectl --context management -n nais-system describe deploy hookd`
@@ -31,7 +31,7 @@ spec:
               Logs: https://logs.adeo.no/goto/cb6b89c655dcb051fa633ce35070d385
               Instrumentation: https://monitoring.nais.io/d/9Wb381o4k/deploy-canary
               2nd line: @nais-features
-        - alert: NAIS deploy canary metric missing
+        - alert: Nais deploy canary metric missing
           expr: |
             absent(nais_testapp_time_since_deploy{app="nais-deploy-canary",namespace="nais-verification"})
           for: 5m
@@ -43,7 +43,7 @@ spec:
               The metric used to determine if the canary application is deployed is missing.
 
               Canary application should produce metrics in order for other alerts to work.
-            consequence: NAIS deploy might be available, but we can't know.
+            consequence: Nais deploy might be available, but we can't know.
             action: |
               * `kubectl --context management -n nais-system describe job -l app=canary-deployer`
               * `kubectl --context management -n nais-system describe deploy hookd`

charts/hookd/Feature.yaml

@@ -82,6 +82,6 @@ values:
       template: "{{.Management.hookd_frontend_pre_shared_key | quote}}"
     description: "The pre-shared key used to authenticate the console-backend"
   naisAPI.insecureConnection:
-    displayName: Insecure connection to NAIS API
+    displayName: Insecure connection to Nais API
     config:
       type: bool

cmd/deploy/main.go

@@ -41,7 +41,7 @@ func run() error {
 	deployclient.SetupLogging(*cfg)
 
 	// Welcome
-	log.Infof("NAIS deploy %s", version.Version())
+	log.Infof("Nais deploy %s", version.Version())
 
 	err := cfg.Validate()
 	if err != nil {
@@ -75,7 +75,7 @@ func run() error {
 	}
 
 	// Start the deploy client's top level trace.
-	ctx, span = telemetry.Tracer().Start(ctx, "NAIS deploy", otrace.WithSpanKind(otrace.SpanKindClient))
+	ctx, span = telemetry.Tracer().Start(ctx, "Nais deploy", otrace.WithSpanKind(otrace.SpanKindClient))
 	defer span.End()
 
 	// Print version

doc/sequence.puml

@@ -7,7 +7,7 @@ database registry as "Docker Hub"
 participant hookd
 database db as "Postgres"
 collections deployd
-participant kubernetes as "NAIS"
+participant kubernetes as "Nais"
 
 ==Build and release==
 developer -> github: git push
@@ -59,7 +59,7 @@ hookd -> db:  Append deployment status
 note left: Error in deployment request
 note right: error
 hookd -> db:  Append deployment status
-note left: Internal error in NAIS deploy
+note left: Internal error in Nais deploy
 note right: error
 
 @enduml

pkg/deployclient/config.go

@@ -42,9 +42,9 @@ type Config struct {
 }
 
 func InitConfig(cfg *Config) {
-	flag.StringVar(&cfg.APIKey, "apikey", os.Getenv("APIKEY"), "NAIS Deploy API key. (env APIKEY)")
+	flag.StringVar(&cfg.APIKey, "apikey", os.Getenv("APIKEY"), "Nais Deploy API key. (env APIKEY)")
 	flag.BoolVar(&cfg.Actions, "actions", getEnvBool("ACTIONS", false), "Use GitHub Actions compatible error and warning messages. (env ACTIONS)")
-	flag.StringVar(&cfg.Cluster, "cluster", os.Getenv("CLUSTER"), "NAIS cluster to deploy into. (env CLUSTER)")
+	flag.StringVar(&cfg.Cluster, "cluster", os.Getenv("CLUSTER"), "Nais cluster to deploy into. (env CLUSTER)")
 	flag.StringVar(&cfg.DeployServerURL, "deploy-server", getEnv("DEPLOY_SERVER", DefaultDeployServer), "URL to API server. (env DEPLOY_SERVER)")
 	flag.BoolVar(&cfg.DryRun, "dry-run", getEnvBool("DRY_RUN", false), "Run templating, but don't actually make any requests. (env DRY_RUN)")
 	flag.StringVar(&cfg.Environment, "environment", os.Getenv("ENVIRONMENT"), "Environment for GitHub deployment. Autodetected from nais.yaml if not specified. (env ENVIRONMENT)")

pkg/deployclient/deployclient.go

@@ -190,7 +190,7 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 	defer span.End()
 	deployRequest.TraceParent = telemetry.TraceParentHeader(ctx)
 
-	log.Infof("Sending deployment request to NAIS deploy at %s...", cfg.DeployServerURL)
+	log.Infof("Sending deployment request to Nais deploy at %s...", cfg.DeployServerURL)
 
 	sendDeploymentRequest := func() error {
 		requestContext, requestSpan := telemetry.Tracer().Start(ctx, "Waiting for deploy server")
@@ -216,7 +216,7 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 			return ErrorWrap(ExitNoDeployment, err)
 		}
 
-		log.Infof("Deployment request accepted by NAIS deploy and dispatched to cluster '%s'.", deployStatus.GetRequest().GetCluster())
+		log.Infof("Deployment request accepted by Nais deploy and dispatched to cluster '%s'.", deployStatus.GetRequest().GetCluster())
 
 		deployRequest.ID = deployStatus.GetRequest().GetID()
 		telemetry.AddDeploymentRequestSpanAttributes(span, deployStatus.GetRequest())
@@ -262,7 +262,7 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 		defer summaryFile.Close()
 	}
 
-	summary("## 🚀 NAIS deploy")
+	summary("## 🚀 Nais deploy")
 	summary("")
 	summary("* Detailed trace: [%s](%s)", traceID, cfg.TracingDashboardURL+traceID)
 	summary("* Request ID: %s", deployRequest.GetID())
@@ -292,12 +292,12 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 			if err != nil {
 				connectionLost = true
 			} else if connectionLost {
-				log.Infof("Connection to NAIS deploy re-established.")
+				log.Infof("Connection to Nais deploy re-established.")
 			}
 			return err
 		})
 		if err != nil {
-			summary("❌ lost connection to NAIS deploy", deployStatus.GetState(), deployStatus.GetMessage())
+			summary("❌ lost connection to Nais deploy", deployStatus.GetState(), deployStatus.GetMessage())
 			return ErrorWrap(ExitUnavailable, err)
 		}
 
@@ -309,16 +309,16 @@ func (d *Deployer) Deploy(ctx context.Context, cfg *Config, deployRequest *pb.De
 					log.Warn(formatGrpcError(err))
 					break
 				} else {
-					summary("❌ lost connection to NAIS deploy", deployStatus.GetState(), deployStatus.GetMessage())
+					summary("❌ lost connection to Nais deploy", deployStatus.GetState(), deployStatus.GetMessage())
 					return Errorf(ExitUnavailable, "%s", formatGrpcError(err))
 				}
 			}
 			logDeployStatus(deployStatus)
 			if deployStatus.GetState() == pb.DeploymentState_inactive {
-				log.Warn("NAIS deploy has been restarted. Re-sending deployment request...")
+				log.Warn("Nais deploy has been restarted. Re-sending deployment request...")
 				err = sendDeploymentRequest()
 				if err != nil {
-					summary("❌ lost connection to NAIS deploy", deployStatus.GetState(), deployStatus.GetMessage())
+					summary("❌ lost connection to Nais deploy", deployStatus.GetState(), deployStatus.GetMessage())
 					return err
 				}
 			} else if deployStatus.GetState().Finished() {