Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove authz proxy feature #14

Merged
merged 1 commit into from
Sep 10, 2024
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
5 changes: 2 additions & 3 deletions apis/ui/v1alpha1/dbgate_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@ type DbgateSpec struct {
Autoscaling Autoscaling `json:"autoscaling"`
App DBRef `json:"app"`
Bind ObjectRef `json:"bind"`
Authzproxy AuthzproxySpec `json:"authzproxy"`
}

type DBRef struct {
AppRef `json:",inline"`
Kind string `json:"kind"`
SecureAppRef `json:",inline"`
Kind string `json:"kind"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
7 changes: 3 additions & 4 deletions apis/ui/v1alpha1/mongo_ui_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,16 @@ type MongoUiSpec struct {
TargetPendingRequests int `json:"targetPendingRequests"`
Autoscaling Autoscaling `json:"autoscaling"`
App MongoRef `json:"app"`
TLS MongoUiTLS `json:"tls"`
Bind ObjectRef `json:"bind"`
Authzproxy AuthzproxySpec `json:"authzproxy"`
}

type MongoRef struct {
AppRef `json:",inline"`
Url string `json:"url"`
Url string `json:"url"`
TLS MongoClientTLS `json:"tls"`
}

type MongoUiTLS struct {
type MongoClientTLS struct {
Enabled bool `json:"enabled"`
SecretName string `json:"secretName"`
}
Expand Down
1 change: 0 additions & 1 deletion apis/ui/v1alpha1/pgadmin_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ type PgadminSpec struct {
Autoscaling Autoscaling `json:"autoscaling"`
App AppRef `json:"app"`
Bind ObjectRef `json:"bind"`
Authzproxy AuthzproxySpec `json:"authzproxy"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
3 changes: 1 addition & 2 deletions apis/ui/v1alpha1/phpmyadmin.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ type PhpmyadminSpec struct {
Keda KedaSpec `json:"keda"`
TargetPendingRequests int `json:"targetPendingRequests"`
Autoscaling Autoscaling `json:"autoscaling"`
App AppRef `json:"app"`
App SecureAppRef `json:"app"`
Bind ObjectRef `json:"bind"`
Authzproxy AuthzproxySpec `json:"authzproxy"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
21 changes: 4 additions & 17 deletions apis/ui/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ limitations under the License.

package v1alpha1

import core "k8s.io/api/core/v1"

type ImageRef struct {
Repository string `json:"repository"`
PullPolicy string `json:"pullPolicy"`
Expand Down Expand Up @@ -79,23 +77,12 @@ type ReplicaRange struct {
type AppRef struct {
Service ObjectRef `json:"service"`
AuthSecret LocalObjectRef `json:"authSecret"`
TLS TLS `json:"tls"`
}

type AuthzproxySpec struct {
Enabled bool `json:"enabled"`
Repository string `json:"repository"`
Tag string `json:"tag"`
SecurityContext *core.SecurityContext `json:"securityContext"`
Resources core.ResourceRequirements `json:"resources"`
Params AuthzproxyParams `json:"params"`
}

type AuthzproxyParams struct {
Listen int `json:"listen"`
MetricsAddr int `json:"metricsAddr"`
PlatformURL string `json:"platformURL"`
PlatformCABundle string `json:"platformCABundle"`
type SecureAppRef struct {
Service ObjectRef `json:"service"`
AuthSecret LocalObjectRef `json:"authSecret"`
TLS TLS `json:"tls"`
}

type TLS struct {
Expand Down
99 changes: 37 additions & 62 deletions apis/ui/v1alpha1/zz_generated.deepcopy.go

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

Loading
Loading