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.

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

podman compat in development mode #477

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/tezos/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ images:
tezedge: tezedge/tezedge:v1.6.8
# Images that are part of the tezos-k8s repo go here with 'dev' tag
tezos_k8s_images:
utils: tezos-k8s-utils:dev
zerotier: tezos-k8s-zerotier:dev
utils: localhost/tezos-k8s-utils:dev
zerotier: localhost/tezos-k8s-zerotier:dev

## Properties that are templated for some k8s resources. There are container
## scripts that will look up some of these values. They should not be modified.
Expand Down
6 changes: 3 additions & 3 deletions devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ deployments:

images:
zerotier:
image: tezos-k8s-zerotier
image: localhost/tezos-k8s-zerotier
dockerfile: ./zerotier/Dockerfile
context: ./zerotier
utils:
image: tezos-k8s-utils
image: localhost/tezos-k8s-utils
dockerfile: ./utils/Dockerfile
context: ./utils
faucet:
image: tezos-k8s-faucet
image: localhost/tezos-k8s-faucet
dockerfile: ./faucet/Dockerfile
context: ./faucet

Expand Down
6 changes: 3 additions & 3 deletions test/charts/mainnet.expect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ spec:
path: /is_synced
port: 31732
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -233,7 +233,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -263,7 +263,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: snapshot-downloader
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- snapshot-downloader
Expand Down
16 changes: 8 additions & 8 deletions test/charts/mainnet2.expect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ spec:
path: /is_synced
port: 31732
- name: logger
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- logger
Expand Down Expand Up @@ -253,7 +253,7 @@ spec:
- name: DAEMON
value: tezos-metrics
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -332,7 +332,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -364,7 +364,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: snapshot-downloader
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- snapshot-downloader
Expand Down Expand Up @@ -546,7 +546,7 @@ spec:
path: /is_synced
port: 31732
- name: logger
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- logger
Expand Down Expand Up @@ -610,7 +610,7 @@ spec:
- name: DAEMON
value: tezos-metrics
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -689,7 +689,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -721,7 +721,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: snapshot-downloader
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- snapshot-downloader
Expand Down
32 changes: 16 additions & 16 deletions test/charts/private-chain.expect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: logger
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- logger
Expand Down Expand Up @@ -425,7 +425,7 @@ spec:
- name: DAEMON
value: tezos-metrics
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -454,7 +454,7 @@ spec:
name: var-volume
initContainers:
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -484,7 +484,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: wait-for-dns
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- wait-for-dns
Expand Down Expand Up @@ -591,7 +591,7 @@ spec:
path: /is_synced
port: 31732
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -620,7 +620,7 @@ spec:
name: var-volume
initContainers:
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -650,7 +650,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: wait-for-dns
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- wait-for-dns
Expand Down Expand Up @@ -809,7 +809,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: logger
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- logger
Expand Down Expand Up @@ -871,7 +871,7 @@ spec:
- name: DAEMON
value: tezos-metrics
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -900,7 +900,7 @@ spec:
name: var-volume
initContainers:
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -930,7 +930,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: wait-for-dns
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- wait-for-dns
Expand Down Expand Up @@ -1088,7 +1088,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
- name: sidecar
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- sidecar
Expand Down Expand Up @@ -1117,7 +1117,7 @@ spec:
name: var-volume
initContainers:
- name: config-generator
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- config-generator
Expand Down Expand Up @@ -1147,7 +1147,7 @@ spec:
- mountPath: /etc/secret-volume
name: tezos-accounts
- name: wait-for-dns
image: "tezos-k8s-utils:dev"
image: "localhost/tezos-k8s-utils:dev"
imagePullPolicy: IfNotPresent
args:
- wait-for-dns
Expand Down Expand Up @@ -1233,7 +1233,7 @@ spec:
exec $CMD

initContainers:
- image: tezos-k8s-utils:dev
- image: localhost/tezos-k8s-utils:dev
imagePullPolicy: IfNotPresent
name: config-generator
args:
Expand Down Expand Up @@ -1313,7 +1313,7 @@ spec:
- mountPath: /var/tezos
name: var-volume
initContainers:
- image: tezos-k8s-utils:dev
- image: localhost/tezos-k8s-utils:dev
imagePullPolicy: IfNotPresent
name: config-generator
args:
Expand Down