Automated Kargo Maintenance Updater

ContainerCraft · May 1, 2024 · 4c913ba · 4c913ba
1 parent 1f1f68b
commit 4c913ba
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 44 deletions.
diff --git a/charts/cluster-network-addons/crds/network-addons-config.crd.yaml b/charts/cluster-network-addons/crds/network-addons-config.crd.yaml
@@ -48,39 +48,18 @@ spec:
                     description: RangeStart defines the first mac in range
                     type: string
                 type: object
-              kubeSecondaryDNS:
-                description: KubeSecondaryDNS plugin allows to support FQDN for VMI's
-                  secondary networks
-                properties:
-                  domain:
-                    description: Domain defines the FQDN domain
-                    type: string
-                  nameServerIP:
-                    description: NameServerIp defines the name server IP
-                    type: string
-                type: object
               linuxBridge:
                 description: LinuxBridge plugin allows users to create a bridge and
                   add the host and the container to it
                 type: object
               macvtap:
                 description: MacvtapCni plugin allows users to define Kubernetes networks
                   on top of existing host interfaces
-                properties:
-                  devicePluginConfig:
-                    description: DevicePluginConfig allows the user to override the
-                      name of the `ConfigMap` where the device plugin configuration
-                      is held
-                    type: string
                 type: object
               multus:
                 description: Multus plugin enables attaching multiple network interfaces
                   to Pods in Kubernetes
                 type: object
-              multusDynamicNetworks:
-                description: A multus extension enabling hot-plug and hot-unplug of
-                  Pod interfaces
-                type: object
               ovs:
                 description: Ovs plugin allows users to define Kubernetes networks
                   on top of Open vSwitch bridges available on nodes
@@ -1521,6 +1500,20 @@ spec:
                           - ECDHE-RSA-CHACHA20-POLY1305
                           - DHE-RSA-AES128-GCM-SHA256
                           - DHE-RSA-AES256-GCM-SHA384
+                          - TLS_AES_128_GCM_SHA256
+                          - TLS_AES_256_GCM_SHA384
+                          - TLS_CHACHA20_POLY1305_SHA256
+                          - TLS_AES_128_GCM_SHA256
+                          - TLS_AES_256_GCM_SHA384
+                          - TLS_CHACHA20_POLY1305_SHA256
+                          - ECDHE-ECDSA-AES128-GCM-SHA256
+                          - ECDHE-RSA-AES128-GCM-SHA256
+                          - ECDHE-ECDSA-AES256-GCM-SHA384
+                          - ECDHE-RSA-AES256-GCM-SHA384
+                          - ECDHE-ECDSA-CHACHA20-POLY1305
+                          - ECDHE-RSA-CHACHA20-POLY1305
+                          - DHE-RSA-AES128-GCM-SHA256
+                          - DHE-RSA-AES256-GCM-SHA384
                           - DHE-RSA-CHACHA20-POLY1305
                           - ECDHE-ECDSA-AES128-SHA256
                           - ECDHE-RSA-AES128-SHA256
@@ -1681,39 +1674,18 @@ spec:
                     description: RangeStart defines the first mac in range
                     type: string
                 type: object
-              kubeSecondaryDNS:
-                description: KubeSecondaryDNS plugin allows to support FQDN for VMI's
-                  secondary networks
-                properties:
-                  domain:
-                    description: Domain defines the FQDN domain
-                    type: string
-                  nameServerIP:
-                    description: NameServerIp defines the name server IP
-                    type: string
-                type: object
               linuxBridge:
                 description: LinuxBridge plugin allows users to create a bridge and
                   add the host and the container to it
                 type: object
               macvtap:
                 description: MacvtapCni plugin allows users to define Kubernetes networks
                   on top of existing host interfaces
-                properties:
-                  devicePluginConfig:
-                    description: DevicePluginConfig allows the user to override the
-                      name of the `ConfigMap` where the device plugin configuration
-                      is held
-                    type: string
                 type: object
               multus:
                 description: Multus plugin enables attaching multiple network interfaces
                   to Pods in Kubernetes
                 type: object
-              multusDynamicNetworks:
-                description: A multus extension enabling hot-plug and hot-unplug of
-                  Pod interfaces
-                type: object
               ovs:
                 description: Ovs plugin allows users to define Kubernetes networks
                   on top of Open vSwitch bridges available on nodes
@@ -3154,6 +3126,20 @@ spec:
                           - ECDHE-RSA-CHACHA20-POLY1305
                           - DHE-RSA-AES128-GCM-SHA256
                           - DHE-RSA-AES256-GCM-SHA384
+                          - TLS_AES_128_GCM_SHA256
+                          - TLS_AES_256_GCM_SHA384
+                          - TLS_CHACHA20_POLY1305_SHA256
+                          - TLS_AES_128_GCM_SHA256
+                          - TLS_AES_256_GCM_SHA384
+                          - TLS_CHACHA20_POLY1305_SHA256
+                          - ECDHE-ECDSA-AES128-GCM-SHA256
+                          - ECDHE-RSA-AES128-GCM-SHA256
+                          - ECDHE-ECDSA-AES256-GCM-SHA384
+                          - ECDHE-RSA-AES256-GCM-SHA384
+                          - ECDHE-ECDSA-CHACHA20-POLY1305
+                          - ECDHE-RSA-CHACHA20-POLY1305
+                          - DHE-RSA-AES128-GCM-SHA256
+                          - DHE-RSA-AES256-GCM-SHA384
                           - DHE-RSA-CHACHA20-POLY1305
                           - ECDHE-ECDSA-AES128-SHA256
                           - ECDHE-RSA-AES128-SHA256

diff --git a/charts/cluster-network-addons/templates/network-addons-config-example.cr.yaml b/charts/cluster-network-addons/templates/network-addons-config-example.cr.yaml
@@ -6,11 +6,9 @@ metadata:
 spec:
   imagePullPolicy: IfNotPresent
   kubeMacPool: {}
-  kubeSecondaryDNS: {}
   linuxBridge: {}
   macvtap: {}
   multus: {}
-  multusDynamicNetworks: {}
   ovs: {}
   ##############################################################################
   # CCIO Appended