WIP: additional dev fixes

This commit is contained in:
Neil Hanlon 2024-03-14 22:27:48 -04:00
parent 20dcb8528d
commit 6ab449e4f5
8 changed files with 22 additions and 14 deletions

View File

@ -63,7 +63,7 @@ local manifestYamlStream = function (value, indent_array_in_object=false, c_docu
protocol: 'TCP',
}]);
local services = if std.objectHas(info, 'services') then info.services else
[{ name: '%s-%s-%s' % [metadata.name, port.name, env], port: port.containerPort, expose: if std.objectHas(port, 'expose') then port.expose else false } for env in envs for port in ports];
[{ name: '%s-%s-%s' % [metadata.name, port.name, env], port: port.containerPort, portName: port.name, expose: if std.objectHas(port, 'expose') then port.expose else false } for env in envs for port in ports];
local file_yaml_prefix = if helm_mode then 'helm-' else '';
local nssa = '%s001-ns-sa.yaml' % file_yaml_prefix;
@ -283,6 +283,7 @@ local manifestYamlStream = function (value, indent_array_in_object=false, c_docu
},
srv.port,
srv.port,
portName=srv.portName,
selector=metadata.name,
env=mappings.get_env_from_svc(srv.name)
) for srv in services]) +

View File

@ -37,4 +37,5 @@ trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
USER="$(whoami)"
kubectl -n "$USER-dev" port-forward svc/spicedb-grpc-dev-service 50051 &
kubectl -n "$USER-dev" port-forward svc/hydra-admin-http-dev-service 4445 &
kubectl -n "$USER-dev" port-forward svc/hydra-public-http-dev-service 4444
kubectl -n "$USER-dev" port-forward svc/hydra-public-http-dev-service 4444 &
sudo kubectl --kubeconfig $KUBECONFIG -n "istio-system" port-forward --address 0.0.0.0 deployment/istio-ingressgateway 80:8080 443:8443

View File

@ -43,19 +43,20 @@ fi
cd "$DIR_TO_TEMPORAL" || exit 1
export SQL_PLUGIN=postgres
export SQL_PLUGIN=postgres12
export SQL_HOST=localhost
export SQL_PORT=$POSTGRES_PORT
export SQL_USER=postgres
export SQL_PASSWORD=postgres
./temporal-sql-tool create-database temporal
SQL_DATABASE=temporal ./temporal-sql-tool setup-schema -v 0.0
SQL_DATABASE=temporal ./temporal-sql-tool update -schema-dir schema/postgresql/v96/temporal/versioned
./temporal-sql-tool -database temporal create-database
./temporal-sql-tool -database temporal_visibility create-database
SQL_DATABASE=temporal ./temporal-sql-tool setup-schema -v 0.0
SQL_DATABASE=temporal ./temporal-sql-tool update -schema-dir schema/postgresql/v12/temporal/versioned
./temporal-sql-tool create-database temporal_visibility
SQL_DATABASE=temporal_visibility ./temporal-sql-tool setup-schema -v 0.0
SQL_DATABASE=temporal_visibility ./temporal-sql-tool update -schema-dir schema/postgresql/v96/visibility/versioned
SQL_DATABASE=temporal_visibility ./temporal-sql-tool update -schema-dir schema/postgresql/v12/visibility/versioned
sleep 10

View File

@ -36,6 +36,7 @@ resfdeploy.new({
name: 'http',
containerPort: 4445,
protocol: 'TCP',
expose: true,
},
],
health: {

View File

@ -128,7 +128,7 @@ spec:
- name: metrics
containerPort: 9090
protocol: TCP
- name: grpc-membership
- name: membership
protocol: TCP
containerPort: {{ include (printf "temporal.%s.membershipPort" $service) $ }}
{{- if ne $service "worker"}}

View File

@ -21,7 +21,7 @@ server:
sidecarContainers: {}
image:
repository: temporalio/server
tag: 1.22.4
tag: "1.20"
pullPolicy: IfNotPresent
# Global default settings (can be overridden per service)
@ -198,6 +198,7 @@ server:
annotations: {} # Evaluated as template
type: ClusterIP
port: 7233
membershipPort: 6933
metrics:
annotations:
enabled: true
@ -220,6 +221,7 @@ server:
service:
# type: ClusterIP
port: 7234
membershipPort: 6934
metrics:
annotations:
enabled: true
@ -242,6 +244,7 @@ server:
service:
# type: ClusterIP
port: 7235
membershipPort: 6935
metrics:
annotations:
enabled: false
@ -264,6 +267,7 @@ server:
service:
# type: ClusterIP
port: 7239
membershipPort: 6939
metrics:
annotations:
enabled: true

View File

@ -1,5 +1,5 @@
FROM quay.io/authzed/spicedb:v1.2.0 as spicedb
FROM quay.io/rockylinux/rockylinux:8
FROM quay.io/authzed/spicedb:v1.28.0 as spicedb
FROM quay.io/rockylinux/rockylinux:9
COPY --from=spicedb /usr/local/bin/spicedb /usr/local/bin/spicedb
COPY --from=spicedb /usr/local/bin/grpc_health_probe /usr/local/bin/grpc_health_probe

View File

@ -6,7 +6,7 @@ local DSN = db.dsn('hydra');
{
image: 'quay.io/peridot/spicedb',
tag: 'v0.3.21',
tag: 'v0.3.29',
legacyDb: true,
dsn: {
name: 'DSN',