Skip to content
Open
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
6 changes: 6 additions & 0 deletions apis/installer/v1alpha1/ace_ace_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ type AceSpec struct {
KubedbUi AceKubedbUi `json:"kubedb-ui"`
PlatformApi AcePlatformApi `json:"platform-api"`
IngressNginx AceIngressNginx `json:"ingress-nginx"`
Gateway AceGateway `json:"gateway"`
IngressDns AceIngressDns `json:"ingress-dns"`
Nats AceNats `json:"nats"`
NatsDns AceNatsDns `json:"nats-dns"`
Expand Down Expand Up @@ -137,6 +138,11 @@ type AceIngressNginx struct {
*IngressNginxSpec `json:",inline,omitempty"`
}

type AceGateway struct {
Enabled bool `json:"enabled"`
*GatewaySpec `json:",inline,omitempty"`
}

type AceIngressDns struct {
Enabled bool `json:"enabled"`
Spec *dnsapi.ExternalDNSSpec `json:"spec,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/ace_inbox_ui_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ type InboxUiSpec struct {
// +optional
Affinity *core.Affinity `json:"affinity"`
Ingress PlatformIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
// +optional
Distro shared.DistroSpec `json:"distro"`
}
Expand Down
6 changes: 6 additions & 0 deletions apis/installer/v1alpha1/ace_options_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type AceOptionsSpec struct {
KubedbUi AceOptionsComponentSpec `json:"kubedb-ui"`
PlatformApi AceOptionsComponentSpec `json:"platform-api"`
Ingress AceOptionsIngressNginx `json:"ingress"`
Gateway AceOptionsGateway `json:"gateway"`
Nats AceOptionsNatsSettings `json:"nats"`
Trickster AceOptionsComponentSpec `json:"trickster"`
Openfga AceOptionsComponentSpec `json:"openfga"`
Expand Down Expand Up @@ -186,6 +187,7 @@ const (
)

type AceOptionsIngressNginx struct {
Enabled bool `json:"enabled"`
Annotations map[string]string `json:"annotations,omitempty"`
ExposeVia ServiceType `json:"exposeVia"`
// DNS record types that will be considered for management
Expand All @@ -197,6 +199,10 @@ type AceOptionsIngressNginx struct {
ExternalIPs []string `json:"externalIPs"`
}

type AceOptionsGateway struct {
Enabled bool `json:"enabled"`
}

// +kubebuilder:validation:Enum=Ingress;HostPort
type ExposeNatsVia string

Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/ace_service_backend_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ type ServiceBackendSpec struct {
Volumes []core.Volume `json:"volumes"`
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
Ingress PlatformIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
Monitoring Monitoring `json:"monitoring"`
Server ServerConfig `json:"server"`
// +optional
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/dns_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type DnsProxySpec struct {
Affinity *core.Affinity `json:"affinity"`
Monitoring CustomMonitoring `json:"monitoring"`
Ingress AppIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
Cloudflare CloudflareTokenReference `json:"cloudflare"`
Auth DNSProxyAuth `json:"auth"`
TLSSecretRef LocalObjectReference `json:"tlsSecretRef"`
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/gh_ci_webhook_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ type GhCiWebhookSpec struct {
// +optional
Affinity *core.Affinity `json:"affinity"`
Ingress AppIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
Volumes []core.Volume `json:"volumes"`
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
Args []string `json:"args"`
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/minio.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ type MinioSpec struct {
Persistence PersistenceSpec `json:"persistence"`
StorageClass LocalObjectReference `json:"storageClass"`
Ingress MinioIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
Minio MinioConfig `json:"minio"`
// +optional
Distro shared.DistroSpec `json:"distro"`
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/offline_license_server_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ type OfflineLicenseServerSpec struct {
// +optional
Affinity *core.Affinity `json:"affinity"`
Ingress AppIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
Volumes []core.Volume `json:"volumes"`
VolumeMounts []core.VolumeMount `json:"volumeMounts"`
Args []string `json:"args"`
Expand Down
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/s3proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ type S3proxySpec struct {
Persistence PersistenceSpec `json:"persistence"`
StorageClass LocalObjectReference `json:"storageClass"`
Ingress S3proxyIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
S3proxy S3proxyConfig `json:"s3proxy"`
// +optional
Distro shared.DistroSpec `json:"distro"`
Expand Down
46 changes: 46 additions & 0 deletions apis/installer/v1alpha1/shared_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
Copyright AppsCode Inc. and Contributors

Licensed under the AppsCode Community License 1.0.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://github.com/appscode/licenses/raw/1.0.0/AppsCode-Community-1.0.0.md

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1

import gwapi "sigs.k8s.io/gateway-api/apis/v1"

type AppGateway struct {
Enabled bool `json:"enabled"`
*GatewaySpec `json:",inline,omitempty"`
Hosts []GatewayHost `json:"hosts"`
}

type GatewaySpec struct {
Annotations map[string]string `json:"annotations,omitempty"`
GatewayClassName string `json:"gatewayClassName"`
TLS *GatewayTLS `json:"tls"`
}

type GatewayTLS struct {
Enabled bool `json:"enabled"`
Secret *LocalObjectReference `json:"secret"`
}

type GatewayHost struct {
Host string `json:"host"`
Paths GatewayPath `json:"paths"`
}

type GatewayPath struct {
Path string `json:"path"`
PathType gwapi.PathMatchType `json:"pathType,omitempty"`
}
1 change: 1 addition & 0 deletions apis/installer/v1alpha1/smtprelay_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ type SmtprelaySpec struct {
Affinity *core.Affinity `json:"affinity"`
Monitoring Monitoring `json:"monitoring"`
Ingress AppIngress `json:"ingress"`
Gateway AppGateway `json:"gateway"`
LogLevel string `json:"logLevel"`
Smtp SMTPConfig `json:"smtp"`
// +optional
Expand Down
Loading
Loading