Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.
Merged
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
7 changes: 0 additions & 7 deletions deploy/charts/rig-platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@ rig:
devMode: false
level: info

environments:
{}
# prod:
# cluster: prod
# namespace_template: "{{ .Project.Name }}"
# default: true

clusters:
{}
# prod:
Expand Down
17 changes: 0 additions & 17 deletions docs/docs/api/config/v1alpha1.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,22 +282,6 @@ _Appears in:_



### Environment



Environment configuration of a single environment.

_Appears in:_
- [PlatformConfig](#platformconfig)

| Field | Description |
| --- | --- |
| `cluster` _string_ | Cluster name the environment is hosted in. |
| `namespace_template` _string_ | NamespaceTemplate is used to generate the namespace name when configuring resources. Default is to set the namespace equal to the project name. |
| `default` _boolean_ | Default is true if this environment should be preferred for per-environment operations. |


### GitAuthor


Expand Down Expand Up @@ -499,7 +483,6 @@ PlatformConfig is the Schema for the platform config API
| `email` _[Email](#email)_ | Email holds configuration for sending emails. Either using mailjet or using SMTP |
| `logging` _[Logging](#logging)_ | Logging holds information about the granularity of logging |
| `clusters` _object (keys:string, values:[Cluster](#cluster))_ | Clusters the platform has access to. |
| `environments` _object (keys:string, values:[Environment](#environment))_ | Environments of the platform. Each environment is backed by a cluster (allowing multi-tenant setups). |
| `notification` _[Notification](#notification)_ | Notification configuration of the platform. This is backed by notification clients in the client configuratino. Currently supported clients: Slack |


Expand Down
4 changes: 3 additions & 1 deletion docs/docs/api/platform-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -4590,7 +4590,8 @@ Environment model.
| cluster_id | [string](#string) | | ID of the backing cluster. |
| namespace_template | [string](#string) | | Namespace template is used to generate the namespace name when configuring resources. Default is to set the namespace equal to the project name. |
| ephemeral | [bool](#bool) | | If true, the environment is deletable by developer users, and can be deleted with capsules running. |
| active_projects | [string](#string) | repeated | Active Projects. If this is set, only capsules in these projects can be deployed to this environment. |
| active_projects | [string](#string) | repeated | Active Projects. These projects can deploy capsules to this environment. This is overridden by a true the global flag. |
| global | [bool](#bool) | | If true, the environment is available to all projects. |



Expand All @@ -4607,6 +4608,7 @@ Environment model.
| ----- | ---- | ----- | ----------- |
| add_project | [string](#string) | | |
| remove_project | [string](#string) | | |
| set_global | [bool](#bool) | | |



Expand Down
16 changes: 0 additions & 16 deletions pkg/api/config/v1alpha1/platform_config_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ type PlatformConfig struct {
// Clusters the platform has access to.
Clusters map[string]Cluster `json:"clusters,omitempty"`

// Environments of the platform. Each environment is backed by a cluster (allowing multi-tenant setups).
Environments map[string]Environment `json:"environments,omitempty"`

// Notification configuration of the platform. This is backed by notification clients in the client configuratino.
// Currently supported clients: Slack
Notification Notification `json:"notification,omitempty"`
Expand Down Expand Up @@ -284,19 +281,6 @@ type Cluster struct {
CreatePullSecrets *bool `json:"createPullSecrets,omitempty"`
}

// Environment configuration of a single environment.
type Environment struct {
// Cluster name the environment is hosted in.
Cluster string `json:"cluster,omitempty"`

// NamespaceTemplate is used to generate the namespace name when configuring resources.
// Default is to set the namespace equal to the project name.
NamespaceTemplate string `json:"namespace_template,omitempty"`

// Default is true if this environment should be preferred for per-environment operations.
Default bool `json:"default,omitempty"`
}

// ClusterGit specifies configuration for git integration. This can be used to
// tie rig into a gitops setup.
type ClusterGit struct {
Expand Down
22 changes: 0 additions & 22 deletions pkg/api/config/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions proto/rig/api/v1/environment/environment.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ message Update {
oneof field {
string add_project = 2;
string remove_project = 3;
bool set_global = 4;
}
}
// Environment model.
Expand All @@ -22,7 +23,9 @@ message Environment {
// If true, the environment is deletable by developer users, and can be
// deleted with capsules running.
bool ephemeral = 6;
// Active Projects. If this is set, only capsules in these projects can be
// deployed to this environment.
// Active Projects. These projects can deploy capsules to this environment.
// This is overridden by a true the global flag.
repeated string active_projects = 7;
// If true, the environment is available to all projects.
bool global = 8;
}