Merge pull request #6 from oliveiraxavier/fix/edit-configmap-and-prefix

Edit configmap name and prefix name

Author: oliveiraxavier

Makefile

@@ -1,5 +1,5 @@
 # Image URL to use all building/pushing image targets
-APP_VERSION ?=1.0.0
+APP_VERSION ?=1.0.1
 IMG ?= oxmarcos/trashed-resources-controller:${APP_VERSION}
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

README.md

@@ -54,8 +54,8 @@ trashedresource name is composed of the "trashed-action + resource type + resour
 1 - With curl
 
 ```sh
-curl https://raw.githubusercontent.com/oliveiraxavier/trashed-resources-k8s-crd/1.0.0/kubectl-trashedresources \
-    -o ~/.local/bin/kubectl-trashedresources
+curl https://raw.githubusercontent.com/oliveiraxavier/trashed-resources-k8s-crd/1.0.0/bin/kubectl-trashedresources \
+  -O --output-dir  ~/.local/bin
 ```
 
 - Add it to your path if necessary
@@ -79,19 +79,19 @@ echo export PATH=$PATH:$(pwd)/bin >> ~/.zshrc
 
 ```sh
 # For trashed-resource named trashed-deleted-deployment-nginx-deployment-20260301-230159
-kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159
+kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --namespace default
 
 # For trashed-resource named trashed-deleted-deployment-nginx-deployment-20260301-230159  and age older than 12 minutes
-kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 12m
+kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 12m --namespace default
 
 # For trashed-resource named trashed-deleted-deployment-nginx-deployment-20260301-230159  and age older than 1 hour
-kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 1h
+kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 1h --namespace default
 
 # For trashed-resource named trashed-deleted-deployment-nginx-deployment-20260301-230159  and age older than 1 day
-kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 1d
+kubectl trashedresources prune --name trashed-deleted-deployment-nginx-deployment-20260301-230159 --older-than 1d --namespace default
 
 # For all trashed-resources in the cluster with age older than 1 day
-kubectl trashedresources prune --older-than 1d
+kubectl trashedresources prune --older-than 1d --namespace default
 ```
 
 ## Getting Started to contribute or test/install from source

cmd/kubectl-trashedresources/main.go

@@ -196,15 +196,26 @@ func restoreResource(c client.Client, name, namespace string) error {
 	err = c.Create(ctx, restoredObject)
 	if err != nil {
 		if errors.IsAlreadyExists(err) {
-			return fmt.Errorf("resource %s %s/%s already exists", restoredObject.GetKind(), restoredObject.GetNamespace(), restoredObject.GetName())
+			return fmt.Errorf("resource %s %s/%s already exists",
+				restoredObject.GetKind(),
+				restoredObject.GetNamespace(),
+				restoredObject.GetName(),
+			)
 		}
 		return fmt.Errorf("failed to create restored resource: %v", err)
 	}
 
-	fmt.Printf("Success! Resource %s %s/%s restored.\n", restoredObject.GetKind(), restoredObject.GetNamespace(), restoredObject.GetName())
+	fmt.Printf("Success! Resource %s %s/%s restored.\n",
+		restoredObject.GetKind(),
+		restoredObject.GetNamespace(),
+		restoredObject.GetName())
 	err = c.Delete(ctx, trashed, client.PropagationPolicy(metav1.DeletePropagationBackground))
 	if err != nil {
-		fmt.Printf("Warning: failed to delete TrashedResource %s/%s: %v. You should manually delete it\n", namespace, name, err)
+		fmt.Printf("Warning: failed to delete TrashedResource %s/%s: %v. You should manually delete it\n",
+			namespace,
+			name,
+			err,
+		)
 	}
 	return nil
 }

config/default/kustomization.yaml

@@ -6,6 +6,8 @@ namespace: trashed-resources-system
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
+# If you change this name, change in controller
+# cmName = "trashed-resources-config"
 namePrefix: trashed-resources-
 
 # Labels to add to all resources and selectors.

config/default/metrics_service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
     app.kubernetes.io/name: trashed-resources
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
@@ -14,5 +14,5 @@ spec:
     protocol: TCP
     targetPort: 8443
   selector:
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
     app.kubernetes.io/name: trashed-resources

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: oxmarcos/trashed-resources-controller
-  newTag: 1.0.0
+  newTag: 1.0.1

config/manager/manager.yaml

@@ -2,15 +2,20 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
     app.kubernetes.io/name: trashed-resources
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: trashedresources-config
+  # After run make build-installer this name will be trashed-resources-config
+  # because namePrefix: trashed-resources
+  # If you change this name, change in controller
+  # cmName = "trashed-resources-config"
+  name: config
+  # If you change this namespace, change in code too
   namespace: trashed-resources-system
 data:
   namespacesToIgnore: istio-system; kube-node-lease; kube-public; kube-system
@@ -26,21 +31,21 @@ metadata:
   name: controller-manager
   namespace: trashed-resources-system
   labels:
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
     app.kubernetes.io/name: trashed-resources
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: trashed-resources-controller-manager
       app.kubernetes.io/name: trashed-resources
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: trashed-resources-controller-manager
         app.kubernetes.io/name: trashed-resources
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
@@ -76,8 +81,14 @@ spec:
         args:
           - --leader-elect
           - --health-probe-bind-address=:8081
+        envFrom:
+        - configMapRef:
+            name: trashed-resources-config
         image: controller:latest
+        imagePullPolicy: IfNotPresent
         name: manager
+        stdin: true
+        tty: true
         ports: []
         securityContext:
           allowPrivilegeEscalation: false

config/network-policy/allow-metrics-traffic.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: trashed-resources-controller-manager
       app.kubernetes.io/name: trashed-resources
   policyTypes:
     - Ingress

config/prometheus/monitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
     app.kubernetes.io/name: trashed-resources
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-monitor
@@ -23,5 +23,5 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: trashed-resources-controller-manager
       app.kubernetes.io/name: trashed-resources

dist/install.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: trashed-resources
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
   name: trashed-resources-system
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -320,7 +320,7 @@ data:
   namespacesToIgnore: istio-system; kube-node-lease; kube-public; kube-system
 kind: ConfigMap
 metadata:
-  name: trashed-resources-trashedresources-config
+  name: trashed-resources-config
   namespace: trashed-resources-system
 ---
 apiVersion: v1
@@ -329,7 +329,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: trashed-resources
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
   name: trashed-resources-controller-manager-metrics-service
   namespace: trashed-resources-system
 spec:
@@ -340,30 +340,30 @@ spec:
     targetPort: 8443
   selector:
     app.kubernetes.io/name: trashed-resources
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: trashed-resources
-    control-plane: controller-manager
+    control-plane: trashed-resources-controller-manager
   name: trashed-resources-controller-manager
   namespace: trashed-resources-system
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: trashed-resources
-      control-plane: controller-manager
+      control-plane: trashed-resources-controller-manager
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
         app.kubernetes.io/name: trashed-resources
-        control-plane: controller-manager
+        control-plane: trashed-resources-controller-manager
     spec:
       containers:
       - args:
@@ -372,7 +372,11 @@ spec:
         - --health-probe-bind-address=:8081
         command:
         - /manager
-        image: oxmarcos/trashed-resources-controller:1.0.0
+        envFrom:
+        - configMapRef:
+            name: trashed-resources-config
+        image: oxmarcos/trashed-resources-controller:1.0.1
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
@@ -399,6 +403,8 @@ spec:
           capabilities:
             drop:
             - ALL
+        stdin: true
+        tty: true
         volumeMounts: []
       securityContext:
         runAsNonRoot: true