Skip to content

Commit 11984e2

Browse files
committed
Work in progress
1 parent 8c8bfd5 commit 11984e2

File tree

12 files changed

+1196
-43
lines changed

12 files changed

+1196
-43
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ENV PATH=$PATH:/operator
99

1010
COPY src/scripts/* /operator/
1111
COPY operator/target/weblogic-kubernetes-operator-0.2.jar /operator/weblogic-kubernetes-operator.jar
12+
COPY target/weblogic-deploy.zip /operator/weblogic-deploy.zip
1213
COPY operator/target/lib/*.jar /operator/lib/
1314

1415
HEALTHCHECK --interval=1m --timeout=10s \

kubernetes/internal/create-weblogic-domain-job-template.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,13 @@ data:
169169
cat << EOF > ${scriptFile}
170170
#!/bin/bash
171171
172+
# Base64 decode binary support files
173+
mkdir -p /tmp/weblogic-operator/bin
174+
shopt -s nullglob
175+
for f in /weblogic-operator/scripts/*.base64; do
176+
cat "\$f" | base64 --decode > /tmp/weblogic-operator/bin/\$(basename "\$f" .base64)
177+
done
178+
172179
# Check for stale state file and remove if found"
173180
if [ -f ${stateFile} ]; then
174181
echo "Removing stale file ${stateFile}"

kubernetes/internal/generate-security-policy.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,11 @@ metadata:
9494
weblogic.operatorName: ${NAMESPACE}
9595
rules:
9696
- apiGroups: [""]
97-
resources: ["namespaces", "persistentvolumes"]
97+
resources: ["namespaces"]
9898
verbs: ["get", "list", "watch"]
99+
- apiGroups: [""]
100+
resources: ["persistentvolumes"]
101+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
99102
- apiGroups: ["apiextensions.k8s.io"]
100103
resources: ["customresourcedefinitions"]
101104
verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
@@ -197,20 +200,23 @@ metadata:
197200
weblogic.operatorName: ${NAMESPACE}
198201
rules:
199202
- apiGroups: [""]
200-
resources: ["secrets", "persistentvolumeclaims"]
203+
resources: ["secrets"]
201204
verbs: ["get", "list", "watch"]
202205
- apiGroups: ["storage.k8s.io"]
203206
resources: ["storageclasses"]
204207
verbs: ["get", "list", "watch"]
205208
- apiGroups: [""]
206-
resources: ["services", "configmaps", "pods", "jobs", "events"]
209+
resources: ["services", "configmaps", "pods", "podtemplates", "events", "persistentvolumeclaims"]
207210
verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
208211
- apiGroups: [""]
209212
resources: ["pods/logs"]
210213
verbs: ["get", "list"]
211214
- apiGroups: [""]
212215
resources: ["pods/exec"]
213216
verbs: ["create"]
217+
- apiGroups: ["batch"]
218+
resources: ["jobs", "cronjobs"]
219+
verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
214220
- apiGroups: ["settings.k8s.io"]
215221
resources: ["podpresets"]
216222
verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]

operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ public interface KubernetesConstants {
2626
public static final String CONTAINER_NAME = "weblogic-server";
2727

2828
public static final String DOMAIN_CONFIG_MAP_NAME = "weblogic-domain-cm";
29+
public static final String DOMAIN_HOME_CONFIG_MAP_NAME = "weblogic-domain-home-cm";
2930

3031
}

operator/src/main/java/oracle/kubernetes/operator/ProcessingConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public interface ProcessingConstants {
3131
public static final String EXPLICIT_RESTART_CLUSTERS = "explicitRestartClusters";
3232

3333
public static final String SCRIPT_CONFIG_MAP = "scriptConfigMap";
34+
public static final String DOMAIN_HOME_CONFIG_MAP = "domainHomeConfigMap";
3435
public static final String SERVER_STATE_MAP = "serverStateMap";
3536
public static final String SERVER_HEALTH_MAP = "serverHealthMap";
3637

0 commit comments

Comments
 (0)