Skip to content

Commit

Permalink
Remove trailing whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
reegnz committed Oct 30, 2018
1 parent 78097f9 commit 412a68d
Show file tree
Hide file tree
Showing 50 changed files with 173 additions and 173 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use the latest and greatest features, current guidelines and best practices,
and to refresh command syntax, output, changed prerequisites, as needed.

|Name | Description | Notable Features Used | Complexity Level|
------------- | ------------- | ------------ | ------------ |
------------- | ------------- | ------------ | ------------ |
|[Guestbook](guestbook/) | PHP app with Redis | Deployment, Service | Beginner |
|[WordPress](mysql-wordpress-pd/) | WordPress with MySQL | Deployment, Persistent Volume with Claim | Beginner|
|[Cassandra](cassandra/) | Cloud Native Cassandra | Daemon Set, Stateful Set, Replication Controller | Intermediate
Expand Down
2 changes: 1 addition & 1 deletion cassandra/cassandra-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
lifecycle:
preStop:
exec:
command:
command:
- /bin/sh
- -c
- nodetool drain
Expand Down
2 changes: 1 addition & 1 deletion cassandra/image/files/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ else
fi

mv /kubernetes-cassandra.jar /usr/local/apache-cassandra-${CASSANDRA_VERSION}/lib
mv /cassandra-seed.so /etc/cassandra/
mv /cassandra-seed.so /etc/cassandra/
mv /cassandra-seed.h /usr/local/lib/include

apt-get -y purge localepurge
Expand Down
6 changes: 3 additions & 3 deletions cassandra/image/files/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ counter_cache_save_period: 7200
saved_caches_directory: /cassandra_data/saved_caches

