fix(chart): use direct access to teamcity for downloads

nefelim4ag · Jun 7, 2023 · 9dd377d · 9dd377d
1 parent a309601
commit 9dd377d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/charts/teamcity-server/Chart.yaml b/charts/teamcity-server/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: teamcity-server
 description: A Helm chart for deploy HA teamcity server
 type: application
-version: 2.2.1
+version: 2.2.2
 appVersion: "2023.05"
diff --git a/charts/teamcity-server/templates/proxy/ingress.yaml.tpl b/charts/teamcity-server/templates/proxy/ingress.yaml.tpl
@@ -25,6 +25,34 @@ spec:
   - host: {{ tpl $key $ }}
     http:
       paths:
+        - path: /img
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $.Release.Name }}
+              port:
+                name: http
+        - path: /res
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $.Release.Name }}
+              port:
+                name: http
+        - path: /js
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $.Release.Name }}
+              port:
+                name: http
+        - path: /presignedTokenAuth
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $.Release.Name }}
+              port:
+                name: http
         - pathType: ImplementationSpecific
           backend:
             service:

diff --git a/charts/teamcity-server/values.yaml b/charts/teamcity-server/values.yaml
@@ -92,7 +92,7 @@ teamcity:
   nodes:
   ## @param teamcity.nodes[<index>].ingress.host passed to ingress/tls if not empty
   - ingress:
-      host: teamcity-main.example.com # ~ # teamcity-main.example.com
+      host: teamcity-main.example.com
     env:
       NODE_ID: MAIN_SERVER # Used to generate Nginx configuration
       ## @param teamcity.nodes[<index>].env.ROOT_URL passed to teamcity args
@@ -182,29 +182,5 @@ configMap:
       connectionProperties.user={{ $.Values.database.user }}
       connectionProperties.password={{ $.Values.database.password }}
       maxConnections=50
-  optConf:
-    server.xml: |-
-      <?xml version="1.0" encoding="UTF-8"?>
-      <Server port="8105" shutdown="SHUTDOWN">
-        <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-        <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-        <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-        <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-        <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-        <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-        <GlobalNamingResources>
-          <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml" />
-        </GlobalNamingResources>
-        <Service name="Catalina">
-          <Connector port="8111" protocol="org.apache.coyote.http11.Http11NioProtocol" connectionTimeout="60000" redirectPort="8543" useBodyEncodingForURI="true" tcpNoDelay="1" />
-          <Engine name="Catalina" defaultHost="localhost">
-            <Realm className="org.apache.catalina.realm.LockOutRealm">
-              <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" />
-            </Realm>
-            <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-              <Valve className="org.apache.catalina.valves.ErrorReportValve" showReport="false" showServerInfo="false" />
-              <Valve className="org.apache.catalina.valves.RemoteIpValve" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" portHeader="x-forwarded-port" />
-            </Host>
-          </Engine>
-        </Service>
-      </Server>
+  optConf: ~
+    # server.xml: |-