Cherry pick: Fix web hook variables in seldon kustomize not being updated by kfctl (#1671)

Author: ukclivecox

seldon/Makefile

@@ -11,7 +11,9 @@
 seldon-core-operator/base: clean-kustomize
 	mkdir -p seldon-core-operator/base
 	cd seldon-core-operator/base && helm template -f ../../values.yaml seldon-core seldon-core-operator --repo https://storage.googleapis.com/seldon-charts --namespace kubeflow --version 1.4.0  > resources.yaml
-	sed -i 's#cert-manager.io/inject-ca-from:.*#cert-manager.io/inject-ca-from: $$(CERTIFICATE_NAMESPACE)/$$(CERTIFICATE_NAME)#g' seldon-core-operator/base/resources.yaml
+	#kfctl strangeness means these variables don't always get resolved see https://github.com/kubeflow/manifests/issues/1660
+	#sed -i 's#cert-manager.io/inject-ca-from:.*#cert-manager.io/inject-ca-from: $$(CERTIFICATE_NAMESPACE)/$$(CERTIFICATE_NAME)#g' seldon-core-operator/base/resources.yaml
+	sed -i 's#cert-manager.io/inject-ca-from:.*#cert-manager.io/inject-ca-from: kubeflow/seldon-serving-cert#g' seldon-core-operator/base/resources.yaml
 	sed -i "s#'seldon-webhook-service.kubeflow.svc.cluster.local'#"'$$(SERVICE_NAME).$$(SERVICE_NAMESPACE).svc.cluster.local#' seldon-core-operator/base/resources.yaml
 	sed -i "s#commonName: 'seldon-webhook-service.kubeflow.svc'#"'commonName: $$(SERVICE_NAME).$$(CERTIFICATE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml
 	sed -i "s#'seldon-webhook-service.kubeflow.svc'#"'$$(SERVICE_NAME).$$(SERVICE_NAMESPACE).svc#' seldon-core-operator/base/resources.yaml

seldon/seldon-core-operator/base/resources.yaml

@@ -13,7 +13,7 @@ metadata:
   name: seldon-mutating-webhook-configuration-kubeflow
 webhooks:
 - clientConfig:
-    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBpR2diQUl5Z3RKRk9NRnhjYXNIb1V3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TURNeE1UQTBPVFF4V2hjTgpNakV4TURNeE1UQTBPVFF4V2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFPZ1dnZEN6MVBoekRSYlNOWEsrYkduSUV2aHMKNWdKTzNudkd2K2VBcjladnBOampBTzZZMDdDNmQrcEFUQWlYdVpoMHU2aDVjaERqRmFMUGY2Wi9uWHNXVlNicApaUGFEN01NMU5TbDBiSlF3N3FEQlFaRjBLUmtuRUdmNDFkSkJKbFhYV0JERjZpbGQ1WU5lc1gxdThVQnNDTnZCCjVVUFZaR3dBdDA1SlBNUXNNcVNBR1RKUWdQcW9RbnV6RWN1WGRiZSswdHZ2RXpjUkVTMFJyNlVNWEtubVFVSlgKZFZKNy8yWExjZzhrVzRKOUM5VXczZ1AvME1WTEFCcFpLRGRvVnYwU2VObHFxR1VrZlJpcUk2TzZ6ai85Z282YwpocHJoUjJETm8zb3liUWZ4UDdZT1dBanl1Qm9NRUtqUWNkTzZobFY4UE5HWjQwVngwSmxLaUFIZzRqOENBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQll4OGtZVnZ0QQoyclJkdFNweENKZi84SWI1Z05NOTJNTm5IcGlqcUtRVHUyRmg3aFVFWVFzM0lLMmxBU2JWQXRrNmpHL2xwd0RCCmxCWlhkK01wM1pUc2xYbXlpVGNjOVVUdXFBWTQrMklZazJKYW1XU2p0MXlJN3RQUnZZaUI2WnFFdU50Y1BvSVEKOEJzK29MZlVUci9SZFIvamJ2ZlMybkwybm00L0t0N2pId2xNVTZua2VkUGJUbnhBMDVXaTVCanB4d2VvQjRWQwpsOGl3MkxUdkppU1UzOTFsaTJNZlNER1ZDcWZnMU54WHZhT1Jkcno5YXhOcDY0TDE0aFFnY3ZheGkxYWRrY0RCCkp0dURvd3Fkd1pXV1orZGw2RTR1aTlKSFZXUmVRWk9DcjdZTUJobzdiRTZESVZxeFR1c0Y3MUczd24vRFNSTGwKeWlrc1M4L1Zrci9XCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBhcTd6TWFKejJDeDlIdldOaDVPaUl3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TVRJd01UQXdPVE0yV2hjTgpNakV4TVRJd01UQXdPVE0yV2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMM3hGeGxjcURqZ01FUWdQek9oT0J5SGoyWEwKek80Uk1QS2RadjVZWEZiR0ZOWVUvS3k5enJtUXlZYlFrMmd0TldGa2xjN2FHWkZhdk9CLzJ6blNkRTFMbWVRaQpCd0dBckJPNVhkNmlpUGQwUjd2amdINmVWbmJqOGVvVkg3aFo0VHpRTkdXelRhN1FtZGM0VGVNUFlIZGhhR3JiCkI4S3pPZDE2Rm5VOVpaWmJHbjRaQUtGQ3lCNWh5T1dLL3A5Mmw0aTZYOWJPR3FXT2lsbTNkU3ZYZ3lrNktMNXYKSmZrVkJ4ZDIwalIzakxJV0t0a01DZ2R2d21Ldkw5cFU0Kzd4UFZMckNpdmc5bWs2ZDRueU8xeTg5WE44dXlHbAowd3F6azlDWDl1S0NVbGtmdXRYbnMxS2tvUHdZdVd0QnFjVUl6cHNhMFhtUTZ6cDhtTkxpNGIxaDBPY0NBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ1B3d2EzVzZwegpnTW1tMUJWU1EzUWFkY051TTlQbDJGa0cwcnhpbzQ1cnZBL2pHaE8yRUlTdHoydTMvMFBIRDNvWjBTbGl0Yld3Cm96dWhScy9oNFU2eGtjQ09tdWdiNW9IRHREY0MwMFFCRk5WZFZ4TEVhblB6c0sybml5UndQanM4bG5vcjdHQmEKakttcGJscktsNDZ0cW9MVmRZSGZBVk5QNmIxbDNNTmVIQTVkTGxUTGhrTVIrK2dRS2FTVUdhK1BRSytPOXJCRAprRXFISHNzV2hoMnEwQkhPUzIyLzBpS1RvWjVWSTIwdllkZUJseXpHNHVHb1lSenNXcTduWm5JMGhjRytWdEt4ClUwL25kdkVVaURHNHU1SEFCM3N1Y2F6RUIreExRNkdFSDl5MUJ6SjRxc3UyZGJkemZHaS96ZExRRXdRRE04WGkKR0h3RnBYQU9ya2J3Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
     service:
       name: seldon-webhook-service
       namespace: kubeflow
@@ -37,7 +37,7 @@ webhooks:
     resources:
     - seldondeployments
 - clientConfig:
-    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBpR2diQUl5Z3RKRk9NRnhjYXNIb1V3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TURNeE1UQTBPVFF4V2hjTgpNakV4TURNeE1UQTBPVFF4V2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFPZ1dnZEN6MVBoekRSYlNOWEsrYkduSUV2aHMKNWdKTzNudkd2K2VBcjladnBOampBTzZZMDdDNmQrcEFUQWlYdVpoMHU2aDVjaERqRmFMUGY2Wi9uWHNXVlNicApaUGFEN01NMU5TbDBiSlF3N3FEQlFaRjBLUmtuRUdmNDFkSkJKbFhYV0JERjZpbGQ1WU5lc1gxdThVQnNDTnZCCjVVUFZaR3dBdDA1SlBNUXNNcVNBR1RKUWdQcW9RbnV6RWN1WGRiZSswdHZ2RXpjUkVTMFJyNlVNWEtubVFVSlgKZFZKNy8yWExjZzhrVzRKOUM5VXczZ1AvME1WTEFCcFpLRGRvVnYwU2VObHFxR1VrZlJpcUk2TzZ6ai85Z282YwpocHJoUjJETm8zb3liUWZ4UDdZT1dBanl1Qm9NRUtqUWNkTzZobFY4UE5HWjQwVngwSmxLaUFIZzRqOENBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQll4OGtZVnZ0QQoyclJkdFNweENKZi84SWI1Z05NOTJNTm5IcGlqcUtRVHUyRmg3aFVFWVFzM0lLMmxBU2JWQXRrNmpHL2xwd0RCCmxCWlhkK01wM1pUc2xYbXlpVGNjOVVUdXFBWTQrMklZazJKYW1XU2p0MXlJN3RQUnZZaUI2WnFFdU50Y1BvSVEKOEJzK29MZlVUci9SZFIvamJ2ZlMybkwybm00L0t0N2pId2xNVTZua2VkUGJUbnhBMDVXaTVCanB4d2VvQjRWQwpsOGl3MkxUdkppU1UzOTFsaTJNZlNER1ZDcWZnMU54WHZhT1Jkcno5YXhOcDY0TDE0aFFnY3ZheGkxYWRrY0RCCkp0dURvd3Fkd1pXV1orZGw2RTR1aTlKSFZXUmVRWk9DcjdZTUJobzdiRTZESVZxeFR1c0Y3MUczd24vRFNSTGwKeWlrc1M4L1Zrci9XCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBhcTd6TWFKejJDeDlIdldOaDVPaUl3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TVRJd01UQXdPVE0yV2hjTgpNakV4TVRJd01UQXdPVE0yV2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMM3hGeGxjcURqZ01FUWdQek9oT0J5SGoyWEwKek80Uk1QS2RadjVZWEZiR0ZOWVUvS3k5enJtUXlZYlFrMmd0TldGa2xjN2FHWkZhdk9CLzJ6blNkRTFMbWVRaQpCd0dBckJPNVhkNmlpUGQwUjd2amdINmVWbmJqOGVvVkg3aFo0VHpRTkdXelRhN1FtZGM0VGVNUFlIZGhhR3JiCkI4S3pPZDE2Rm5VOVpaWmJHbjRaQUtGQ3lCNWh5T1dLL3A5Mmw0aTZYOWJPR3FXT2lsbTNkU3ZYZ3lrNktMNXYKSmZrVkJ4ZDIwalIzakxJV0t0a01DZ2R2d21Ldkw5cFU0Kzd4UFZMckNpdmc5bWs2ZDRueU8xeTg5WE44dXlHbAowd3F6azlDWDl1S0NVbGtmdXRYbnMxS2tvUHdZdVd0QnFjVUl6cHNhMFhtUTZ6cDhtTkxpNGIxaDBPY0NBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ1B3d2EzVzZwegpnTW1tMUJWU1EzUWFkY051TTlQbDJGa0cwcnhpbzQ1cnZBL2pHaE8yRUlTdHoydTMvMFBIRDNvWjBTbGl0Yld3Cm96dWhScy9oNFU2eGtjQ09tdWdiNW9IRHREY0MwMFFCRk5WZFZ4TEVhblB6c0sybml5UndQanM4bG5vcjdHQmEKakttcGJscktsNDZ0cW9MVmRZSGZBVk5QNmIxbDNNTmVIQTVkTGxUTGhrTVIrK2dRS2FTVUdhK1BRSytPOXJCRAprRXFISHNzV2hoMnEwQkhPUzIyLzBpS1RvWjVWSTIwdllkZUJseXpHNHVHb1lSenNXcTduWm5JMGhjRytWdEt4ClUwL25kdkVVaURHNHU1SEFCM3N1Y2F6RUIreExRNkdFSDl5MUJ6SjRxc3UyZGJkemZHaS96ZExRRXdRRE04WGkKR0h3RnBYQU9ya2J3Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
     service:
       name: seldon-webhook-service
       namespace: kubeflow
@@ -61,7 +61,7 @@ webhooks:
     resources:
     - seldondeployments
 - clientConfig:
-    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBpR2diQUl5Z3RKRk9NRnhjYXNIb1V3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TURNeE1UQTBPVFF4V2hjTgpNakV4TURNeE1UQTBPVFF4V2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFPZ1dnZEN6MVBoekRSYlNOWEsrYkduSUV2aHMKNWdKTzNudkd2K2VBcjladnBOampBTzZZMDdDNmQrcEFUQWlYdVpoMHU2aDVjaERqRmFMUGY2Wi9uWHNXVlNicApaUGFEN01NMU5TbDBiSlF3N3FEQlFaRjBLUmtuRUdmNDFkSkJKbFhYV0JERjZpbGQ1WU5lc1gxdThVQnNDTnZCCjVVUFZaR3dBdDA1SlBNUXNNcVNBR1RKUWdQcW9RbnV6RWN1WGRiZSswdHZ2RXpjUkVTMFJyNlVNWEtubVFVSlgKZFZKNy8yWExjZzhrVzRKOUM5VXczZ1AvME1WTEFCcFpLRGRvVnYwU2VObHFxR1VrZlJpcUk2TzZ6ai85Z282YwpocHJoUjJETm8zb3liUWZ4UDdZT1dBanl1Qm9NRUtqUWNkTzZobFY4UE5HWjQwVngwSmxLaUFIZzRqOENBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQll4OGtZVnZ0QQoyclJkdFNweENKZi84SWI1Z05NOTJNTm5IcGlqcUtRVHUyRmg3aFVFWVFzM0lLMmxBU2JWQXRrNmpHL2xwd0RCCmxCWlhkK01wM1pUc2xYbXlpVGNjOVVUdXFBWTQrMklZazJKYW1XU2p0MXlJN3RQUnZZaUI2WnFFdU50Y1BvSVEKOEJzK29MZlVUci9SZFIvamJ2ZlMybkwybm00L0t0N2pId2xNVTZua2VkUGJUbnhBMDVXaTVCanB4d2VvQjRWQwpsOGl3MkxUdkppU1UzOTFsaTJNZlNER1ZDcWZnMU54WHZhT1Jkcno5YXhOcDY0TDE0aFFnY3ZheGkxYWRrY0RCCkp0dURvd3Fkd1pXV1orZGw2RTR1aTlKSFZXUmVRWk9DcjdZTUJobzdiRTZESVZxeFR1c0Y3MUczd24vRFNSTGwKeWlrc1M4L1Zrci9XCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lSQVBhcTd6TWFKejJDeDlIdldOaDVPaUl3RFFZSktvWklodmNOQVFFTEJRQXcKSERFYU1CZ0dBMVVFQXhNUlkzVnpkRzl0TFcxbGRISnBZM010WTJFd0hoY05NakF4TVRJd01UQXdPVE0yV2hjTgpNakV4TVRJd01UQXdPVE0yV2pBY01Sb3dHQVlEVlFRREV4RmpkWE4wYjIwdGJXVjBjbWxqY3kxallUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMM3hGeGxjcURqZ01FUWdQek9oT0J5SGoyWEwKek80Uk1QS2RadjVZWEZiR0ZOWVUvS3k5enJtUXlZYlFrMmd0TldGa2xjN2FHWkZhdk9CLzJ6blNkRTFMbWVRaQpCd0dBckJPNVhkNmlpUGQwUjd2amdINmVWbmJqOGVvVkg3aFo0VHpRTkdXelRhN1FtZGM0VGVNUFlIZGhhR3JiCkI4S3pPZDE2Rm5VOVpaWmJHbjRaQUtGQ3lCNWh5T1dLL3A5Mmw0aTZYOWJPR3FXT2lsbTNkU3ZYZ3lrNktMNXYKSmZrVkJ4ZDIwalIzakxJV0t0a01DZ2R2d21Ldkw5cFU0Kzd4UFZMckNpdmc5bWs2ZDRueU8xeTg5WE44dXlHbAowd3F6azlDWDl1S0NVbGtmdXRYbnMxS2tvUHdZdVd0QnFjVUl6cHNhMFhtUTZ6cDhtTkxpNGIxaDBPY0NBd0VBCkFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnS2tNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ1B3d2EzVzZwegpnTW1tMUJWU1EzUWFkY051TTlQbDJGa0cwcnhpbzQ1cnZBL2pHaE8yRUlTdHoydTMvMFBIRDNvWjBTbGl0Yld3Cm96dWhScy9oNFU2eGtjQ09tdWdiNW9IRHREY0MwMFFCRk5WZFZ4TEVhblB6c0sybml5UndQanM4bG5vcjdHQmEKakttcGJscktsNDZ0cW9MVmRZSGZBVk5QNmIxbDNNTmVIQTVkTGxUTGhrTVIrK2dRS2FTVUdhK1BRSytPOXJCRAprRXFISHNzV2hoMnEwQkhPUzIyLzBpS1RvWjVWSTIwdllkZUJseXpHNHVHb1lSenNXcTduWm5JMGhjRytWdEt4ClUwL25kdkVVaURHNHU1SEFCM3N1Y2F6RUIreExRNkdFSDl5MUJ6SjRxc3UyZGJkemZHaS96ZExRRXdRRE04WGkKR0h3RnBYQU9ya2J3Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
     service:
       name: seldon-webhook-service
       namespace: kubeflow