Remove authz proxy feature (#14)

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Sep 10, 2024 · 68da128 · 68da128
1 parent 9de312a
commit 68da128
Show file tree

Hide file tree

Showing 32 changed files with 303 additions and 1,804 deletions.
diff --git a/apis/ui/v1alpha1/dbgate_types.go b/apis/ui/v1alpha1/dbgate_types.go
@@ -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

diff --git a/apis/ui/v1alpha1/mongo_ui_types.go b/apis/ui/v1alpha1/mongo_ui_types.go
@@ -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"`
 }

diff --git a/apis/ui/v1alpha1/pgadmin_types.go b/apis/ui/v1alpha1/pgadmin_types.go
@@ -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

diff --git a/apis/ui/v1alpha1/phpmyadmin.go b/apis/ui/v1alpha1/phpmyadmin.go
@@ -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

diff --git a/apis/ui/v1alpha1/types.go b/apis/ui/v1alpha1/types.go
@@ -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"`
@@ -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 {

diff --git a/apis/ui/v1alpha1/zz_generated.deepcopy.go b/apis/ui/v1alpha1/zz_generated.deepcopy.go