Merge pull request #208 from openinfradev/release

20231103 release to develop

aws-msa-reference/service-mesh/site-values.yaml

@@ -6,7 +6,7 @@ metadata:
 global:
   clusterName: cluster.local
   namespace: tks-msa
-  imageRepo: harbor.taco-cat.xyz/tks
+  imageRegistry: harbor.taco-cat.xyz
   serviceMeshControlNodeSelector:
     tks-msa: enabled
   serviceMeshIngressNodeSelector:
@@ -20,41 +20,41 @@ charts:
 - name: cert-manager
   override:
     image:
-      repository: harbor.taco-cat.xyz/tks/cert-manager-controller
+      repository: $(imageRegistry)/tks/cert-manager-controller
     nodeSelector:
         tks-msa: enabled
     webhook:
       image:
-        repository: harbor.taco-cat.xyz/tks/cert-manager-webhook
+        repository: $(imageRegistry)/tks/cert-manager-webhook
       nodeSelector:
         tks-msa: enabled
     cainjector:
       image:
-        repository: harbor.taco-cat.xyz/tks/cert-manager-cainjector
+        repository: $(imageRegistry)/tks/cert-manager-cainjector
       nodeSelector:
         tks-msa: enabled
 
 - name: k8ssandra-operator
   override:
     image:
-      registry: harbor.taco-cat.xyz
+      registry: $(imageRegistry)
       repository: tks/k8ssandra-operator
       tag: v1.6.0
     nodeSelector:
       tks-msa: enabled
     cleaner:
       image:
-        registry: harbor.taco-cat.xyz
+        registry: $(imageRegistry)
         repository: tks/k8ssandra-tools
         tag: latest
     client:
       image:
-        registry: harbor.taco-cat.xyz
+        registry: $(imageRegistry)
         repository: tks/k8ssandra-tools
         tag: latest
     cass-operator:
       image:
-        registry: harbor.taco-cat.xyz
+        registry: $(imageRegistry)
         repository: tks/cass-operator
         tag: v1.14.0
       nodeSelector:
@@ -64,8 +64,24 @@ charts:
   override:
     namespace: $(namespace)
     cassandra:
+      jmxInitContainerImage:
+        name: busybox
+        registry: $(imageRegistry)/tks
+        tag: 1.34.1
       datacenters:
-        size: 2
+        size: 1
+        perNodeConfigInitContainerImage: $(imageRegistry)/tks/yq:4
+        initContainers:
+          serverConfigInitImage: $(imageRegistry)/tks/cass-config-builder:1.0-ubi7
+        jmxInitContainerImage:
+          name: busybox
+          registry: $(imageRegistry)/tks
+          tag: 1.34.1
+        containers:
+        - name: cassandra
+          image: $(imageRegistry)/tks/cass-management-api:4.0.6
+        - name: server-system-logger
+          image: $(imageRegistry)/tks/system-logger:v1.14.0
         config:
           heapSize: 2048M
         storageConfig:
@@ -85,60 +101,70 @@ charts:
         stargate:
           size: 1
           heapSize: 384M
+          containerImage:
+            registry: $(imageRegistry)
+            repository: tks
+            tag: v1.0.67
           nodeSelector:
             tks-msa: enabled
 
 - name: istiod
   override:
     revision: ""
     pilot.autoscaleEnabled: false
-    pilot.traceSampling: 1.0
+    pilot.traceSampling: 0.1
     pilot.nodeSelector: $(serviceMeshControlNodeSelector)
+    global.hub: $(imageRegistry)/tks
     global.proxy.clusterDomain: $(clusterName)
     global.tracer.zipkin.address: jaeger-operator-jaeger-collector.$(namespace):9411
 
 - name: istio-ingressgateway
   override:
     revision: ""
     replicaCount: 1
+    image: $(imageRegistry)/tks/proxyv2:1.17.2
     autoscaling:
       enabled: false
       minReplicas: 1
       maxReplicas: 5
       targetCPUUtilizationPercentage: 80
     service.type: LoadBalancer
-    resources.requests.cpu: 1000m
-    resources.requests.memory: 1024Mi
-    resources.limits.cpu: 2000m
-    resources.limits.memory: 2048Mi
+    #resources.requests.cpu: 1000m
+    #resources.requests.memory: 1024Mi
+    #resources.limits.cpu: 2000m
+    #resources.limits.memory: 2048Mi
     nodeSelector: $(serviceMeshIngressNodeSelector)
 
 - name: istio-egressgateway
   override:
     revision: ""
     replicaCount: 1
