From 3cfa8bfea5ee704a6b51c06818937fec32c9bf29 Mon Sep 17 00:00:00 2001 From: Alex Tugarev Date: Wed, 28 Dec 2022 08:54:57 +0000 Subject: [PATCH] [installer/iam] add service address to config --- .../installer/cmd/testdata/render/aws-setup/output.golden | 7 ++++--- .../cmd/testdata/render/azure-setup/output.golden | 7 ++++--- .../testdata/render/custom-pull-repository/output.golden | 7 ++++--- .../cmd/testdata/render/customization/output.golden | 7 ++++--- .../cmd/testdata/render/external-registry/output.golden | 7 ++++--- .../installer/cmd/testdata/render/gcp-setup/output.golden | 7 ++++--- .../installer/cmd/testdata/render/http-proxy/output.golden | 7 ++++--- .../installer/cmd/testdata/render/kind-meta/output.golden | 7 ++++--- .../cmd/testdata/render/kind-webapp/output.golden | 7 ++++--- .../installer/cmd/testdata/render/minimal/output.golden | 7 ++++--- .../installer/cmd/testdata/render/shortname/output.golden | 7 ++++--- .../render/statefulset-customization/output.golden | 7 ++++--- .../render/use-pod-security-policies/output.golden | 7 ++++--- .../cmd/testdata/render/vsxproxy-pvc/output.golden | 7 ++++--- .../render/workspace-requests-limits/output.golden | 7 ++++--- install/installer/pkg/components/iam/configmap.go | 4 ++++ 16 files changed, 64 insertions(+), 45 deletions(-) diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index cbca2fd9b0..558f7af704 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -2107,7 +2107,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3464,7 +3464,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -8735,7 +8736,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 5826c93b3d..9d5eab5d2c 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -2113,7 +2113,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3468,7 +3468,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -8686,7 +8687,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/custom-pull-repository/output.golden b/install/installer/cmd/testdata/render/custom-pull-repository/output.golden index 876320f87b..18645fe4bb 100644 --- a/install/installer/cmd/testdata/render/custom-pull-repository/output.golden +++ b/install/installer/cmd/testdata/render/custom-pull-repository/output.golden @@ -2266,7 +2266,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3775,7 +3775,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9406,7 +9407,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 07049a68e2..d160ff33b9 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -2546,7 +2546,7 @@ data: metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: 6c23f5fda26f7744c03f56515d6d5c8815df8861056ae46d07b95e01f9701648 + gitpod.io/checksum_config: 61b5a062503803fd7264c1d96f9217c4cd0336c204eb03cd0dafa9094b508258 hello: world creationTimestamp: null labels: @@ -4328,7 +4328,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -10186,7 +10187,7 @@ kind: Deployment metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: 6c23f5fda26f7744c03f56515d6d5c8815df8861056ae46d07b95e01f9701648 + gitpod.io/checksum_config: 61b5a062503803fd7264c1d96f9217c4cd0336c204eb03cd0dafa9094b508258 hello: world creationTimestamp: null labels: diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index 5526b991d4..d39bcf0081 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -2160,7 +2160,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3609,7 +3609,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9126,7 +9127,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index e70c92fd6b..29277d4363 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -2091,7 +2091,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3439,7 +3439,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -8742,7 +8743,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index 44a52ca2ec..b83c6e71d7 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -2269,7 +2269,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3778,7 +3778,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -10091,7 +10092,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/kind-meta/output.golden b/install/installer/cmd/testdata/render/kind-meta/output.golden index 9ccaeeeea2..c8a3fc3d7a 100644 --- a/install/installer/cmd/testdata/render/kind-meta/output.golden +++ b/install/installer/cmd/testdata/render/kind-meta/output.golden @@ -1813,7 +1813,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -2746,7 +2746,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -6722,7 +6723,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/kind-webapp/output.golden b/install/installer/cmd/testdata/render/kind-webapp/output.golden index 899aea3f34..337bd7271a 100644 --- a/install/installer/cmd/testdata/render/kind-webapp/output.golden +++ b/install/installer/cmd/testdata/render/kind-webapp/output.golden @@ -1192,7 +1192,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -2125,7 +2125,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -3983,7 +3984,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 5bd31890ca..a6a73b4e01 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -2266,7 +2266,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3775,7 +3775,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9406,7 +9407,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden index 5f6066fdb2..f4e7284c32 100644 --- a/install/installer/cmd/testdata/render/shortname/output.golden +++ b/install/installer/cmd/testdata/render/shortname/output.golden @@ -2266,7 +2266,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3775,7 +3775,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9406,7 +9407,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 7030a6d26f..d1b486b5a8 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -2278,7 +2278,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3787,7 +3787,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9418,7 +9419,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index bea97f6ef1..a8428c4923 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -2554,7 +2554,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -4108,7 +4108,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9850,7 +9851,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden index 54aeeba496..613e8e0fc8 100644 --- a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden +++ b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden @@ -2268,7 +2268,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3777,7 +3777,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9396,7 +9397,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index 9c1b1d11ff..52fb1d628d 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -2269,7 +2269,7 @@ data: kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod @@ -3778,7 +3778,8 @@ data: } } }, - "databaseConfigPath": "/secrets/database-config" + "databaseConfigPath": "/secrets/database-config", + "sessionServiceAddress": "server.default.svc.cluster.local:9876" } kind: ConfigMap metadata: @@ -9409,7 +9410,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b + gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a creationTimestamp: null labels: app: gitpod diff --git a/install/installer/pkg/components/iam/configmap.go b/install/installer/pkg/components/iam/configmap.go index b32b3155bf..d2e0d35b19 100644 --- a/install/installer/pkg/components/iam/configmap.go +++ b/install/installer/pkg/components/iam/configmap.go @@ -6,6 +6,8 @@ package iam import ( "fmt" + "net" + "strconv" "github.com/gitpod-io/gitpod/common-go/baseserver" "github.com/gitpod-io/gitpod/iam/pkg/config" @@ -37,6 +39,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { }, }, + SessionServiceAddress: net.JoinHostPort(fmt.Sprintf("%s.%s.svc.cluster.local", common.ServerComponent, ctx.Namespace), strconv.Itoa(common.ServerIAMSessionPort)), + DatabaseConfigPath: databaseSecretMountPath, }