# commitlog_sync may be either "periodic" or "batch."
#
#
# When in batch mode, Cassandra won't ack writes until the commit log
# has been fsynced to disk. It will wait
# commitlog_sync_batch_window_in_ms milliseconds between fsyncs.
Expand Down Expand Up @@ -980,9 +980,9 @@ transparent_data_encryption_options:
key_alias: testing:1
# CBC IV length for AES needs to be 16 bytes (which is also the default size)
# iv_length: 16
key_provider:
key_provider:
- class_name: org.apache.cassandra.security.JKSKeyProvider
parameters:
parameters:
- keystore: conf/.keystore
keystore_password: cassandra
store_type: JCEKS
Expand Down
2 changes: 1 addition & 1 deletion cassandra/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public class KubernetesSeedProvider implements SeedProvider {

/**
* Create new seed provider
*
*
* @param params
*/
public KubernetesSeedProvider(Map<String, String> params) {
}

/**
* Call Kubernetes API to collect a list of seed providers
*
*
* @return list of seed providers
*/
public List<InetAddress> getSeeds() {
Expand Down
2 changes: 1 addition & 1 deletion cassandra/java/src/test/resources/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data_file_directories:
- target/cassandra/data
disk_access_mode: mmap
seed_provider:
- class_name: io.k8s.cassandra.KubernetesSeedProvider
- class_name: io.k8s.cassandra.KubernetesSeedProvider
parameters:
- seeds: "8.4.4.4,8.8.8.8"
endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
Expand Down
4 changes: 2 additions & 2 deletions guestbook-go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Use the `examples/guestbook-go/redis-master-controller.json` file to create a [r

```console
me@workstation$ gcloud compute ssh --zone us-central1-b kubernetes-node-bz1p

me@kubernetes-node-3:~$ sudo docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS
d5c458dabe50 redis "/entrypoint.sh redis" 5 minutes ago Up 5 minutes
Expand Down Expand Up @@ -195,7 +195,7 @@ This is a simple Go `net/http` ([negroni](https://github.com/codegangsta/negroni
redis-master-xx4uv 1/1 Running 0 23m
redis-slave-b6wj4 1/1 Running 0 6m
redis-slave-iai40 1/1 Running 0 6m
...
...
```

Result: You see a single Redis master, two Redis slaves, and three guestbook pods.
Expand Down
2 changes: 1 addition & 1 deletion guestbook/frontend-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
tier: frontend
spec:
# comment or delete the following line if you want to use a LoadBalancer
type: NodePort
type: NodePort
# if your cluster supports it, uncomment the following to automatically create
# an external load-balanced IP for the frontend service.
# type: LoadBalancer
Expand Down
2 changes: 1 addition & 1 deletion staging/cockroachdb/demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function kill() {
# Create database on second node (idempotently for convenience).
cat <<EOF | sql 1
CREATE DATABASE IF NOT EXISTS foo;
CREATE TABLE IF NOT EXISTS foo.bar (k STRING PRIMARY KEY, v STRING);
CREATE TABLE IF NOT EXISTS foo.bar (k STRING PRIMARY KEY, v STRING);
UPSERT INTO foo.bar VALUES ('Kuber', 'netes'), ('Cockroach', 'DB');
EOF

Expand Down
18 changes: 9 additions & 9 deletions staging/javaee/mysql-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ metadata:
name: mysql-pod
context: docker-k8s-lab
spec:
containers:
-
containers:
-
name: mysql
image: mysql:latest
env:
-
env:
-
name: "MYSQL_USER"
value: "mysql"
-
-
name: "MYSQL_PASSWORD"
value: "mysql"
-
-
name: "MYSQL_DATABASE"
value: "sample"
-
-
name: "MYSQL_ROOT_PASSWORD"
value: "supersecret"
ports:
-
ports:
-
containerPort: 3306
8 changes: 4 additions & 4 deletions staging/javaee/mysql-service.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: v1
kind: Service
metadata:
metadata:
name: mysql-service
labels:
labels:
name: mysql-pod
context: docker-k8s-lab
spec:
spec:
ports:
# the port that this service should serve on
- port: 3306
# label keys and values that must match in order to receive traffic for this service
selector:
selector:
name: mysql-pod
context: docker-k8s-lab
2 changes: 1 addition & 1 deletion staging/javaweb-tomcat-sidecar/javaweb-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
name: app-volume
ports:
- containerPort: 8080
hostPort: 8001
hostPort: 8001
volumes:
- name: app-volume
emptyDir: {}
Expand Down
2 changes: 1 addition & 1 deletion staging/openshift-origin/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export PUBLIC_OPENSHIFT_IP=""
echo "===> Waiting for public IP to be set for the OpenShift Service."
echo "Mistakes in service setup can cause this to loop infinitely if an"
echo "external IP is never set. Ensure that the OpenShift service"
echo "is set to use an external load balancer. This process may take"
echo "is set to use an external load balancer. This process may take"
echo "a few minutes. Errors can be found in the log file found at:"
echo ${OPENSHIFT_EXAMPLE}/openshift-startup.log
echo "" > ${OPENSHIFT_EXAMPLE}/openshift-startup.log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: server
image: nginx
image: nginx
volumeMounts:
- mountPath: /var/lib/www/html
name: quobytepvc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
name: ceph-secret-user
type: "kubernetes.io/rbd"
type: "kubernetes.io/rbd"
data:
#Please note this value is base64 encoded.
key: QVFBTWdYaFZ3QkNlRGhBQTlubFBhRnlmVVNhdEdENGRyRldEdlE9PQ==
2 changes: 1 addition & 1 deletion staging/podsecuritypolicy/rbac/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ In order to create a pod, either the creating user or the service account
specified by the pod must be authorized to use a `PodSecurityPolicy` object
that allows the pod, within the pod's namespace.

That authorization is determined by the ability to perform the `use` verb
That authorization is determined by the ability to perform the `use` verb
on a particular `podsecuritypolicies` resource, at the scope of the pod's namespace.
The `use` verb is a special verb that grants access to use a policy while not permitting any
other access.
Expand Down
4 changes: 2 additions & 2 deletions staging/selenium/selenium-hub-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: selenium-hub
name: selenium-hub
labels:
app: selenium-hub
spec:
Expand All @@ -18,7 +18,7 @@ spec:
- name: selenium-hub
image: selenium/hub:3.11
ports:
- containerPort: 4444
- containerPort: 4444
resources:
limits:
memory: "1000Mi"
Expand Down
4 changes: 2 additions & 2 deletions staging/selenium/selenium-hub-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app: selenium-hub
spec:
ports:
- port: 4444
targetPort: 4444
- port: 4444
targetPort: 4444
name: port0
selector:
app: selenium-hub
Expand Down
8 changes: 4 additions & 4 deletions staging/selenium/selenium-node-chrome-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: selenium-node-chrome
name: selenium-node-chrome
labels:
app: selenium-node-chrome
spec:
Expand All @@ -18,11 +18,11 @@ spec:
- name: selenium-node-chrome
image: selenium/node-chrome-debug:3.11
ports:
- containerPort: 5900
- containerPort: 5900
env:
- name: HUB_PORT_4444_TCP_ADDR
- name: HUB_PORT_4444_TCP_ADDR
value: "selenium-hub"
- name: HUB_PORT_4444_TCP_PORT
- name: HUB_PORT_4444_TCP_PORT
value: "4444"
resources:
limits:
Expand Down
10 changes: 5 additions & 5 deletions staging/selenium/selenium-node-firefox-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: selenium-node-firefox
name: selenium-node-firefox
labels:
app: selenium-node-firefox
spec:
Expand All @@ -14,22 +14,22 @@ spec:
labels:
app: selenium-node-firefox
spec:
volumes:
volumes:
- name: dshm
emptyDir:
medium: Memory
containers:
- name: selenium-node-firefox
image: selenium/node-firefox-debug:3.11
ports:
- containerPort: 5900
- containerPort: 5900
volumeMounts:
- mountPath: /dev/shm
name: dshm
env:
- name: HUB_PORT_4444_TCP_ADDR
- name: HUB_PORT_4444_TCP_ADDR
value: "selenium-hub"
- name: HUB_PORT_4444_TCP_PORT
- name: HUB_PORT_4444_TCP_PORT
value: "4444"
resources:
limits:
Expand Down
20 changes: 10 additions & 10 deletions staging/storage/hazelcast/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ metadata:
labels:
name: hazelcast
name: hazelcast
spec:
spec:
ports:
- port: 5701
selector:
Expand Down Expand Up @@ -74,27 +74,27 @@ Deployments will "adopt" existing pods that match their selector query, so let's
```yaml
apiVersion: "apps/v1" # for k8s versions before 1.9.0 use apps/v1beta2 and before 1.8.0 use extensions/v1beta1
kind: Deployment
metadata:
metadata:
name: hazelcast
labels:
labels:
name: hazelcast
spec:
selector:
matchLabels:
name: hazelcast
template:
metadata:
labels:
template:
metadata:
labels:
name: hazelcast
spec:
containers:
spec:
containers:
- name: hazelcast
image: quay.io/pires/hazelcast-kubernetes:0.8.0
imagePullPolicy: Always
env:
- name: "DNS_DOMAIN"
value: "cluster.local"
ports:
ports:
- name: hazelcast
containerPort: 5701
```
Expand Down Expand Up @@ -187,7 +187,7 @@ kubectl logs -f hazelcast-4195412960-0tl3w
2017-03-15 09:42:47.253 INFO 7 --- [cached.thread-3] c.hazelcast.nio.tcp.InitConnectionTask : [172.17.0.6]:5701 [someGroup] [3.8] Connecting to /172.17.0.2:5701, timeout: 0, bind-any: true
2017-03-15 09:42:47.262 INFO 7 --- [cached.thread-3] c.h.nio.tcp.TcpIpConnectionManager : [172.17.0.6]:5701 [someGroup] [3.8] Established socket connection between /172.17.0.6:58073 and /172.17.0.2:5701
2017-03-15 09:42:54.260 INFO 7 --- [ration.thread-0] com.hazelcast.system : [172.17.0.6]:5701 [someGroup] [3.8] Cluster version set to 3.8
2017-03-15 09:42:54.262 INFO 7 --- [ration.thread-0] c.h.internal.cluster.ClusterService : [172.17.0.6]:5701 [someGroup] [3.8]
2017-03-15 09:42:54.262 INFO 7 --- [ration.thread-0] c.h.internal.cluster.ClusterService : [172.17.0.6]:5701 [someGroup] [3.8]
Members [2] {
Member [172.17.0.2]:5701 - 170f6924-7888-442a-9875-ad4d25659a8a
Expand Down
18 changes: 9 additions & 9 deletions staging/storage/hazelcast/hazelcast-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apiVersion: apps/v1 # for k8s versions before 1.9.0 use apps/v1beta2 and before 1.8.0 use extensions/v1beta1
kind: Deployment
metadata:
metadata:
name: hazelcast
labels:
labels:
name: hazelcast
spec:
spec:
selector:
matchLabels:
name: hazelcast
template:
metadata:
labels:
template:
metadata:
labels:
name: hazelcast
spec:
containers:
spec:
containers:
- name: hazelcast
image: quay.io/pires/hazelcast-kubernetes:3.8_1
imagePullPolicy: Always
Expand All @@ -24,6 +24,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
ports:
ports:
- name: hazelcast
containerPort: 5701
Loading

0 comments on commit 412a68d

Please sign in to comment.