refactor(kube-api-rewriter): rewrite owner refs

images/kube-api-proxy/pkg/rewriter/rule_rewriter.go

@@ -126,7 +126,6 @@ func (rw *RuleBasedRewriter) rewriteFieldSelector(rawQuery string) string {
 func (rw *RuleBasedRewriter) RewriteJSONPayload(targetReq *TargetRequest, obj []byte, action Action) ([]byte, error) {
 	// Detect Kind
 	kind := gjson.GetBytes(obj, "kind").String()
-
 	var rwrBytes []byte
 	var err error
 
@@ -176,7 +175,7 @@ func (rw *RuleBasedRewriter) RewriteJSONPayload(targetReq *TargetRequest, obj []
 		rwrBytes, err = RewriteRoleOrList(rw.Rules, obj, action)
 
 	default:
-		if targetReq.IsCore() {
+		if targetReq.IsCore() || mustRewriteResource(kind) {
 			rwrBytes, err = RewriteOwnerReferences(rw.Rules, obj, action)
 		} else {
 			rwrBytes, err = RewriteCustomResourceOrList(rw.Rules, obj, action)
@@ -206,3 +205,13 @@ func (rw *RuleBasedRewriter) RewritePatch(targetReq *TargetRequest, obj []byte)
 
 	return obj, nil
 }
+
+func mustRewriteResource(kind string) bool {
+	switch kind {
+	case "PodDisruptionBudget", "PodDisruptionBudgetList",
+		"ControllerRevision", "ControllerRevisionList":
+		return true
+	}
+
+	return false
+}

images/kube-api-proxy/pkg/rewriter/target_request.go

@@ -113,6 +113,7 @@ func (tr *TargetRequest) RawQuery() string {
 // ShouldRewriteRequest returns true if incoming payload should
 // be rewritten.
 func (tr *TargetRequest) ShouldRewriteRequest() bool {
+
 	// Consider known webhook should be rewritten. Unknown paths will be passed as-is.
 	if tr.webhookRule != nil {
 		return true
@@ -126,28 +127,12 @@ func (tr *TargetRequest) ShouldRewriteRequest() bool {
 		if tr.targetEndpoint == nil {
 			// Pass resources without rules as is, except some special types.
 
-			if tr.originEndpoint.IsCore {
-				switch tr.originEndpoint.ResourceType {
-				case "pods":
-					return true
-				}
-			}
-
-			switch tr.originEndpoint.ResourceType {
-			case "mutatingwebhookconfigurations",
-				"validatingwebhookconfigurations",
-				"clusterroles",
-				"roles":
-				return true
-			}
-
 			// Rewrite request body when creating CRD.
 			if tr.originEndpoint.ResourceType == "customresourcedefinitions" && tr.originEndpoint.Name == "" {
 				return true
 			}
 
-			// Should not rewrite request if path is not rewritten.
-			return false
+			return shouldRewriteResource(tr.originEndpoint.ResourceType, tr.originEndpoint.IsCore)
 		}
 	}
 
@@ -171,16 +156,6 @@ func (tr *TargetRequest) ShouldRewriteResponse() bool {
 		return false
 	}
 
-	// Some core resources should be rewritten.
-	if tr.originEndpoint.IsCore {
-		switch tr.originEndpoint.ResourceType {
-		case "pods":
-			return true
-			// pods should be rewritten
-		}
-		return false
-	}
-
 	if tr.originEndpoint.IsCRD {
 		// Rewrite CRD List.
 		if tr.originEndpoint.Name == "" {
@@ -203,16 +178,7 @@ func (tr *TargetRequest) ShouldRewriteResponse() bool {
 		return true
 	}
 
-	// Rewrite special resources.
-	switch tr.originEndpoint.ResourceType {
-	// Webhook configurations should be rewritten.
-	case "mutatingwebhookconfigurations",
-		"validatingwebhookconfigurations",
-		"clusterroles":
-		return true
-	}
-
-	return false
+	return shouldRewriteResource(tr.originEndpoint.ResourceType, tr.originEndpoint.IsCore)
 }
 
 func (tr *TargetRequest) ResourceForLog() string {
@@ -276,3 +242,38 @@ func (tr *TargetRequest) ResourceForLog() string {
 
 	return "UNKNOWN"
 }
+
+func shouldRewriteResource(kind string, isCore bool) bool {
+	// Some core resources should be rewritten.
+	if isCore {
+		switch kind {
+		case "pods",
+			"configmaps",
+			"secrets",
+			"services",
+			"serviceaccounts":
+
+			return true
+		}
+		return false
+	}
+
+	// Rewrite special resources.
+	switch kind {
+	case "mutatingwebhookconfigurations",
+		"validatingwebhookconfigurations",
+		"clusterroles",
+		"roles",
+		"rolebindings",
+		"clusterrolebindings",
+		"deployments",
+		"statefulsets",
+		"daemonsets",
+		"poddisruptionbudgets",
+		"controllerrevisions":
+
+		return true
+	}
+
+	return false
+}