Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit 6fe919c

Browse files
laveryalaverya
authored
Merge pull request #803 from laverya/patch-empty-initcontainers-lists
Patch empty initcontainers lists
2 parents 076f84e + d44ff2d commit 6fe919c

File tree

12 files changed

+359
-5
lines changed

12 files changed

+359
-5
lines changed

‎integration/init/forgeops/expected/.ship/state.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"v1": {
3+
"config": {},
4+
"releaseName": "ds",
5+
"helmValuesDefaults": "# Copyright (c) 2016-2018 ForgeRock AS.\n\n\n# If useDefaultSecrets is set to true (the default), the secret values in ../secrets will\n# be used to create a secret map with the same name as the instance ($instance).\n# If you set useDefaultSecrets to false, you must create this secret map yourself before the DS\n# instances will be provisioned. This allows you to inject your own secrets rather\n# than use the default ones bundled in the chart. An alternate strategy is to fork this chart.\n# and replace the secrets in ./secrets with your own.\nuseDefaultSecrets: true\n\n# The default DS baseDN for the user store. Note the ds image creates several backends that are hard coded and this\n# setting will have no impact on those backends. This setting will be removed in the future.\nbaseDN: \"ou=identities\"\n\n# The default instance name. This will create a stateful set that can be resolved at\n# $instance-0.$instance. You can also use the service name $instance - which will get (randomly)\n# load balanced to an instance (not recommended )\ninstance: ds\n\ncomponent: ds\n\n# If you want to disable the userstore backend, set this to false\nuserstore:\n enabled: true\n\n# If you want to disable specific backends, set to false:\ncts:\n enabled: true\n\nconfigstore:\n enabled: true\n\nidmRepo:\n enabled: true\n\nimage:\n repository: forgerock-docker-public.bintray.io/forgerock/ds\n pullPolicy: IfNotPresent\n tag: 6.5.0\n\n# The number of instances in the StatefulSet. Each instance is a combined DS/RS pair.\n# You can not change this after installation.\nreplicas: 1\n\n# Size for DS database storage. Note GKE IOPS scale based on the size of the volume.\nstorageSize: \"10Gi\"\n\n# Set storageClass only on clusters that support it (GCP / AWS).\n#storageClass: fast\n\n\nbackup:\n # This is an optional parameter that will mount the named PVC volume (most likely an NFS share)\n # on the bak/ directory. If this is not specified, an emptyDir will be mounted instead.\n # The pvc is usually created by the dsadmin/ chart.\n #pvcClaimName: ds-backup\n\n # This configures the top level directory under bak/\n # The backup folder is set to $clusterName/$instance-$namespace. This\n # forces each instance backup to go to a different folder on the shared PVC drive. Without this\n # you will get collisions on backup / restore.\n # If you have many clusters backing up same shared NFS volume, change the default here. For example, \n # set it to \"production\"\n clusterName: \"default\"\n\n\n# You need to be on JDK 8u131 or higher to enable these options.\n# todo: find JDK 11 args\n#opendjJavaArgs: \"-server -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseCompressedOops -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:MaxRAMFraction=2\"\n\n# These defaults work for a small test instance\nopendjJavaArgs: \"-Xmx512m\"\n\n# Resource limits.\n# These help for pod placement in a larger cluster to ensure the DS instance gets sufficient resources.\n# The default values are artificially low.\n# For production, you will want to increase them.\nresources:\n requests:\n memory: 512Mi\n limits:\n memory: 768Mi\n\n# DS persistence switch. Setting this to false disables volume claims - all data is stored inside the docker image.\n# Used in testing environments without pv providers. When the pod is terminated, the DS data will be deleted!\npersistence: true\n\n# Pod Anti Affinity switch. For production this should be set to \"hard\", otherwise use \"soft\".\n# The hard setting will force ds pods to be spread out over multiple hosts/zones. soft is best effort\n# but pods will still be scheduled together if sufficient resources are not available.\npodAntiAffinity: \"soft\"\n\n# This is the exact value for TopologyKey. The other possible value is \"failure-domain.beta.kubernetes.io/zone\"\n# which will ensure that pod is scheduled on nodes in different zones thus allowing for HA across zones.\n# Note you want to leave this value as is if you are deploying a single zone cluster and change the values only\n# if you have a multi-zone cluster.\ntopologyKey: \"kubernetes.io/hostname\"\n\n# Restore parameters. \nrestore:\n # If true, runs the init containers that restores the directory from a backup folder in the bak/ folder.\n # The backup data must be present in the bak/ folder. \n # Restore will not overwrite existing DS data. \n # A backup folder contains a full backup and a number of incrementals. The most up to date incremental \n # is used to recover.\n enabled: false\n\nsecurityContext:\n runAsUser: 11111\n fsGroup: 11111\n supplementalGroups: [ 0 ]\n",
6+
"upstream": "https://github.com/ForgeRock/forgeops/tree/b8a579493e58e5336dffc8ec394e37da9f074a45/helm/ds",
7+
"metadata": {
8+
"applicationType": "helm",
9+
"name": "ds",
10+
"releaseNotes": "Sets RollingUpdate as the updateStrategy for StatefulSets",
11+
"version": "6.5.0"
12+
},
13+
"contentSHA": "f67e2f2bdd51dece929d8472b2def81d5b5c2a3bafd1d83d5f171c724bf614fd"
14+
}
15+
}

