Skip to content

Commit 4fb7670

Browse files
committed
fix
1 parent c7b03d9 commit 4fb7670

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

mutate.py

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,40 @@ def mutatating_webhook():
9595
uid = request_json['request']['uid']
9696
namespace = request_json["request"]["namespace"]
9797
spec = request_json["request"].get("object")
98+
9899
try:
99100
pod_generate_name = spec["metadata"]["generateName"]
100101
except KeyError:
101-
logger.debug("Request is: " + req )
102-
logger.info("Request UID: " + uid + " does not have pod generate name..")
103-
pod_generate_name = ""
102+
try:
103+
pod_generate_name = spec["metadata"]["name"]
104+
logger.info("Request UID: " + uid + " does not have pod generate name; setting metadata.name as a pod_generate_name")
105+
logger.debug("Request: " + request)
106+
except:
107+
logger.info("Request UID: " + uid + " does not have pod_generate_name..")
108+
logger.debug("Request: " + request)
109+
pod_generate_name = ""
104110
try:
105111
pod_owner_object_name = spec["metadata"]["ownerReferences"][0]["name"]
106112
except KeyError:
107-
logger.debug("Request UID: " + uid + " does not have pod_owner_object_name..")
108-
pod_owner_object_name = ""
113+
try:
114+
pod_owner_object_name = spec["metadata"]["name"]
115+
logger.info("Request UID: " + uid + " does not have pod generate name; setting metadata.name as a pod_owner_object_name")
116+
logger.debug("Request: " + request)
117+
except:
118+
logger.info("Request UID: " + uid + " does not have pod_owner_object_name..")
119+
logger.debug("Request: " + request)
120+
pod_owner_object_name = ""
109121
try:
110122
pod_owner_object_kind = spec["metadata"]["ownerReferences"][0]["kind"]
111123
except KeyError:
112-
logger.debug("Request UID: " + uid + " does not have pod_owner_object_kind..")
113-
pod_owner_object_kind = ""
124+
try:
125+
pod_owner_object_kind = spec["metadata"]["name"]
126+
logger.info("Request UID: " + uid + " does not have pod generate name; setting metadata.name as a pod_owner_object_name")
127+
logger.debug("Request: " + request)
128+
except:
129+
logger.info("Request UID: " + uid + " does not have pod_owner_object_kind..")
130+
logger.debug("Request: " + request)
131+
pod_owner_object_kind = ""
114132

115133

116134
if namespace in list:

resources/env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION 0.0.35-SNAPSHOT
1+
VERSION 0.0.36-SNAPSHOT

0 commit comments

Comments
 (0)