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

Jump to bottom

update default octez to v12 #399

Merged
merged 1 commit into from
Mar 24, 2022
Merged

update default octez to v12 #399

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
2 changes: 1 addition & 1 deletion charts/tezos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ is_invitation: false

# Images not part of the tezos-k8s repo go here
images:
octez: tezos/tezos:v11-release
octez: tezos/tezos:v12-release
tezedge: tezedge/tezedge:v1.6.8
# Images that are part of the tezos-k8s repo go here with 'dev' tag
tezos_k8s_images:
Expand Down
2 changes: 1 addition & 1 deletion mkchain/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ You can explicitly specify some values by:
| | --number-of-nodes | Number of non-baking nodes in the cluster | 0 |
| bootstrap_peers | --bootstrap-peers | Peer ips to connect to | [] |
| expected_proof_of_work | --expected-proof-of-work | Node identity generation difficulty | 0 |
| images.octez | --octez-docker-image | Version of the Octez docker image to run | tezos/tezos:v11-release |
| images.octez | --octez-docker-image | Version of the Octez docker image to run | tezos/tezos:v12-release |
| | --use-docker (--no...) | Use (or don't use) docker to generate keys rather than pytezos | autodetect |
| zerotier_config.zerotier_network | --zerotier-network | Zerotier network id for external chain access | |
| zerotier_config.zerotier_token | --zerotier-token | Zerotier token for external chain access | |
Expand Down
2 changes: 1 addition & 1 deletion mkchain/tqchain/mkchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"octez_docker_image": {
"help": "Version of the Octez docker image",
"default": "tezos/tezos:v11-release",
"default": "tezos/tezos:v12-release",
},
"use_docker": {
"action": "store_true",
Expand Down
15 changes: 10 additions & 5 deletions test/charts/mainnet.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ data:
}
FULL_SNAPSHOT_URL: "https://mainnet.xtz-shots.io/full"
ROLLING_SNAPSHOT_URL: "https://mainnet.xtz-shots.io/rolling"
ARCHIVE_TARBALL_URL: "http://tezos-tarballs.s3-website.us-east-2.amazonaws.com/mainnet-archive-tarball"
ARCHIVE_TARBALL_URL: "https://mainnet.xtz-shots.io/archive-tarball"
ROLLING_TARBALL_URL: ""
NODE_GLOBALS: |
null

NODES: |

{
"rolling-node": {
"instances": [
Expand All @@ -51,6 +53,7 @@ data:
"storage_size": "100Gi"
}
}

SIGNERS: |
{}
kind: ConfigMap
Expand Down Expand Up @@ -105,7 +108,7 @@ spec:
containers:

- name: octez-node
image: "tezos/tezos:v11-release"
image: "tezos/tezos:v12-release"
command:
- /bin/sh
args:
Expand All @@ -115,6 +118,8 @@ spec:

set

# ensure we can run tezos-client commands without specifying client dir
ln -s /var/tezos/client /home/tezos/.tezos-client
#
# Not every error is fatal on start. In particular, with zerotier,
# the listen-addr may not yet be bound causing tezos-node to fail.
Expand Down Expand Up @@ -146,7 +151,7 @@ spec:
readinessProbe:
httpGet:
path: /is_synced
port: 31732
port: 31732
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

theres some random white space being added in a bunch of places 🤷

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a helper script to re-generate the expected helm template. I ran it to update to v12 everywhere in the tests, then this happened. I believe whitespace was already there. Perhaps a tab vs space situation. This should be addressed separately.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that what's going on here is that a prior commit didn't update the expect files. Once we enforce this on every pull request we won't see this.

- command:
- python
args:
Expand Down Expand Up @@ -201,7 +206,7 @@ spec:
imagePullPolicy: IfNotPresent
name: sidecar
initContainers:
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
command:
- /bin/sh
args:
Expand Down Expand Up @@ -300,7 +305,7 @@ spec:
value: node
- name: MY_NODE_CLASS
value: rolling-node
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
imagePullPolicy: IfNotPresent
name: snapshot-importer
command:
Expand Down
23 changes: 14 additions & 9 deletions test/charts/mainnet2.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ data:
}
FULL_SNAPSHOT_URL: "https://mainnet.xtz-shots.io/full"
ROLLING_SNAPSHOT_URL: "https://mainnet.xtz-shots.io/rolling"
ARCHIVE_TARBALL_URL: "http://tezos-tarballs.s3-website.us-east-2.amazonaws.com/mainnet-archive-tarball"
ARCHIVE_TARBALL_URL: "https://mainnet.xtz-shots.io/archive-tarball"
ROLLING_TARBALL_URL: ""
NODE_GLOBALS: |
null

NODES: |

{
"city-block": {
"instances": [
Expand All @@ -46,7 +48,7 @@ data:
},
"country-town": {
"images": {
"octez": "tezos/tezos:v11-release"
"octez": "tezos/tezos:v12-release"
},
"instances": [
{
Expand Down Expand Up @@ -75,6 +77,7 @@ data:
]
}
}

SIGNERS: |
{}
kind: ConfigMap
Expand Down Expand Up @@ -154,7 +157,7 @@ spec:
- mountPath: /etc/tezos
name: config-volume
- mountPath: /var/tezos
name: var-volume
name: var-volume
- image: "tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
name: logger
Expand Down Expand Up @@ -271,7 +274,7 @@ spec:
imagePullPolicy: IfNotPresent
name: sidecar
initContainers:
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
command:
- /bin/sh
args:
Expand Down Expand Up @@ -370,7 +373,7 @@ spec:
value: node
- name: MY_NODE_CLASS
value: city-block
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
imagePullPolicy: IfNotPresent
name: snapshot-importer
command:
Expand Down Expand Up @@ -464,7 +467,7 @@ spec:
containers:

- name: octez-node
image: "tezos/tezos:v11-release"
image: "tezos/tezos:v12-release"
command:
- /bin/sh
args:
Expand All @@ -474,6 +477,8 @@ spec:

set

# ensure we can run tezos-client commands without specifying client dir
ln -s /var/tezos/client /home/tezos/.tezos-client
#
# Not every error is fatal on start. In particular, with zerotier,
# the listen-addr may not yet be bound causing tezos-node to fail.
Expand Down Expand Up @@ -505,7 +510,7 @@ spec:
readinessProbe:
httpGet:
path: /is_synced
port: 31732
port: 31732
- image: "tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
name: logger
Expand Down Expand Up @@ -622,7 +627,7 @@ spec:
imagePullPolicy: IfNotPresent
name: sidecar
initContainers:
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
command:
- /bin/sh
args:
Expand Down Expand Up @@ -721,7 +726,7 @@ spec:
value: node
- name: MY_NODE_CLASS
value: country-town
- image: "tezos/tezos:v11-release"
- image: "tezos/tezos:v12-release"
imagePullPolicy: IfNotPresent
name: snapshot-importer
command:
Expand Down
2 changes: 1 addition & 1 deletion test/charts/mainnet2.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nodes:
country-town:
images:
octez: tezos/tezos:v11-release
octez: tezos/tezos:v12-release
runs: [ octez_node, logger, metrics ]
instances:
- config:
Expand Down
Loading