Merge branch 'master' into scoot/fix-k8s-readme-typos

aws-ecsfargate-terraform/task-definitions/scim.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "op_scim_bridge",
-    "image": "1password/scim:v2.6.0",
+    "image": "1password/scim:v2.6.2",
     "cpu": 128,
     "memory": 512,
     "essential": true,
@@ -42,8 +42,8 @@
         "awslogs-stream-prefix": "ecs-scim"
       }
     },
-    "mountPoints" : [],
-    "volumesFrom" : []
+    "mountPoints": [],
+    "volumesFrom": []
   },
   {
     "name": "redis",
@@ -73,7 +73,7 @@
         "value": "--maxmemory 256mb --maxmemory-policy volatile-lru"
       }
     ],
-    "mountPoints" : [],
-    "volumesFrom" : []
+    "mountPoints": [],
+    "volumesFrom": []
   }
 ]

docker/compose/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "2.2"
 services:
   scim:
-    image: 1password/scim:v2.6.0
+    image: 1password/scim:v2.6.2
     ports:
       - "3002:3002"
       - "80:8080"

docker/swarm/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   scim:
-    image: 1password/scim:v2.6.0
+    image: 1password/scim:v2.6.2
     deploy:
       replicas: 1
       restart_policy:

kubernetes/README.md

@@ -19,7 +19,7 @@ The deployment process consists of these steps:
 - [`op-scim-deployment.yaml`](./op-scim-deployment.yaml): The Deployment object for the SCIM bridge container.
 - [`op-scim-service.yaml`](./op-scim-service.yaml): Public load balancer for SCIM bridge to enable connectivity for your idenitty provider.
 - [`op-scim-config.yaml`](./op-scim-config.yaml): Configuration for the SCIM bridge Deployment.
-- [`redis-deployment.yaml`](./redis-deployment.yaml):  A Redis cache deployed in the cluster.
+- [`redis-deployment.yaml`](./redis-deployment.yaml): A Redis cache deployed in the cluster.
 - [`redis-service.yaml`](./op-scim-service.yaml): Kubernetes Service for the Redis cache to enable connectivity inside the cluster.
 - [`redis-config.yaml`](./redis-config.yaml): Configuration for the Redis cache.
 
@@ -139,14 +139,14 @@ You can now continue with the administration guide to configure your Identity Pr
 To update SCIM bridge, connect to your Kubernetes cluster and run the following command:
 
 ```bash
-kubectl set image deploy/op-scim-bridge op-scim-bridge=1password/scim:v2.6.0
+kubectl set image deploy/op-scim-bridge op-scim-bridge=1password/scim:v2.6.2
 ```
 
 This will upgrade your SCIM bridge to the latest version, which should take about 2-3 minutes for Kubernetes to process.
 
 ### October 2020 Upgrade Changes
 
-As of October 2020, the `scim-examples` Kubernetes deployment now uses `op-scim-config.yaml` to set the configuration needed for your SCIM bridge, and has changed the deployment names from `op-scim` to `op-scim-bridge`, and `redis` to `op-scim-redis` for clarity and consistency. 
+As of October 2020, the `scim-examples` Kubernetes deployment now uses `op-scim-config.yaml` to set the configuration needed for your SCIM bridge, and has changed the deployment names from `op-scim` to `op-scim-bridge`, and `redis` to `op-scim-redis` for clarity and consistency.
 
 You’ll need to re-configure your options in `op-scim-config.yaml`, particularly `OP_LETSENCRYPT_DOMAIN`. You may also want to delete your previous `op-scim` and `redis` deployments to prevent conflict between the two versions.
 
@@ -178,7 +178,7 @@ kubectl scale deploy op-scim-bridge --replicas=0 && sleep 3 && kubectl scale dep
 
 ## Resource Recommendations
 
-The default resource recommendations for the SCIM bridge and Redis deployments are acceptable in most scenarios, but they fall short in high volume deployments where there is a large number of users and/or groups. 
+The default resource recommendations for the SCIM bridge and Redis deployments are acceptable in most scenarios, but they fall short in high volume deployments where there is a large number of users and/or groups.
 
 Our current default resource requirements (defined in [op-scim-deployment](https://github.com/1Password/scim-examples/blob/master/kubernetes/op-scim-deployment.yaml#L29) and [redis-deployment.yaml](https://github.com/1Password/scim-examples/blob/master/kubernetes/redis-deployment.yaml#L21)) are:
 

kubernetes/op-scim-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: op-scim-bridge
-          image: 1password/scim:v2.6.0
+          image: 1password/scim:v2.6.2
           ports:
             # HTTPS port (external TCP traffic should be forwarded to this port by default)
             - name: https