Skip to content
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

Jump to bottom

[cluster] support image pull secrets #160

Merged
merged 2 commits into from
Jul 8, 2019
Merged

[cluster] support image pull secrets #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f16f05
[cluster] support image pull secrets
schallert Jul 2, 2019
31711c5
api docs
schallert Jul 2, 2019
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
1 change: 1 addition & 0 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ ClusterSpec defines the desired state for a M3 cluster to be converge to.
| dataDirVolumeClaimTemplate | DataDirVolumeClaimTemplate is the volume claim template for an M3DB instance's data. It claims PersistentVolumes for cluster storage, volumes are dynamically provisioned by when the StorageClass is defined. | *[corev1.PersistentVolumeClaim](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#persistentvolumeclaim-v1-core) | false |
| podSecurityContext | PodSecurityContext allows the user to specify an optional security context for pods. | *corev1.PodSecurityContext | false |
| securityContext | SecurityContext allows the user to specify a container-level security context. | *corev1.SecurityContext | false |
| imagePullSecrets | ImagePullSecrets will be added to every pod. | [][corev1.LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#localobjectreference-v1-core) | false |
| labels | Labels sets the base labels that will be applied to resources created by the cluster. // TODO(schallert): design doc on labeling scheme. | map[string]string | false |
| annotations | Annotations sets the base annotations that will be applied to resources created by the cluster. | map[string]string | false |
| tolerations | Tolerations sets the tolerations that will be applied to all M3DB pods. | []corev1.Toleration | false |
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/m3dboperator/v1alpha1/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ type ClusterSpec struct {
// context.
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`

// ImagePullSecrets will be added to every pod.
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

// Labels sets the base labels that will be applied to resources created by
// the cluster. // TODO(schallert): design doc on labeling scheme.
Labels map[string]string `json:"labels,omitempty"`
Expand Down
15 changes: 14 additions & 1 deletion pkg/apis/m3dboperator/v1alpha1/openapi_generated.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions pkg/apis/m3dboperator/v1alpha1/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.

2 changes: 2 additions & 0 deletions pkg/k8sops/fixtures/testM3DBCluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ spec:
replicationFactor: 3
numberOfShards: 8
enableCarbonIngester: true
imagePullSecrets:
- name: secret1
isolationGroups:
- name: us-fake1-a
numInstances: 1
Expand Down
3 changes: 3 additions & 0 deletions pkg/k8sops/generators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ func TestGenerateStatefulSet(t *testing.T) {
SecurityContext: &v1.PodSecurityContext{
FSGroup: pointer.Int64Ptr(10),
},
ImagePullSecrets: []v1.LocalObjectReference{
{Name: "secret1"},
},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
Expand Down
1 change: 1 addition & 0 deletions pkg/k8sops/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ func NewBaseStatefulSet(ssName, isolationGroup string, cluster *myspec.M3DBClust
Spec: v1.PodSpec{
PriorityClassName: cluster.Spec.PriorityClassName,
SecurityContext: cluster.Spec.PodSecurityContext,
ImagePullSecrets: cluster.Spec.ImagePullSecrets,
Containers: []v1.Container{
{
Name: ssName,
Expand Down