Skip to content

Support multiple pull secrets #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kabicin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support multiple pull secrets #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 36 additions & 27 deletions api/v1/runtimecomponent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,112 +56,116 @@ type RuntimeComponentSpec struct {
// +operator-sdk:csv:customresourcedefinitions:order=5,type=spec,displayName="Pull Secret",xDescriptors="urn:alm:descriptor:io.kubernetes:Secret"
PullSecret *string `json:"pullSecret,omitempty"`

// List of Secrets to use to pull images from one or more specified repositories. It is not required if the cluster is configured with a global image pull secret.
// +operator-sdk:csv:customresourcedefinitions:order=6,type=spec,displayName="Pull Secrets"
PullSecrets []string `json:"pullSecrets,omitempty"`

// Deprecated. .spec.serviceAccount.name should be used instead. If both are specified, .spec.serviceAccount.name will override this.
// +operator-sdk:csv:customresourcedefinitions:order=6,type=spec,displayName="Service Account Name",xDescriptors="urn:alm:descriptor:com.tectonic.ui:hidden"
// +operator-sdk:csv:customresourcedefinitions:order=7,type=spec,displayName="Service Account Name",xDescriptors="urn:alm:descriptor:com.tectonic.ui:hidden"
ServiceAccountName *string `json:"serviceAccountName,omitempty"`

// The service account to use for deploying the application. A service account is automatically created if this is not specifed.
// +operator-sdk:csv:customresourcedefinitions:order=6,type=spec,displayName="Service Account"
// +operator-sdk:csv:customresourcedefinitions:order=8,type=spec,displayName="Service Account"
ServiceAccount *RuntimeComponentServiceAccount `json:"serviceAccount,omitempty"`

// Create Knative resources and use Knative serving.
// +operator-sdk:csv:customresourcedefinitions:order=7,type=spec,displayName="Create Knative Service",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
// +operator-sdk:csv:customresourcedefinitions:order=9,type=spec,displayName="Create Knative Service",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
CreateKnativeService *bool `json:"createKnativeService,omitempty"`

// Expose the application externally via a Route, a Knative Route or an Ingress resource.
// +operator-sdk:csv:customresourcedefinitions:order=8,type=spec,displayName="Expose",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
// +operator-sdk:csv:customresourcedefinitions:order=10,type=spec,displayName="Expose",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
Expose *bool `json:"expose,omitempty"`

// Enable management of TLS certificates. Defaults to true.
// +operator-sdk:csv:customresourcedefinitions:order=8,type=spec,displayName="Manage TLS",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
// +operator-sdk:csv:customresourcedefinitions:order=11,type=spec,displayName="Manage TLS",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
ManageTLS *bool `json:"manageTLS,omitempty"`

// Number of pods to create. Defaults to 1. Not applicable when .spec.autoscaling or .spec.createKnativeService is specified.
// +operator-sdk:csv:customresourcedefinitions:order=9,type=spec,displayName="Replicas",xDescriptors="urn:alm:descriptor:com.tectonic.ui:podCount"
// +operator-sdk:csv:customresourcedefinitions:order=12,type=spec,displayName="Replicas",xDescriptors="urn:alm:descriptor:com.tectonic.ui:podCount"
Replicas *int32 `json:"replicas,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=10,type=spec,displayName="Auto Scaling"
// +operator-sdk:csv:customresourcedefinitions:order=13,type=spec,displayName="Auto Scaling"
Autoscaling *RuntimeComponentAutoScaling `json:"autoscaling,omitempty"`

// Resource requests and limits for the application container.
// +operator-sdk:csv:customresourcedefinitions:order=11,type=spec,displayName="Resource Requirements",xDescriptors="urn:alm:descriptor:com.tectonic.ui:resourceRequirements"
// +operator-sdk:csv:customresourcedefinitions:order=14,type=spec,displayName="Resource Requirements",xDescriptors="urn:alm:descriptor:com.tectonic.ui:resourceRequirements"
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=12,type=spec,displayName="Probes"
// +operator-sdk:csv:customresourcedefinitions:order=15,type=spec,displayName="Probes"
Probes *RuntimeComponentProbes `json:"probes,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=13,type=spec,displayName="Deployment"
// +operator-sdk:csv:customresourcedefinitions:order=16,type=spec,displayName="Deployment"
Deployment *RuntimeComponentDeployment `json:"deployment,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=14,type=spec,displayName="StatefulSet"
// +operator-sdk:csv:customresourcedefinitions:order=17,type=spec,displayName="StatefulSet"
StatefulSet *RuntimeComponentStatefulSet `json:"statefulSet,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=15,type=spec,displayName="Service"
// +operator-sdk:csv:customresourcedefinitions:order=18,type=spec,displayName="Service"
Service *RuntimeComponentService `json:"service,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=16,type=spec,displayName="Route"
// +operator-sdk:csv:customresourcedefinitions:order=19,type=spec,displayName="Route"
Route *RuntimeComponentRoute `json:"route,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=16,type=spec,displayName="Network Policy"
// +operator-sdk:csv:customresourcedefinitions:order=20,type=spec,displayName="Network Policy"
NetworkPolicy *RuntimeComponentNetworkPolicy `json:"networkPolicy,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=17,type=spec,displayName="Monitoring"
// +operator-sdk:csv:customresourcedefinitions:order=21,type=spec,displayName="Monitoring"
Monitoring *RuntimeComponentMonitoring `json:"monitoring,omitempty"`

// An array of environment variables for the application container.
// +listType=map
// +listMapKey=name
// +operator-sdk:csv:customresourcedefinitions:order=18,type=spec,displayName="Environment Variables"
// +operator-sdk:csv:customresourcedefinitions:order=22,type=spec,displayName="Environment Variables"
Env []corev1.EnvVar `json:"env,omitempty"`

// List of sources to populate environment variables in the application container.
// +listType=atomic
// +operator-sdk:csv:customresourcedefinitions:order=19,type=spec,displayName="Environment Variables from Sources"
// +operator-sdk:csv:customresourcedefinitions:order=23,type=spec,displayName="Environment Variables from Sources"
EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`

