From 0cb625f5fd5f94b4b8025a9d4f9b546c7ec94d41 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Wed, 18 Jan 2023 13:29:34 +0100
Subject: Revert "Merge pull request #25614 from
 vespa-engine/revert-25587-jonmv/private-endpoints"

This reverts commit 7b736f0a09444664cff118eac5b28e608632de72, reversing
changes made to 6c457e6dd5993ec2ef15177dab4a16e3d3702b85.
---
 config-model/src/main/resources/schema/containercluster.rnc | 13 +------------
 config-model/src/main/resources/schema/deployment.rnc       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'config-model/src/main/resources')

diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 933ec528c42..81455084ad2 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -6,8 +6,7 @@ ContainerCluster = element container {
     ContainerServices &    
     DocumentBinding* &
     NodesOfContainerCluster? &
-    ClientAuthorize? &
-    LoadBalancer?
+    ClientAuthorize?
 }
 
 ContainerServices =
@@ -312,16 +311,6 @@ NodesOfContainerCluster = element nodes {
     )
 }
 
-LoadBalancer = element load-balancer {
-    element private-access {
-        element allow-urn {
-            xsd:string
-        }*
-    }?
-}
-
-
-
 #DOCUMENT BINDINGS:
 
 DocumentBinding = element document {
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 444f66a92ab..d63b8885a57 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -150,12 +150,21 @@ EndpointInstance = element instance {
     text
 }
 
+AllowedUrn = element allow {
+    attribute with { xsd:string } &
+    attribute arn { xsd:string }? &
+    attribute project { xsd:string }?
+}
+
 Endpoint = element endpoint {
     attribute id { xsd:string }? &
     attribute container-id { xsd:string } &
     attribute region { xsd:string }? &
+    attribute type { xsd:string }? &
+    attribute enabled { xsd:boolean }? &
     EndpointRegion* &
-    EndpointInstance*
+    EndpointInstance* &
+    AllowedUrn*
 }
 
 Endpoints = element endpoints {
-- 
cgit v1.2.3