diff --git a/build/deploy/base.libsonnet b/build/deploy/base.libsonnet index 21013baf6..85d0d4b9d 100644 --- a/build/deploy/base.libsonnet +++ b/build/deploy/base.libsonnet @@ -8,13 +8,13 @@ local util = import 'util.libsonnet'; name: name, namespace: metadata.namespace, clusterName: metadata.clusterName, - labels: { + labels: { name: std.join('-', std.split(name, ':')), }, }, }, - _RoleRelated(kind, metadata, name): $._Object('rbac.authorization.k8s.io/v1beta1', kind, metadata, name) { + _RoleRelated(kind, metadata, name): $._Object('rbac.authorization.k8s.io/v1', kind, metadata, name) { local rr = self, app:: "", metadata+: { @@ -38,7 +38,7 @@ local util = import 'util.libsonnet'; metadata+: { namespace: null, }, - }, + }, Role(metadata, name): $._RoleRelated('Role', metadata, name) { @@ -76,7 +76,7 @@ local util = import 'util.libsonnet'; }, - Ingress(metadata, name): $._Object('networking.k8s.io/v1beta1', 'Ingress', metadata, name) { + Ingress(metadata, name): $._Object('networking.k8s.io/v1', 'Ingress', metadata, name) { }, diff --git a/build/deploy/http-gateway.libsonnet b/build/deploy/http-gateway.libsonnet index e1abd1a58..806dcd56d 100644 --- a/build/deploy/http-gateway.libsonnet +++ b/build/deploy/http-gateway.libsonnet @@ -8,9 +8,13 @@ local ingress(metadata) = base.Ingress(metadata, 'https-ingress') { }, }, spec: { - backend: { - serviceName: 'http-gateway', - servicePort: metadata.gateway.port, + defaultBackend: { + service: { + name: 'http-gateway', + port: { + number: metadata.gateway.port, + } + } }, }, };