// Represents a volume with data that is accessible to the application container.
// +listType=map
// +listMapKey=name
// +operator-sdk:csv:customresourcedefinitions:order=20,type=spec,displayName="Volumes"
// +operator-sdk:csv:customresourcedefinitions:order=24,type=spec,displayName="Volumes"
Volumes []corev1.Volume `json:"volumes,omitempty"`

// Represents where to mount the volumes into the application container.
// +listType=atomic
// +operator-sdk:csv:customresourcedefinitions:order=21,type=spec,displayName="Volume Mounts"
// +operator-sdk:csv:customresourcedefinitions:order=25,type=spec,displayName="Volume Mounts"
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`

// List of containers to run before other containers in a pod.
// +listType=map
// +listMapKey=name
// +operator-sdk:csv:customresourcedefinitions:order=22,type=spec,displayName="Init Containers"
// +operator-sdk:csv:customresourcedefinitions:order=26,type=spec,displayName="Init Containers"
InitContainers []corev1.Container `json:"initContainers,omitempty"`

// List of sidecar containers. These are additional containers to be added to the pods.
// +listType=map
// +listMapKey=name
// +operator-sdk:csv:customresourcedefinitions:order=23,type=spec,displayName="Sidecar Containers"
// +operator-sdk:csv:customresourcedefinitions:order=27,type=spec,displayName="Sidecar Containers"
SidecarContainers []corev1.Container `json:"sidecarContainers,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=24,type=spec,displayName="Affinity"
// +operator-sdk:csv:customresourcedefinitions:order=28,type=spec,displayName="Affinity"
Affinity *RuntimeComponentAffinity `json:"affinity,omitempty"`

// Security context for the application container.
// +operator-sdk:csv:customresourcedefinitions:order=25,type=spec,displayName="Security Context"
// +operator-sdk:csv:customresourcedefinitions:order=29,type=spec,displayName="Security Context"
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`

// +operator-sdk:csv:customresourcedefinitions:order=26,type=spec,displayName="Topology Spread Constraints"
// +operator-sdk:csv:customresourcedefinitions:order=30,type=spec,displayName="Topology Spread Constraints"
TopologySpreadConstraints *RuntimeComponentTopologySpreadConstraints `json:"topologySpreadConstraints,omitempty"`

// Disable information about services being injected into the application pod's environment variables. Default to false.
// +operator-sdk:csv:customresourcedefinitions:order=27,type=spec,displayName="Disable Service Links",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
// +operator-sdk:csv:customresourcedefinitions:order=31,type=spec,displayName="Disable Service Links",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
DisableServiceLinks *bool `json:"disableServiceLinks,omitempty"`

// Tolerations to be added to application pods. Tolerations allow the scheduler to schedule pods on nodes with matching taints.
// +operator-sdk:csv:customresourcedefinitions:order=28,type=spec,displayName="Tolerations"
// +operator-sdk:csv:customresourcedefinitions:order=32,type=spec,displayName="Tolerations"
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`

// DNS settings for the pod.
// +operator-sdk:csv:customresourcedefinitions:order=29,type=spec,displayName="DNS"
// +operator-sdk:csv:customresourcedefinitions:order=33,type=spec,displayName="DNS"
DNS *RuntimeComponentDNS `json:"dns,omitempty"`
}

Expand Down Expand Up @@ -566,6 +570,11 @@ func (cr *RuntimeComponent) GetPullSecret() *string {
return cr.Spec.PullSecret
}

// GetPullSecrets returns the secret list for additional docker registry credentials
func (cr *RuntimeComponent) GetPullSecrets() []string {
return cr.Spec.PullSecrets
}

// GetToleration returns pod tolerations slice
func (cr *RuntimeComponent) GetTolerations() []corev1.Toleration {
return cr.Spec.Tolerations
Expand Down
5 changes: 5 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions bundle/manifests/rc.app.stacks_runtimecomponents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4856,6 +4856,13 @@ spec:
repository. It is not required if the cluster is configured with
a global image pull secret.
type: string
pullSecrets:
description: List of Secrets to use to pull images from one or more
specified repositories. It is not required if the cluster is configured
with a global image pull secret.
items:
type: string
type: array
replicas:
description: Number of pods to create. Defaults to 1. Not applicable
when .spec.autoscaling or .spec.createKnativeService is specified.
Expand Down
Loading