Updated crds, added missing labels.

Author: Silvenga

manifests/generate-manifests.ps1

@@ -20,9 +20,9 @@ dotnet run --no-build --project $project -- generator crd -o $output\crd\
 # Remove-Item -Recurse $output\installer\ -ErrorAction Ignore
 # dotnet run --no-build --project $project -- generator installer -o $output\installer\
 
-Write-Host "Generating operator."
-Remove-Item -Recurse $output\operator\ -ErrorAction Ignore
-dotnet run --no-build --project $project -- generator operator -o $output\operator\
+# Write-Host "Generating operator."
+# Remove-Item -Recurse $output\operator\ -ErrorAction Ignore
+# dotnet run --no-build --project $project -- generator operator -o $output\operator\
 
 Write-Host "Generating rbac."
 Remove-Item -Recurse $output\rbac\ -ErrorAction Ignore

manifests/install/all/base/crd/agentconfigurations_agents_contrastsecurity_com.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: agentconfigurations.agents.contrastsecurity.com
+  labels:
+    app.kubernetes.io/part-of: contrast-agent-operator
 spec:
   group: agents.contrastsecurity.com
   names:
@@ -28,4 +30,4 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: true

manifests/install/all/base/crd/agentconnections_agents_contrastsecurity_com.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: agentconnections.agents.contrastsecurity.com
+  labels:
+    app.kubernetes.io/part-of: contrast-agent-operator
 spec:
   group: agents.contrastsecurity.com
   names:
@@ -82,4 +84,4 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: true

manifests/install/all/base/crd/agentinjectors_agents_contrastsecurity_com.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: agentinjectors.agents.contrastsecurity.com
+  labels:
+    app.kubernetes.io/part-of: contrast-agent-operator
 spec:
   group: agents.contrastsecurity.com
   names:
@@ -25,7 +27,7 @@ spec:
                 type: boolean
               version:
                 description: |-
-                  The version of the agent to inject. The literal 'latest' will inject the latest version detected.
+                  The version of the agent to inject. The literal 'latest' will inject the last version. Partial version matches are supported, e.g. '2' will select the version '2.1.0'.
                   Defaults to 'latest'.
                 nullable: true
                 pattern: ^(latest|(\d+(\.\d+){0,3}(-.+)?))$
@@ -41,7 +43,7 @@ spec:
                 properties:
                   registry:
                     description: |-
-                      The fully qualified name of the registry to pull agent images from. This registry must be accessible by the pods being injected.
+                      The fully qualified name of the registry to pull agent images from. This registry must be accessible by the pods being injected and the operator.
                       Defaults to the official Contrast container image registry.
                     nullable: true
                     type: string
@@ -52,7 +54,7 @@ spec:
                     nullable: true
                     type: string
                   pullSecretName:
-                    description: The name of a pull secret to append to the pod's imagePullSecrets.
+                    description: The name of a pull secret to append to the pod's imagePullSecrets list.
                     nullable: true
                     type: string
                   pullPolicy:
@@ -71,14 +73,14 @@ spec:
                   images:
                     description: |-
                       Container images to inject the agent into. Glob patterns are supported.
-                      Defaults to ['*'].
+                      Selects all containers in Pod.
                     items:
                       type: string
                     type: array
                   labels:
                     description: |-
-                      Deployment/StatefulSet/DaemonSet labels whose pods are eligible for agent injection.
-                      Defaults to selecting everything.
+                      Deployment/StatefulSet/DaemonSet/DeploymentConfig labels whose pods are eligible for agent injection.
+                      Selects all workloads in namespace.
                     items:
                       properties:
                         name:
@@ -113,7 +115,7 @@ spec:
                   name:
                     description: |-
                       The name of a AgentConfiguration resource. Must exist within the same namespace.
-                      Defaults a AgentConfiguration specified by a ClusterAgentConnection.
+                      Defaults a AgentConfiguration specified by a ClusterAgentConfiguration.
                     nullable: true
                     type: string
                 type: object
@@ -122,4 +124,4 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: true

manifests/install/all/base/crd/clusteragentconfigurations_agents_contrastsecurity_com.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusteragentconfigurations.agents.contrastsecurity.com
+  labels:
+    app.kubernetes.io/part-of: contrast-agent-operator
 spec:
   group: agents.contrastsecurity.com
   names:
@@ -45,8 +47,8 @@ spec:
                 type: object
               namespaces:
                 description: |-
-                  The namespaces to apply this AgentConfiguration template to. Splat syntax is supported.
-                  Optional, defaults to '*', selecting all namespaces.
+                  The namespaces to apply this AgentConfiguration template to. Glob syntax is supported.
+                  Optional, defaults to selecting all namespaces.
                 items:
                   type: string
                 type: array
@@ -55,4 +57,4 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: true

