Add option to pass env for cluster-profile-manager (#48)

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

apis/installer/v1alpha1/cluster_profile_manager_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"kmodules.xyz/resource-metadata/apis/shared"
 )
@@ -74,8 +75,26 @@ type AceOcmAddonsPlatformSpec struct {
 type AppImage struct {
 	Image string `json:"image"`
 	// +optional
-	Tag             string `json:"tag"`
-	ImagePullPolicy string `json:"imagePullPolicy"`
+	Tag             string                `json:"tag"`
+	ImagePullPolicy string                `json:"imagePullPolicy"`
+	SecurityContext *core.SecurityContext `json:"securityContext"`
+	// List of sources to populate environment variables in the container.
+	// The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+	// will be reported as an event when the container is starting. When a key exists in multiple
+	// sources, the value associated with the last source will take precedence.
+	// Values defined by an Env with a duplicate key will take precedence.
+	// Cannot be updated.
+	// +optional
+	// +listType=atomic
+	EnvFrom []core.EnvFromSource `json:"envFrom"`
+	// List of environment variables to set in the container.
+	// Cannot be updated.
+	// +optional
+	// +patchMergeKey=name
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=name
+	Env []core.EnvVar `json:"env"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/installer/v1alpha1/hub_cluster_robot_types.go

@@ -21,28 +21,28 @@ import (
 )
 
 const (
-	ResourceKindHubManagerRobot = "HubManagerRobot"
-	ResourceHubManagerRobot     = "hubmanagerrobot"
-	ResourceHubManagerRobots    = "hubmanagerrobots"
+	ResourceKindHubClusterRobot = "HubClusterRobot"
+	ResourceHubClusterRobot     = "hubclusterrobot"
+	ResourceHubClusterRobots    = "hubclusterrobots"
 )
 
-// HubManagerRobot defines the schama for HubManagerRobot.
+// HubClusterRobot defines the schama for HubClusterRobot.
 
 // +genclient
 // +genclient:skipVerbs=updateStatus
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=hubmanagerrobots,singular=hubmanagerrobot,categories={kubeops,appscode}
-type HubManagerRobot struct {
+// +kubebuilder:resource:path=hubclusterrobots,singular=hubclusterrobot,categories={kubeops,appscode}
+type HubClusterRobot struct {
 	metav1.TypeMeta   `json:",inline,omitempty"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              HubManagerRobotSpec `json:"spec,omitempty"`
+	Spec              HubClusterRobotSpec `json:"spec,omitempty"`
 }
 
-// HubManagerRobotSpec is the schema for Identity Server values file
-type HubManagerRobotSpec struct {
+// HubClusterRobotSpec is the schema for Identity Server values file
+type HubClusterRobotSpec struct {
 	//+optional
 	NameOverride string `json:"nameOverride"`
 	//+optional
@@ -56,10 +56,10 @@ type HubManagerRobotSpec struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// HubManagerRobotList is a list of HubManagerRobots
-type HubManagerRobotList struct {
+// HubClusterRobotList is a list of HubClusterRobots
+type HubClusterRobotList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	// Items is a list of HubManagerRobot CRD objects
-	Items []HubManagerRobot `json:"items,omitempty"`
+	// Items is a list of HubClusterRobot CRD objects
+	Items []HubClusterRobot `json:"items,omitempty"`
 }

apis/installer/v1alpha1/register.go

@@ -63,8 +63,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterManagerSpokeList{},
 		&ClusterProfileManager{},
 		&ClusterProfileManagerList{},
-		&HubManagerRobot{},
-		&HubManagerRobotList{},
+		&HubClusterRobot{},
+		&HubClusterRobotList{},
 	)
 
 	scheme.AddKnownTypes(SchemeGroupVersion,

apis/installer/v1alpha1/types_test.go

@@ -30,6 +30,8 @@ func TestDefaultValues(t *testing.T) {
 		sc.TestCase{Obj: v1alpha1.ClusterAuthManagerSpec{}},
 		sc.TestCase{Obj: v1alpha1.ClusterManagerHubSpec{}},
 		sc.TestCase{Obj: v1alpha1.ClusterManagerSpokeSpec{}},
+		sc.TestCase{Obj: v1alpha1.ClusterProfileManagerSpec{}},
+		sc.TestCase{Obj: v1alpha1.HubClusterRobotSpec{}},
 	)
 	checker.TestAll(t)
 }

apis/installer/v1alpha1/zz_generated.deepcopy.go

@@ -53,6 +53,8 @@ The following table lists the configurable parameters of the `cluster-profile-ma
 | manager.tag                               |                                                                                | <code>""</code>                                                                                                                                                                                 |
 | manager.imagePullPolicy                   |                                                                                | <code>Always</code>                                                                                                                                                                             |
 | manager.securityContext                   |                                                                                | <code>{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"privileged":false,"readOnlyRootFilesystem":true,"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}</code> |
+| manager.envFrom                           | List of sources to populate environment variables in the container             | <code>[]</code>                                                                                                                                                                                 |
+| manager.env                               | List of environment variables to set in the container                          | <code>[]</code>                                                                                                                                                                                 |
 | kubeconfigSecretName                      |                                                                                | <code>""</code>                                                                                                                                                                                 |
 | addonManagerNamespace                     |                                                                                | <code>open-cluster-management-addon</code>                                                                                                                                                      |
 | placement.create                          |                                                                                | <code>true</code>                                                                                                                                                                               |

charts/cluster-profile-manager/README.md

@@ -31,7 +31,14 @@ spec:
             - --kubeconfig=/var/run/secrets/ocm/auth/kubeconfig
             {{- end }}
             - --registryFQDN={{ .Values.registryFQDN }}
+          {{- with .Values.manager.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           env:
+          {{- with .Values.manager.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
             - name: POD_NAME
               valueFrom:
                 fieldRef: