archive-gh-me/gitpod
1
0
Fork 0
mirror of https://github.com/gitpod-io/gitpod.git synced 2025-12-08 17:36:30 +00:00
Code Issues Projects Releases Wiki Activity

[installer/iam] add service address to config

Browse Source
This commit is contained in:
Alex Tugarev 2022-12-28 08:54:57 +00:00 committed by Robo Quat
parent 29fd9a925a
commit 3cfa8bfea5
16 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install/installer/cmd/testdata/render/aws-setup/output.golden vendored
View File

@ -2107,7 +2107,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3464,7 +3464,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -8735,7 +8736,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/azure-setup/output.golden vendored
View File

@ -2113,7 +2113,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3468,7 +3468,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -8686,7 +8687,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/custom-pull-repository/output.golden vendored
View File

@ -2266,7 +2266,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3775,7 +3775,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9406,7 +9407,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/customization/output.golden vendored
View File

@ -2546,7 +2546,7 @@ data:
metadata: metadata:
annotations: annotations:
gitpod.io: hello gitpod.io: hello
gitpod.io/checksum_config: 6c23f5fda26f7744c03f56515d6d5c8815df8861056ae46d07b95e01f9701648 gitpod.io/checksum_config: 61b5a062503803fd7264c1d96f9217c4cd0336c204eb03cd0dafa9094b508258
hello: world hello: world
creationTimestamp: null creationTimestamp: null
labels: labels:
@ -4328,7 +4328,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -10186,7 +10187,7 @@ kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io: hello gitpod.io: hello
gitpod.io/checksum_config: 6c23f5fda26f7744c03f56515d6d5c8815df8861056ae46d07b95e01f9701648 gitpod.io/checksum_config: 61b5a062503803fd7264c1d96f9217c4cd0336c204eb03cd0dafa9094b508258
hello: world hello: world
creationTimestamp: null creationTimestamp: null
labels: labels:

7
install/installer/cmd/testdata/render/external-registry/output.golden vendored
View File

@ -2160,7 +2160,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3609,7 +3609,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9126,7 +9127,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/gcp-setup/output.golden vendored
View File

@ -2091,7 +2091,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3439,7 +3439,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -8742,7 +8743,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/http-proxy/output.golden vendored
View File

@ -2269,7 +2269,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3778,7 +3778,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -10091,7 +10092,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/kind-meta/output.golden vendored
View File

@ -1813,7 +1813,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -2746,7 +2746,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -6722,7 +6723,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/kind-webapp/output.golden vendored
View File

@ -1192,7 +1192,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -2125,7 +2125,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -3983,7 +3984,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/minimal/output.golden vendored
View File

@ -2266,7 +2266,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3775,7 +3775,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9406,7 +9407,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/shortname/output.golden vendored
View File

@ -2266,7 +2266,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3775,7 +3775,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9406,7 +9407,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/statefulset-customization/output.golden vendored
View File

@ -2278,7 +2278,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3787,7 +3787,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9418,7 +9419,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/use-pod-security-policies/output.golden vendored
View File

@ -2554,7 +2554,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -4108,7 +4108,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9850,7 +9851,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden vendored
View File

@ -2268,7 +2268,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3777,7 +3777,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9396,7 +9397,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

7
install/installer/cmd/testdata/render/workspace-requests-limits/output.golden vendored
View File

@ -2269,7 +2269,7 @@ data:
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod
@ -3778,7 +3778,8 @@ data:
} }
} }
}, },
"databaseConfigPath": "/secrets/database-config" "databaseConfigPath": "/secrets/database-config",
"sessionServiceAddress": "server.default.svc.cluster.local:9876"
} }
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -9409,7 +9410,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
gitpod.io/checksum_config: 7346723d23891c253f282241ed24e225e16dd2ddafa9b7c90d1da928a4923f4b gitpod.io/checksum_config: 350c5081ae3f30253f80d07e0adfd8d82f0d8b416858b42d61fec05c2d1d246a
creationTimestamp: null creationTimestamp: null
labels: labels:
app: gitpod app: gitpod

4
install/installer/pkg/components/iam/configmap.go
View File

@ -6,6 +6,8 @@ package iam
import ( import (
"fmt" "fmt"
"net"
"strconv"
"github.com/gitpod-io/gitpod/common-go/baseserver" "github.com/gitpod-io/gitpod/common-go/baseserver"
"github.com/gitpod-io/gitpod/iam/pkg/config" "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, DatabaseConfigPath: databaseSecretMountPath,
} }