Fixed issues

equinor · Oct 11, 2024 · 555598c · 555598c
1 parent 8c90c45
commit 555598c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/charts/radix-operator/values.yaml b/charts/radix-operator/values.yaml
@@ -126,7 +126,7 @@ ingress:
         nginx.org/lb-method: random
 
 task:
-  orphanedEnvironmentsRetentionPeriod: 24h
+  orphanedEnvironmentsRetentionPeriod: 720h
   orphanedEnvironmentsCleanupCron: "0 0 * * *"
 nodeSelector: {}
 

diff --git a/pkg/apis/kube/radix_environment.go b/pkg/apis/kube/radix_environment.go
@@ -31,16 +31,6 @@ func (kubeutil *Kube) GetEnvironment(ctx context.Context, name string) (*radixv1
 	return environment, nil
 }
 
-// ListEnvironmentsWithSelector Gets lists environments with label selector
-func (kubeutil *Kube) ListEnvironmentsWithSelector(ctx context.Context, labelSelectorString string) ([]*radixv1.RadixEnvironment, error) {
-	listOptions := metav1.ListOptions{LabelSelector: labelSelectorString}
-	list, err := kubeutil.radixclient.RadixV1().RadixEnvironments().List(ctx, listOptions)
-	if err != nil {
-		return nil, err
-	}
-	return slice.PointersOf(list.Items).([]*radixv1.RadixEnvironment), nil
-}
-
 // ListEnvironments lists environments from cache if lister is present
 func (kubeutil *Kube) ListEnvironments(ctx context.Context) ([]*radixv1.RadixEnvironment, error) {
 	var environments []*radixv1.RadixEnvironment

diff --git a/pkg/apis/radix/v1/radixenvironmenttypes.go b/pkg/apis/radix/v1/radixenvironmenttypes.go
@@ -10,32 +10,32 @@ import (
 
 // RadixEnvironment is a Custom Resource Definition
 type RadixEnvironment struct {
-	metav1.TypeMeta   `json:",inline" yaml:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Spec              RadixEnvironmentSpec   `json:"spec" yaml:"spec"`
-	Status            RadixEnvironmentStatus `json:"status" yaml:"status"`
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              RadixEnvironmentSpec   `json:"spec"`
+	Status            RadixEnvironmentStatus `json:"status"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // RadixEnvironmentList is a list of REs
 type RadixEnvironmentList struct {
-	metav1.TypeMeta `json:",inline" yaml:",inline"`
-	metav1.ListMeta `json:"metadata" yaml:"metadata"`
-	Items           []RadixEnvironment `json:"items" yaml:"items"`
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []RadixEnvironment `json:"items"`
 }
 
 // RadixEnvironmentSpec is the spec for an RE
 type RadixEnvironmentSpec struct {
-	AppName string       `json:"appName" yaml:"appName"`
-	EnvName string       `json:"envName" yaml:"envName"`
-	Egress  EgressConfig `json:"egress,omitempty" yaml:"egress,omitempty"`
+	AppName string       `json:"appName"`
+	EnvName string       `json:"envName"`
+	Egress  EgressConfig `json:"egress,omitempty"`
 }
 
 // RadixEnvironmentStatus is the status for an RE
 type RadixEnvironmentStatus struct {
-	Reconciled metav1.Time `json:"reconciled" yaml:"reconciled"`
-	Orphaned   bool        `json:"orphaned" yaml:"orphaned"`
+	Reconciled metav1.Time `json:"reconciled"`
+	Orphaned   bool        `json:"orphaned"`
 	// OrphanedTimestamp is a timestamp representing the server time when this RadixEnvironment was removed from the RadixApplication
-	OrphanedTimestamp *metav1.Time `json:"orphanedTimestamp" yaml:"orphanedTimestamp"`
+	OrphanedTimestamp *metav1.Time `json:"orphanedTimestamp,omitempty"`
 }