‎integration/init/forgeops/expected/base/configmap.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: v1
2+
data:
3+
BACKUP_CLUSTER_NAME: default
4+
BASE_DN: ou=identities
5+
DJ_INSTANCE: ds
6+
DS_ENABLE_CONFIGSTORE: "true"
7+
DS_ENABLE_CTS: "true"
8+
DS_ENABLE_IDMREPO: "true"
9+
DS_ENABLE_USERSTORE: "true"
10+
DS_SET_SIZE: "1"
11+
OPENDJ_JAVA_ARGS: -Xmx512m
12+
SLACK_URL: null
13+
kind: ConfigMap
14+
metadata:
15+
name: ds

‎integration/init/forgeops/expected/base/ds.yaml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
apiVersion: apps/v1beta1
2+
kind: StatefulSet
3+
metadata:
4+
labels:
5+
app: ds-ds
6+
component: ds
7+
instance: ds
8+
release: ds
9+
vendor: forgerock
10+
name: ds
11+
spec:
12+
replicas: 1
13+
serviceName: ds
14+
template:
15+
metadata:
16+
labels:
17+
app: ds-ds
18+
component: ds
19+
instance: ds
20+
release: ds
21+
vendor: forgerock
22+
spec:
23+
affinity:
24+
podAntiAffinity:
25+
preferredDuringSchedulingIgnoredDuringExecution:
26+
- podAffinityTerm:
27+
labelSelector:
28+
matchExpressions:
29+
- key: instance
30+
operator: In
31+
values:
32+
- ds
33+
topologyKey: kubernetes.io/hostname
34+
weight: 100
35+
containers:
36+
- args:
37+
- start
38+
env:
39+
- name: NAMESPACE
40+
valueFrom:
41+
fieldRef:
42+
fieldPath: metadata.namespace
43+
envFrom:
44+
- configMapRef:
45+
name: ds
46+
image: forgerock-docker-public.bintray.io/forgerock/ds:6.5.0
47+
imagePullPolicy: IfNotPresent
48+
livenessProbe:
49+
initialDelaySeconds: 60
50+
periodSeconds: 120
51+
tcpSocket:
52+
port: metrics
53+
name: ds
54+
ports:
55+
- containerPort: 1389
56+
name: ldap
57+
- containerPort: 4444
58+
name: admin
59+
- containerPort: 8989
60+
name: replication
61+
- containerPort: 8080
62+
name: metrics
63+
resources:
64+
limits:
65+
memory: 768Mi
66+
requests:
67+
memory: 512Mi
68+
volumeMounts:
69+
- mountPath: /var/run/secrets/opendj
70+
name: dj-secrets
71+
- mountPath: /opt/opendj/bak
72+
name: backup
73+
- mountPath: /opt/opendj/logs
74+
name: logs
75+
- mountPath: /opt/opendj/data
76+
name: db
77+
initContainers: []
78+
securityContext:
79+
fsGroup: 11111
80+
runAsUser: 11111
81+
supplementalGroups:
82+
- 0
83+
terminationGracePeriodSeconds: 30
84+
volumes:
85+
- name: dj-secrets
86+
secret:
87+
secretName: ds
88+
- emptyDir: {}
89+
name: logs
90+
- emptyDir: {}
91+
name: backup
92+
updateStrategy:
93+
type: RollingUpdate
94+
volumeClaimTemplates:
95+
- metadata:
96+
annotations:
97+
pv.beta.kubernetes.io/gid: "11111"
98+
name: db
99+
spec:
100+
accessModes:
101+
- ReadWriteOnce
102+
resources:
103+
requests:
104+
storage: 10Gi

‎integration/init/forgeops/expected/base/kustomization.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
kind: ""
2+
apiversion: ""
3+
resources:
4+
- configmap.yaml
5+
- ds.yaml
6+
- secrets.yaml
7+
- service.yaml

0 commit comments

Comments
 (0)