+    image: $(imageRegistry)/tks/proxyv2:1.17.2
     autoscaling.enabled: false
     service.type: ClusterIP
-    resources.requests.cpu: 1000m
-    resources.requests.memory: 1024Mi
-    resources.limits.cpu: 2000m
-    resources.limits.memory: 2048Mi
+    #resources.requests.cpu: 1000m
+    #resources.requests.memory: 1024Mi
+    #resources.limits.cpu: 2000m
+    #resources.limits.memory: 2048Mi
     nodeSelector: $(serviceMeshEgressNodeSelector)
 
 - name: jaeger-operator
   override:
+    image:
+      repository: $(imageRegistry)/tks/jaeger-operator
+      tag: 1.35.0
     nodeSelector: $(serviceMeshControlNodeSelector)
 
 - name: servicemesh-jaeger-resource
   override:
     namespace: tks-msa
-    sampling.param: 100
+    sampling.param: 10
     collector.resources.requests.cpu: 500m
     collector.resources.requests.memory: 1024Mi
     collector.resources.limits.cpu: 1000m
     collector.resources.limits.memory: 2048Mi
     collector:
-      image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
+      image: $(imageRegistry)/tks/jaeger-collector:1.35.0
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -155,12 +181,12 @@ charts:
           servers: cassandra-dc-service.tks-msa.svc
           keyspace: jaeger_v1_datacenter
         cassandraCreateSchema:
-          image: harbor.taco-cat.xyz/tks/jaeger-cassandra-schema:1.35.0
+          image: $(imageRegistry)/tks/jaeger-cassandra-schema:1.35.0
         dependencies:
           enabled: true
-          image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
+          image: $(imageRegistry)/tks/spark-dependencies:1.35.0
     query:
-      image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
+      image: $(imageRegistry)/tks/jaeger-query:1.35.0
       basePath: /
       affinity:
         nodeAffinity:
@@ -172,7 +198,7 @@ charts:
                 values:
                 - enabled
     agent:
-      image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
+      image: $(imageRegistry)/tks/jaeger-agent:1.35.0
     cassandra:
       user:
         enabled: true
@@ -185,7 +211,7 @@ charts:
 - name: kiali-operator
   override:
     image:
-      repo: harbor.taco-cat.xyz/tks/kiali-operator
+      repo: $(imageRegistry)/tks/kiali-operator
       tag: v1.63.0
     nodeSelector: $(serviceMeshControlNodeSelector)
 
@@ -194,7 +220,7 @@ charts:
     namespace: tks-msa
     istioNamespace: tks-msa
     deployment.namespace: tks-msa
-    deployment.image_name: harbor.taco-cat.xyz/tks/kiali
+    deployment.image_name: $(imageRegistry)/tks/kiali
     deployment.image_version: v1.63.0
     deployment.resources.requests.cpu: 500m
     deployment.resources.requests.memory: 512Mi

aws-reference/tks-admin-tools/site-values.yaml

@@ -16,6 +16,10 @@ charts:
     auth.adminPassword: $(commonPassword)
     ingress.enabled: true
     ingress.hostname: TO_BE_FIXED
+    ingress.annotations:
+      nginx.ingress.kubernetes.io/proxy-buffer-size: 20k
+      acme.cert-manager.io/http01-edit-in-place: "true"
+      cert-manager.io/cluster-issuer: http0issuer
     externalDatabase.host: $(dbHost)
     externalDatabase.password: $(commonPassword)
 
@@ -47,7 +51,7 @@ charts:
       ingress:
         hosts:
           core: TO_BE_FIXED
-        className: "nginx"  
+        className: "nginx"
     externalURL: TO_BE_FIXED
     persistence:
       persistentVolumeClaim:
@@ -74,21 +78,21 @@ charts:
     database:
       type: external
       external:
-        host: $(dbHost)  
+        host: $(dbHost)
         password: $(commonPassword)
         sslmode: "require"
     core:
-      replicas: 2  
+      replicas: 2
     jobservice:
-      replicas: 2  
+      replicas: 2
     registry:
-      replicas: 2  
+      replicas: 2
     chartmuseum:
-      replicas: 2  
+      replicas: 2
     trivy:
-      replicas: 2  
+      replicas: 2
     portal:
-      replicas: 2  
+      replicas: 2
     harborAdminPassword: $(commonPassword)
 
 - name: ingress-nginx