Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update redis wording to replica #1680

Merged
merged 1 commit into from
Jul 25, 2023
Merged

update redis wording to replica #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
update redis wording to replica 
#### What type of PR is this?

<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
-->

We should be using replica to indicate a new node of redis.

Unfortunatley gcr still hasn't pushed another image, so we will still
have to use registry.k8s.io/redis-slave:v2

#### What this PR does / why we need it:

N/A

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #

N/A

#### Special notes for your reviewer:

N/A

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
  • Loading branch information
@cdrage
cdrage committed Jul 25, 2023
commit 4ddc9359ca15ea2bfea3d2fa171a8ae98162c075
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Convert [`docker-compose.yaml`](https://raw.githubusercontent.com/kubernetes/kom
$ kompose convert -f docker-compose.yaml
INFO Kubernetes file "frontend-service.yaml" created
INFO Kubernetes file "redis-master-service.yaml" created
INFO Kubernetes file "redis-slave-service.yaml" created
INFO Kubernetes file "redis-replica-service.yaml" created
INFO Kubernetes file "frontend-deployment.yaml" created
INFO Kubernetes file "redis-master-deployment.yaml" created
INFO Kubernetes file "redis-slave-deployment.yaml" created
INFO Kubernetes file "redis-replica-deployment.yaml" created
```

Other examples are provided in the _examples_ [directory](./examples).
Expand Down
8 changes: 4 additions & 4 deletions examples/docker-compose-v3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ version: "3"
services:

redis-master:
image: registry.k8s.io/redis:e2e
image: registry.k8s.io/redis:e2e
ports:
- "6379"

redis-slave:
image: gcr.io/google_samples/gb-redisslave:v1
redis-replica:
image: registry.k8s.io/redis-slave:v2
ports:
- "6379"
environment:
- GET_HOSTS_FROM=dns

frontend:
image: gcr.io/google-samples/gb-frontend:v4
image: registry.k8s.io/guestbook:v3
ports:
- "80:80"
environment:
Expand Down
7 changes: 4 additions & 3 deletions examples/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ services:
ports:
- "6379"

redis-slave:
image: gcr.io/google_samples/gb-redisslave:v1
redis-replica:
image: registry.k8s.io/redis-slave:v2

ports:
- "6379"
environment:
- GET_HOSTS_FROM=dns

frontend:
image: gcr.io/google-samples/gb-frontend:v4
image: registry.k8s.io/guestbook:v3
ports:
- "80:80"
environment:
Expand Down
6 changes: 3 additions & 3 deletions script/test/fixtures/controller/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ services:
ports:
- "6379"

redis-slave:
image: gcr.io/google_samples/gb-redisslave:v1
redis-replica:
image: registry.k8s.io/redis-slave:v2
ports:
- "6379"
environment:
- GET_HOSTS_FROM=dns

frontend:
image: gcr.io/google-samples/gb-frontend:v4
image: registry.k8s.io/guestbook:v3
ports:
- "80:80"
environment:
Expand Down
16 changes: 8 additions & 8 deletions script/test/fixtures/controller/output-k8s-daemonset-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"status": {
Expand Down Expand Up @@ -208,16 +208,16 @@
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"name": "redis-slave"
"name": "redis-replica"
},
"spec": {
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"spec": {
Expand All @@ -229,9 +229,9 @@
"value": "dns"
}
],
"image": "gcr.io/google_samples/gb-redisslave:v1",
"image": "registry.k8s.io/redis-slave:v2",
"imagePullPolicy": "",
"name": "redis-slave",
"name": "redis-replica",
"ports": [
{
"containerPort": 6379
Expand Down
18 changes: 9 additions & 9 deletions script/test/fixtures/controller/output-k8s-deployment-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"status": {
Expand Down Expand Up @@ -223,15 +223,15 @@
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"name": "redis-slave"
"name": "redis-replica"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"strategy": {},
Expand All @@ -243,7 +243,7 @@
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"spec": {
Expand All @@ -255,9 +255,9 @@
"value": "dns"
}
],
"image": "gcr.io/google_samples/gb-redisslave:v1",
"image": "registry.k8s.io/redis-slave:v2",
"imagePullPolicy": "",
"name": "redis-slave",
"name": "redis-replica",
"ports": [
{
"containerPort": 6379
Expand Down
16 changes: 8 additions & 8 deletions script/test/fixtures/controller/output-k8s-rc-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"status": {
Expand Down Expand Up @@ -194,10 +194,10 @@
"kind": "ReplicationController",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -210,14 +210,14 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"name": "redis-replica",
"image": "registry.k8s.io/redis-slave:v2",
"ports": [
{
"containerPort": 6379
Expand Down
16 changes: 8 additions & 8 deletions script/test/fixtures/examples/output-k8s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"status": {
Expand Down Expand Up @@ -201,10 +201,10 @@
"kind": "Deployment",
"apiVersion": "apps/v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -217,7 +217,7 @@
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -227,8 +227,8 @@
"spec": {
"containers": [
{
"name": "redis-slave",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"name": "redis-replica",
"image": "registry.k8s.io/redis-slave:v2",
"ports": [
{
"containerPort": 6379
Expand Down
26 changes: 13 additions & 13 deletions script/test/fixtures/examples/output-os.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -88,7 +88,7 @@
}
],
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"status": {
Expand Down Expand Up @@ -296,10 +296,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"annotations": {
"kompose.cmd": "%CMD%",
Expand All @@ -319,31 +319,31 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"redis-slave"
"redis-replica"
],
"from": {
"kind": "ImageStreamTag",
"name": "redis-slave:v1"
"name": "redis-replica:v1"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"name": "redis-replica",
"image": " ",
"ports": [
{
Expand All @@ -369,10 +369,10 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "redis-slave",
"name": "redis-replica",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
"io.kompose.service": "redis-replica"
}
},
"spec": {
Expand All @@ -382,7 +382,7 @@
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "gcr.io/google_samples/gb-redisslave:v1"
"name": "registry.k8s.io/redis-slave:v2"
},
"generation": null,
"importPolicy": {}
Expand Down
Loading