manifests/install/all/base/crd/clusteragentconnections_agents_contrastsecurity_com.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusteragentconnections.agents.contrastsecurity.com
+  labels:
+    app.kubernetes.io/part-of: contrast-agent-operator
 spec:
   group: agents.contrastsecurity.com
   names:
@@ -99,8 +101,8 @@ spec:
                 type: object
               namespaces:
                 description: |-
-                  The namespaces to apply this AgentConfiguration template to. Splat syntax is supported.
-                  Optional, defaults to '*', selecting all namespaces.
+                  The namespaces to apply this AgentConnection template to. Glob syntax is supported.
+                  Optional, defaults to selecting all namespaces.
                 items:
                   type: string
                 type: array
@@ -109,4 +111,4 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: true

src/Contrast.K8s.AgentOperator/Entities/V1Beta1AgentInjector.cs

@@ -21,7 +21,7 @@ public class AgentInjectorSpec
             public bool Enabled { get; set; } = true;
 
             /// <summary>
-            /// The version of the agent to inject. The literal 'latest' will inject the latest version detected.
+            /// The version of the agent to inject. The literal 'latest' will inject the last version. Partial version matches are supported, e.g. '2' will select the version '2.1.0'.
             /// Defaults to 'latest'.
             /// </summary>
             [Pattern(RegexConstants.InjectorVersionRegex)]
@@ -59,7 +59,7 @@ public class AgentInjectorSpec
         public class AgentInjectorImageSpec
         {
             /// <summary>
-            /// The fully qualified name of the registry to pull agent images from. This registry must be accessible by the pods being injected.
+            /// The fully qualified name of the registry to pull agent images from. This registry must be accessible by the pods being injected and the operator.
             /// Defaults to the official Contrast container image registry.
             /// </summary>
             public string? Registry { get; set; }
@@ -71,7 +71,7 @@ public class AgentInjectorImageSpec
             public string? Name { get; set; }
 
             /// <summary>
-            /// The name of a pull secret to append to the pod's imagePullSecrets.
+            /// The name of a pull secret to append to the pod's imagePullSecrets list.
             /// </summary>
             public string? PullSecretName { get; set; }
 
@@ -87,13 +87,13 @@ public class AgentInjectorSelectorSpec
         {
             /// <summary>
             /// Container images to inject the agent into. Glob patterns are supported.
-            /// Defaults to ['*'].
+            /// Selects all containers in Pod.
             /// </summary>
             public IReadOnlyCollection<string> Images { get; set; } = Array.Empty<string>();
 
             /// <summary>
-            /// Deployment/StatefulSet/DaemonSet labels whose pods are eligible for agent injection.
-            /// Defaults to selecting everything.
+            /// Deployment/StatefulSet/DaemonSet/DeploymentConfig labels whose pods are eligible for agent injection.
+            /// Selects all workloads in namespace.
             /// </summary>
             public IReadOnlyCollection<LabelSelectorSpec> Labels { get; set; } = Array.Empty<LabelSelectorSpec>();
         }
@@ -127,7 +127,7 @@ public class AgentInjectorConfigurationSpec
         {
             /// <summary>
             /// The name of a AgentConfiguration resource. Must exist within the same namespace.
-            /// Defaults a AgentConfiguration specified by a ClusterAgentConnection.
+            /// Defaults a AgentConfiguration specified by a ClusterAgentConfiguration.
             /// </summary>
             public string? Name { get; set; }
         }

src/Contrast.K8s.AgentOperator/Entities/V1Beta1ClusterAgentConfiguration.cs

@@ -22,8 +22,8 @@ public class ClusterAgentConfigurationSpec
             public V1Beta1AgentConfiguration? Template { get; set; }
 
             /// <summary>
-            /// The namespaces to apply this AgentConfiguration template to. Splat syntax is supported.
-            /// Optional, defaults to '*', selecting all namespaces.
+            /// The namespaces to apply this AgentConfiguration template to. Glob syntax is supported.
+            /// Optional, defaults to selecting all namespaces.
             /// </summary>
             public IReadOnlyCollection<string> Namespaces { get; set; } = Array.Empty<string>();
         }

src/Contrast.K8s.AgentOperator/Entities/V1Beta1ClusterAgentConnection.cs

@@ -22,8 +22,8 @@ public class ClusterAgentConnectionSpec
             public V1Beta1AgentConnection? Template { get; set; }
 
             /// <summary>
-            /// The namespaces to apply this AgentConfiguration template to. Splat syntax is supported.
-            /// Optional, defaults to '*', selecting all namespaces.
+            /// The namespaces to apply this AgentConnection template to. Glob syntax is supported.
+            /// Optional, defaults to selecting all namespaces.
             /// </summary>
             public IReadOnlyCollection<string> Namespaces { get; set; } = Array.Empty<string>();
         }