From 98c6df45d9be0b4c67569dab79777f498338c7c5 Mon Sep 17 00:00:00 2001
From: Gaurav Genani <h3llix.pvt@gmail.com>
Date: Sun, 13 Jun 2021 22:41:43 +0530
Subject: [PATCH 1/4] api,cli: expose active cilium config through CLI

Note: All the daemon configurations have to be public for reflections to work

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
---
 api/v1/models/daemon_configuration_status.go |   3 +
 api/v1/openapi.yaml                          |   4 +
 api/v1/server/embedded_spec.go               |  12 +++
 cilium/cmd/config.go                         |   3 +
 daemon/cmd/config.go                         |  18 +++-
 pkg/option/config.go                         | 101 ++++++++++---------
 pkg/option/config_test.go                    |   2 +-
 7 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/api/v1/models/daemon_configuration_status.go b/api/v1/models/daemon_configuration_status.go
index 9f2825bd8f2ed..f8308ad37204a 100644
--- a/api/v1/models/daemon_configuration_status.go
+++ b/api/v1/models/daemon_configuration_status.go
@@ -25,6 +25,9 @@ type DaemonConfigurationStatus struct {
 	// addressing
 	Addressing *NodeAddressing `json:"addressing,omitempty"`
 
+	// Config map which contains all the active daemon configurations
+	DaemonConfigurationMap map[string]interface{} `json:"daemonConfigurationMap,omitempty"`
+
 	// datapath mode
 	DatapathMode DatapathMode `json:"datapathMode,omitempty"`
 
diff --git a/api/v1/openapi.yaml b/api/v1/openapi.yaml
index 1c687cab84fb3..3ea2cdf536165 100644
--- a/api/v1/openapi.yaml
+++ b/api/v1/openapi.yaml
@@ -2198,6 +2198,10 @@ definitions:
       egress-multi-home-ip-rule-compat:
         description: Configured compatibility mode for --egress-multi-home-ip-rule-compat
         type: boolean
+      daemonConfigurationMap:
+        description: Config map which contains all the active daemon configurations
+        additionalProperties:
+          type: object
   DatapathMode:
     description: Datapath mode
     type: string
diff --git a/api/v1/server/embedded_spec.go b/api/v1/server/embedded_spec.go
index b2138fee4a858..6f3e91a7ca9fd 100644
--- a/api/v1/server/embedded_spec.go
+++ b/api/v1/server/embedded_spec.go
@@ -1908,6 +1908,12 @@ func init() {
         "addressing": {
           "$ref": "#/definitions/NodeAddressing"
         },
+        "daemonConfigurationMap": {
+          "description": "Config map which contains all the active daemon configurations",
+          "additionalProperties": {
+            "type": "object"
+          }
+        },
         "datapathMode": {
           "$ref": "#/definitions/DatapathMode"
         },
@@ -6289,6 +6295,12 @@ func init() {
         "addressing": {
           "$ref": "#/definitions/NodeAddressing"
         },
+        "daemonConfigurationMap": {
+          "description": "Config map which contains all the active daemon configurations",
+          "additionalProperties": {
+            "type": "object"
+          }
+        },
         "datapathMode": {
           "$ref": "#/definitions/DatapathMode"
         },
diff --git a/cilium/cmd/config.go b/cilium/cmd/config.go
index feb4988f50259..edf65075a2ba0 100644
--- a/cilium/cmd/config.go
+++ b/cilium/cmd/config.go
@@ -64,6 +64,9 @@ func configDaemon(cmd *cobra.Command, opts []string) {
 			}
 			return
 		}
+		for k, v := range cfgStatus.DaemonConfigurationMap {
+			fmt.Println(k, " ", v)
+		}
 		dumpConfig(cfgStatus.Immutable)
 		dumpConfig(cfgStatus.Realized.Options)
 		fmt.Printf("%-24s %s\n", "k8s-configuration", cfgStatus.K8sConfiguration)
diff --git a/daemon/cmd/config.go b/daemon/cmd/config.go
index ad3c2c7e09a9d..096bb46de9686 100644
--- a/daemon/cmd/config.go
+++ b/daemon/cmd/config.go
@@ -5,6 +5,7 @@ package cmd
 
 import (
 	"fmt"
+	"reflect"
 
 	"github.com/cilium/cilium/api/v1/models"
 	. "github.com/cilium/cilium/api/v1/server/restapi/daemon"
@@ -154,6 +155,14 @@ func (h *getConfig) Handle(params GetConfigParams) middleware.Responder {
 	log.WithField(logfields.Params, logfields.Repr(params)).Debug("GET /config request")
 
 	d := h.daemon
+	m := make(map[string]interface{})
+	e := reflect.ValueOf(option.Config).Elem()
+
+	for i := 0; i < e.NumField(); i++ {
+		if e.Field(i).Kind() != reflect.Func {
+			m[e.Type().Field(i).Name] = e.Field(i).Interface()
+		}
+	}
 
 	spec := &models.DaemonConfigurationSpec{
 		Options:           *option.Config.Opts.GetMutableModel(),
@@ -169,10 +178,11 @@ func (h *getConfig) Handle(params GetConfigParams) middleware.Responder {
 			Type:    option.Config.KVStore,
 			Options: option.Config.KVStoreOpt,
 		},
-		Realized:     spec,
-		DeviceMTU:    int64(d.mtuConfig.GetDeviceMTU()),
-		RouteMTU:     int64(d.mtuConfig.GetRouteMTU()),
-		DatapathMode: models.DatapathMode(option.Config.DatapathMode),
+		Realized:               spec,
+		DaemonConfigurationMap: m,
+		DeviceMTU:              int64(d.mtuConfig.GetDeviceMTU()),
+		RouteMTU:               int64(d.mtuConfig.GetRouteMTU()),
+		DatapathMode:           models.DatapathMode(option.Config.DatapathMode),
 		IpvlanConfiguration: &models.IpvlanConfiguration{
 			MasterDeviceIndex: int64(option.Config.Ipvlan.MasterDeviceIndex),
 			OperationMode:     option.Config.Ipvlan.OperationMode,
diff --git a/pkg/option/config.go b/pkg/option/config.go
index 9b3e104f1f30c..312f07a8a12bc 100644
--- a/pkg/option/config.go
+++ b/pkg/option/config.go
@@ -1445,11 +1445,12 @@ type DaemonConfig struct {
 
 	// Masquerade specifies whether or not to masquerade packets from endpoints
 	// leaving the host.
-	EnableIPv4Masquerade   bool
-	EnableIPv6Masquerade   bool
-	EnableBPFMasquerade    bool
-	EnableBPFClockProbe    bool
-	EnableIPMasqAgent      bool
+	EnableIPv4Masquerade bool
+	EnableIPv6Masquerade bool
+	EnableBPFMasquerade  bool
+	EnableBPFClockProbe  bool
+	EnableIPMasqAgent    bool
+	// expired DNS lookups with still-active connections
 	EnableEgressGateway    bool
 	IPMasqAgentConfigPath  string
 	InstallIptRules        bool
@@ -1750,9 +1751,9 @@ type DaemonConfig struct {
 	// KernelHz is the HZ rate the kernel is operating in
 	KernelHz int
 
-	// excludeLocalAddresses excludes certain addresses to be recognized as
+	// ExcludeLocalAddresses excludes certain addresses to be recognized as
 	// a local address
-	excludeLocalAddresses []*net.IPNet
+	ExcludeLocalAddresses []*net.IPNet
 
 	// IPv4PodSubnets available subnets to be assign IPv4 addresses to pods from
 	IPv4PodSubnets []*net.IPNet
@@ -1767,8 +1768,8 @@ type DaemonConfig struct {
 	// CiliumNode resource for the local node
 	AutoCreateCiliumNodeResource bool
 
-	// ipv4NativeRoutingCIDR describes a CIDR in which pod IPs are routable
-	ipv4NativeRoutingCIDR *cidr.CIDR
+	// Ipv4NativeRoutingCIDR describes a CIDR in which pod IPs are routable
+	Ipv4NativeRoutingCIDR *cidr.CIDR
 
 	// EgressMasqueradeInterfaces is the selector used to select interfaces
 	// subject to egress masquerading
@@ -1891,21 +1892,21 @@ type DaemonConfig struct {
 	// ports for all fragments.
 	FragmentsMapEntries int
 
-	// sizeofCTElement is the size of an element (key + value) in the CT map.
-	sizeofCTElement int
+	// SizeofCTElement is the size of an element (key + value) in the CT map.
+	SizeofCTElement int
 
-	// sizeofNATElement is the size of an element (key + value) in the NAT map.
-	sizeofNATElement int
+	// SizeofNATElement is the size of an element (key + value) in the NAT map.
+	SizeofNATElement int
 
-	// sizeofNeighElement is the size of an element (key + value) in the neigh
+	// SizeofNeighElement is the size of an element (key + value) in the neigh
 	// map.
-	sizeofNeighElement int
+	SizeofNeighElement int
 
-	// sizeofSockRevElement is the size of an element (key + value) in the neigh
+	// SizeofSockRevElement is the size of an element (key + value) in the neigh
 	// map.
-	sizeofSockRevElement int
+	SizeofSockRevElement int
 
-	k8sEnableAPIDiscovery bool
+	K8sEnableAPIDiscovery bool
 
 	// k8sEnableLeasesFallbackDiscovery enables k8s to fallback to API probing to check
 	// for the support of Leases in Kubernetes when there is an error in discovering
@@ -1913,17 +1914,17 @@ type DaemonConfig struct {
 	// We require to check for Leases capabilities in operator only, which uses Leases for leader
 	// election purposes in HA mode.
 	// This is only enabled for cilium-operator
-	k8sEnableLeasesFallbackDiscovery bool
+	K8sEnableLeasesFallbackDiscovery bool
 
 	// LBMapEntries is the maximum number of entries allowed in BPF lbmap.
 	LBMapEntries int
 
-	// k8sServiceProxyName is the value of service.kubernetes.io/service-proxy-name label,
+	// K8sServiceProxyNametest is the value of service.kubernetes.io/service-proxy-name label,
 	// that identifies the service objects Cilium should handle.
 	// If the provided value is an empty string, Cilium will manage service objects when
 	// the label is not present. For more details -
 	// https://github.com/kubernetes/enhancements/blob/master/keps/sig-network/0031-20181017-kube-proxy-services-optional.md
-	k8sServiceProxyName string
+	K8sServiceProxyNametest string
 
 	// APIRateLimitName enables configuration of the API rate limits
 	APIRateLimit map[string]string
@@ -2007,10 +2008,10 @@ var (
 		AllowICMPFragNeeded:          defaults.AllowICMPFragNeeded,
 		EnableWellKnownIdentities:    defaults.EnableWellKnownIdentities,
 		K8sEnableK8sEndpointSlice:    defaults.K8sEnableEndpointSlice,
-		k8sEnableAPIDiscovery:        defaults.K8sEnableAPIDiscovery,
+		K8sEnableAPIDiscovery:        defaults.K8sEnableAPIDiscovery,
 		AllocatorListTimeout:         defaults.AllocatorListTimeout,
 
-		k8sEnableLeasesFallbackDiscovery: defaults.K8sEnableLeasesFallbackDiscovery,
+		K8sEnableLeasesFallbackDiscovery: defaults.K8sEnableLeasesFallbackDiscovery,
 		APIRateLimit:                     make(map[string]string),
 
 		ExternalClusterIP: defaults.ExternalClusterIP,
@@ -2020,7 +2021,7 @@ var (
 // IPv4NativeRoutingCIDR returns the native routing CIDR if configured
 func (c *DaemonConfig) IPv4NativeRoutingCIDR() (cidr *cidr.CIDR) {
 	c.ConfigPatchMutex.RLock()
-	cidr = c.ipv4NativeRoutingCIDR
+	cidr = c.Ipv4NativeRoutingCIDR
 	c.ConfigPatchMutex.RUnlock()
 	return
 }
@@ -2028,14 +2029,14 @@ func (c *DaemonConfig) IPv4NativeRoutingCIDR() (cidr *cidr.CIDR) {
 // SetIPv4NativeRoutingCIDR sets the native routing CIDR
 func (c *DaemonConfig) SetIPv4NativeRoutingCIDR(cidr *cidr.CIDR) {
 	c.ConfigPatchMutex.Lock()
-	c.ipv4NativeRoutingCIDR = cidr
+	c.Ipv4NativeRoutingCIDR = cidr
 	c.ConfigPatchMutex.Unlock()
 }
 
 // IsExcludedLocalAddress returns true if the specified IP matches one of the
 // excluded local IP ranges
 func (c *DaemonConfig) IsExcludedLocalAddress(ip net.IP) bool {
-	for _, ipnet := range c.excludeLocalAddresses {
+	for _, ipnet := range c.ExcludeLocalAddresses {
 		if ipnet.Contains(ip) {
 			return true
 		}
@@ -2139,7 +2140,7 @@ func (c *DaemonConfig) LocalClusterName() string {
 // service.kubernetes.io/service-proxy-name label in order for services to be
 // handled.
 func (c *DaemonConfig) K8sServiceProxyName() string {
-	return c.k8sServiceProxyName
+	return c.K8sServiceProxyNametest
 }
 
 // CiliumNamespaceName returns the name of the namespace in which Cilium is
@@ -2151,20 +2152,20 @@ func (c *DaemonConfig) CiliumNamespaceName() string {
 // K8sAPIDiscoveryEnabled returns true if API discovery of API groups and
 // resources is enabled
 func (c *DaemonConfig) K8sAPIDiscoveryEnabled() bool {
-	return c.k8sEnableAPIDiscovery
+	return c.K8sEnableAPIDiscovery
 }
 
 // K8sLeasesFallbackDiscoveryEnabled returns true if we should fallback to direct API
 // probing when checking for support of Leases in case Discovery API fails to discover
 // required groups.
 func (c *DaemonConfig) K8sLeasesFallbackDiscoveryEnabled() bool {
-	return c.k8sEnableAPIDiscovery
+	return c.K8sEnableAPIDiscovery
 }
 
 // EnableK8sLeasesFallbackDiscovery enables using direct API probing as a fallback to check
 // for the support of Leases when discovering API groups is not possible.
 func (c *DaemonConfig) EnableK8sLeasesFallbackDiscovery() {
-	c.k8sEnableAPIDiscovery = true
+	c.K8sEnableAPIDiscovery = true
 }
 
 func (c *DaemonConfig) validateIPv6ClusterAllocCIDR() error {
@@ -2349,7 +2350,7 @@ func (c *DaemonConfig) parseExcludedLocalAddresses(s []string) error {
 			return fmt.Errorf("unable to parse excluded local address %s: %s", ipString, err)
 		}
 
-		c.excludeLocalAddresses = append(c.excludeLocalAddresses, ipnet)
+		c.ExcludeLocalAddresses = append(c.ExcludeLocalAddresses, ipnet)
 	}
 
 	return nil
@@ -2445,7 +2446,7 @@ func (c *DaemonConfig) Populate() {
 	c.K8sClientBurst = viper.GetInt(K8sClientBurst)
 	c.K8sClientQPSLimit = viper.GetFloat64(K8sClientQPSLimit)
 	c.K8sEnableK8sEndpointSlice = viper.GetBool(K8sEnableEndpointSlice)
-	c.k8sEnableAPIDiscovery = viper.GetBool(K8sEnableAPIDiscovery)
+	c.K8sEnableAPIDiscovery = viper.GetBool(K8sEnableAPIDiscovery)
 	c.K8sKubeConfigPath = viper.GetString(K8sKubeConfigPath)
 	c.K8sRequireIPv4PodCIDR = viper.GetBool(K8sRequireIPv4PodCIDRName)
 	c.K8sRequireIPv6PodCIDR = viper.GetBool(K8sRequireIPv6PodCIDRName)
@@ -2514,7 +2515,7 @@ func (c *DaemonConfig) Populate() {
 	c.PolicyAuditMode = viper.GetBool(PolicyAuditModeArg)
 	c.EnableIPv4FragmentsTracking = viper.GetBool(EnableIPv4FragmentsTrackingName)
 	c.FragmentsMapEntries = viper.GetInt(FragmentsMapEntriesName)
-	c.k8sServiceProxyName = viper.GetString(K8sServiceProxyName)
+	c.K8sServiceProxyNametest = viper.GetString(K8sServiceProxyName)
 	c.CRDWaitTimeout = viper.GetDuration(CRDWaitTimeout)
 	c.LoadBalancerDSRDispatch = viper.GetString(LoadBalancerDSRDispatch)
 	c.LoadBalancerDSRL4Xlate = viper.GetString(LoadBalancerDSRL4Xlate)
@@ -2545,15 +2546,15 @@ func (c *DaemonConfig) Populate() {
 	}
 
 	if nativeRoutingCIDR != "" {
-		c.ipv4NativeRoutingCIDR = cidr.MustParseCIDR(nativeRoutingCIDR)
+		c.Ipv4NativeRoutingCIDR = cidr.MustParseCIDR(nativeRoutingCIDR)
 
-		if len(c.ipv4NativeRoutingCIDR.IP) != net.IPv4len {
+		if len(c.Ipv4NativeRoutingCIDR.IP) != net.IPv4len {
 			log.Fatalf("%s must be an IPv4 CIDR", NativeRoutingCIDR)
 		}
 	} else if ipv4NativeRoutingCIDR != "" {
-		c.ipv4NativeRoutingCIDR = cidr.MustParseCIDR(ipv4NativeRoutingCIDR)
+		c.Ipv4NativeRoutingCIDR = cidr.MustParseCIDR(ipv4NativeRoutingCIDR)
 
-		if len(c.ipv4NativeRoutingCIDR.IP) != net.IPv4len {
+		if len(c.Ipv4NativeRoutingCIDR.IP) != net.IPv4len {
 			log.Fatalf("%s must be an IPv4 CIDR", IPv4NativeRoutingCIDR)
 		}
 	}
@@ -2950,10 +2951,10 @@ func (c *DaemonConfig) calculateBPFMapSizes() error {
 
 	// Don't attempt dynamic sizing if any of the sizeof members was not
 	// populated by the daemon (or any other caller).
-	if c.sizeofCTElement == 0 ||
-		c.sizeofNATElement == 0 ||
-		c.sizeofNeighElement == 0 ||
-		c.sizeofSockRevElement == 0 {
+	if c.SizeofCTElement == 0 ||
+		c.SizeofNATElement == 0 ||
+		c.SizeofNeighElement == 0 ||
+		c.SizeofSockRevElement == 0 {
 		return nil
 	}
 
@@ -2984,10 +2985,10 @@ func (c *DaemonConfig) SetMapElementSizes(
 	sizeofNeighElement,
 	sizeofSockRevElement int) {
 
-	c.sizeofCTElement = sizeofCTElement
-	c.sizeofNATElement = sizeofNATElement
-	c.sizeofNeighElement = sizeofNeighElement
-	c.sizeofSockRevElement = sizeofSockRevElement
+	c.SizeofCTElement = sizeofCTElement
+	c.SizeofNATElement = sizeofNATElement
+	c.SizeofNeighElement = sizeofNeighElement
+	c.SizeofSockRevElement = sizeofSockRevElement
 }
 
 func (c *DaemonConfig) calculateDynamicBPFMapSizes(totalMemory uint64, dynamicSizeRatio float64) {
@@ -3007,12 +3008,12 @@ func (c *DaemonConfig) calculateDynamicBPFMapSizes(totalMemory uint64, dynamicSi
 	//   16GB  1060485  530242  1060485
 	memoryAvailableForMaps := int(float64(totalMemory) * dynamicSizeRatio)
 	log.Infof("Memory available for map entries (%.3f%% of %dB): %dB", dynamicSizeRatio, totalMemory, memoryAvailableForMaps)
-	totalMapMemoryDefault := CTMapEntriesGlobalTCPDefault*c.sizeofCTElement +
-		CTMapEntriesGlobalAnyDefault*c.sizeofCTElement +
-		NATMapEntriesGlobalDefault*c.sizeofNATElement +
+	totalMapMemoryDefault := CTMapEntriesGlobalTCPDefault*c.SizeofCTElement +
+		CTMapEntriesGlobalAnyDefault*c.SizeofCTElement +
+		NATMapEntriesGlobalDefault*c.SizeofNATElement +
 		// Neigh table has the same number of entries as NAT Map has.
-		NATMapEntriesGlobalDefault*c.sizeofNeighElement +
-		SockRevNATMapEntriesDefault*c.sizeofSockRevElement
+		NATMapEntriesGlobalDefault*c.SizeofNeighElement +
+		SockRevNATMapEntriesDefault*c.SizeofSockRevElement
 	log.Debugf("Total memory for default map entries: %d", totalMapMemoryDefault)
 
 	getEntries := func(entriesDefault, min, max int) int {
diff --git a/pkg/option/config_test.go b/pkg/option/config_test.go
index fe19294cf3024..d33acae2eae97 100644
--- a/pkg/option/config_test.go
+++ b/pkg/option/config_test.go
@@ -486,7 +486,7 @@ func TestCheckIPv4NativeRoutingCIDR(t *testing.T) {
 				EnableIPv6Masquerade:  true,
 				Tunnel:                TunnelDisabled,
 				IPAM:                  ipamOption.IPAMAzure,
-				ipv4NativeRoutingCIDR: cidr.MustParseCIDR("10.127.64.0/18"),
+				Ipv4NativeRoutingCIDR: cidr.MustParseCIDR("10.127.64.0/18"),
 				EnableIPv4:            true,
 			},
 			wantErr: false,

From 08dfc724a5c776368ebce3bc63f1b731df714ee5 Mon Sep 17 00:00:00 2001
From: Gaurav Genani <h3llix.pvt@gmail.com>
Date: Mon, 12 Jul 2021 23:43:37 +0530
Subject: [PATCH 2/4] cli: add subcommand `cilium config get`

cilium config get <config_name> gives configuration value from the cli.
conifg_name should be in kebab case.

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
---
 Documentation/cmdref/cilium_config.md         |   1 +
 Documentation/cmdref/cilium_config_get.md     |  29 +++++
 cilium/cmd/config.go                          |  35 +++++-
 cilium/cmd/config_get.go                      |  53 ++++++++
 cilium/cmd/helpers.go                         |  31 ++++-
 go.mod                                        |   1 +
 go.sum                                        |   2 +
 .../github.com/iancoleman/strcase/.travis.yml |  10 ++
 vendor/github.com/iancoleman/strcase/LICENSE  |  22 ++++
 .../github.com/iancoleman/strcase/README.md   |  59 +++++++++
 .../github.com/iancoleman/strcase/acronyms.go |  10 ++
 vendor/github.com/iancoleman/strcase/camel.go |  80 ++++++++++++
 vendor/github.com/iancoleman/strcase/doc.go   |  12 ++
 vendor/github.com/iancoleman/strcase/snake.go | 114 ++++++++++++++++++
 vendor/modules.txt                            |   3 +
 15 files changed, 453 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/cmdref/cilium_config_get.md
 create mode 100644 cilium/cmd/config_get.go
 create mode 100644 vendor/github.com/iancoleman/strcase/.travis.yml
 create mode 100644 vendor/github.com/iancoleman/strcase/LICENSE
 create mode 100644 vendor/github.com/iancoleman/strcase/README.md
 create mode 100644 vendor/github.com/iancoleman/strcase/acronyms.go
 create mode 100644 vendor/github.com/iancoleman/strcase/camel.go
 create mode 100644 vendor/github.com/iancoleman/strcase/doc.go
 create mode 100644 vendor/github.com/iancoleman/strcase/snake.go

diff --git a/Documentation/cmdref/cilium_config.md b/Documentation/cmdref/cilium_config.md
index 227a55982ce10..34b3885eaa976 100644
--- a/Documentation/cmdref/cilium_config.md
+++ b/Documentation/cmdref/cilium_config.md
@@ -28,4 +28,5 @@ cilium config [<option>=(enable|disable) ...] [flags]
 ### SEE ALSO
 
 * [cilium](../cilium)	 - CLI
+* [cilium config get](../cilium_config_get)	 - Retrieve cilium configuration
 
diff --git a/Documentation/cmdref/cilium_config_get.md b/Documentation/cmdref/cilium_config_get.md
new file mode 100644
index 0000000000000..b0b84afc4c218
--- /dev/null
+++ b/Documentation/cmdref/cilium_config_get.md
@@ -0,0 +1,29 @@
+<!-- This file was autogenerated via cilium cmdref, do not edit manually-->
+
+## cilium config get
+
+Retrieve cilium configuration
+
+```
+cilium config get <config name> [flags]
+```
+
+### Options
+
+```
+  -h, --help            help for get
+  -o, --output string   json| jsonpath='{}'
+```
+
+### Options inherited from parent commands
+
+```
+      --config string   config file (default is $HOME/.cilium.yaml)
+  -D, --debug           Enable debug messages
+  -H, --host string     URI to server-side API
+```
+
+### SEE ALSO
+
+* [cilium config](../cilium_config)	 - Cilium configuration options
+
diff --git a/cilium/cmd/config.go b/cilium/cmd/config.go
index edf65075a2ba0..12f3b5d41fe29 100644
--- a/cilium/cmd/config.go
+++ b/cilium/cmd/config.go
@@ -6,6 +6,8 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"reflect"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -62,18 +64,39 @@ func configDaemon(cmd *cobra.Command, opts []string) {
 			if err := command.PrintOutput(cfgStatus.Realized.Options); err != nil {
 				os.Exit(1)
 			}
+			if err := command.PrintOutput(cfgStatus.DaemonConfigurationMap); err != nil {
+				os.Exit(1)
+			}
 			return
 		}
-		for k, v := range cfgStatus.DaemonConfigurationMap {
-			fmt.Println(k, " ", v)
+		fmt.Print("### Read-Only Configurations ###\n\n")
+		keys := make([]string, 0, len(cfgStatus.DaemonConfigurationMap))
+		for k := range cfgStatus.DaemonConfigurationMap {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+		for _, k := range keys {
+			v := cfgStatus.DaemonConfigurationMap[k]
+			if reflect.ValueOf(v).Kind() == reflect.Map {
+				mapString := make(map[string]string)
+				for key, value := range v.(map[string]interface{}) {
+					strKey := fmt.Sprintf("%v", key)
+					strValue := fmt.Sprintf("%v", value)
+					mapString[strKey] = strValue
+				}
+				dumpConfig(mapString)
+			} else {
+				fmt.Printf("%-34s: %v\n", k, v)
+			}
 		}
 		dumpConfig(cfgStatus.Immutable)
+		fmt.Print("\n\n##### Read Write Configurations #####\n")
 		dumpConfig(cfgStatus.Realized.Options)
-		fmt.Printf("%-24s %s\n", "k8s-configuration", cfgStatus.K8sConfiguration)
-		fmt.Printf("%-24s %s\n", "k8s-endpoint", cfgStatus.K8sEndpoint)
-		fmt.Printf("%-24s %s\n", "PolicyEnforcement", cfgStatus.Realized.PolicyEnforcement)
+		fmt.Printf("%-34s: %s\n", "k8s-configuration", cfgStatus.K8sConfiguration)
+		fmt.Printf("%-34s: %s\n", "k8s-endpoint", cfgStatus.K8sEndpoint)
+		fmt.Printf("%-34s: %s\n", "PolicyEnforcement", cfgStatus.Realized.PolicyEnforcement)
 		if cfgStatus.NodeMonitor != nil {
-			fmt.Printf("%-24s %d\n", "MonitorNumPages", cfgStatus.NodeMonitor.Npages)
+			fmt.Printf("%-34s: %d\n", "MonitorNumPages", cfgStatus.NodeMonitor.Npages)
 		}
 		return
 	}
diff --git a/cilium/cmd/config_get.go b/cilium/cmd/config_get.go
new file mode 100644
index 0000000000000..c42dc0e63f656
--- /dev/null
+++ b/cilium/cmd/config_get.go
@@ -0,0 +1,53 @@
+// Copyright 2017-2018 Authors of Cilium
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/cilium/cilium/pkg/command"
+	"github.com/iancoleman/strcase"
+	"github.com/spf13/cobra"
+)
+
+// configGetCmd represents the config get command
+var configGetCmd = &cobra.Command{
+	Use:    "get <config name>",
+	Short:  "Retrieve cilium configuration",
+	PreRun: requireConfigName,
+	Run: func(cmd *cobra.Command, args []string) {
+		configName := strcase.ToSnake(args[0])
+		resp, err := client.ConfigGet()
+		if err != nil {
+			Fatalf("Error while retrieving configuration: %s", err)
+		}
+		if resp.Status == nil {
+			Fatalf("Empty configuration status returned")
+		}
+
+		cfgStatusMap := resp.Status.DaemonConfigurationMap
+		configMap := mapKeysToSnakeCase(cfgStatusMap)
+		if id, ok := configMap[configName]; ok {
+			fmt.Printf("%v\n", id)
+		} else {
+			fmt.Printf("Configuration does not exist\n")
+		}
+	},
+}
+
+func init() {
+	configCmd.AddCommand(configGetCmd)
+	command.AddJSONOutput(configGetCmd)
+}
diff --git a/cilium/cmd/helpers.go b/cilium/cmd/helpers.go
index 640ce0df27197..d4b23733bdb99 100644
--- a/cilium/cmd/helpers.go
+++ b/cilium/cmd/helpers.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"reflect"
 	"regexp"
 	"sort"
 	"strconv"
@@ -25,6 +26,7 @@ import (
 	"github.com/cilium/cilium/pkg/option"
 	"github.com/cilium/cilium/pkg/policy/trafficdirection"
 	"github.com/cilium/cilium/pkg/u8proto"
+	"github.com/iancoleman/strcase"
 
 	"github.com/spf13/cobra"
 )
@@ -90,6 +92,16 @@ func requirePath(cmd *cobra.Command, args []string) {
 	}
 }
 
+func requireConfigName(cmd *cobra.Command, args []string) {
+	if len(args) < 1 {
+		Usagef(cmd, "Missing config name argument")
+	}
+
+	if args[0] == "" {
+		Usagef(cmd, "Empty config argument")
+	}
+}
+
 func requireServiceID(cmd *cobra.Command, args []string) {
 	if len(args) < 1 {
 		Usagef(cmd, "Missing service id argument")
@@ -370,13 +382,26 @@ func dumpConfig(Opts map[string]string) {
 		value = Opts[k]
 		if enabled, err := option.NormalizeBool(value); err != nil {
 			// If it cannot be parsed as a bool, just format the value.
-			fmt.Printf("%-24s %s\n", k, value)
+			fmt.Printf("%-34s: %s\n", k, value)
 		} else if enabled == option.OptionDisabled {
-			fmt.Printf("%-24s %s\n", k, "Disabled")
+			fmt.Printf("%-34s: %s\n", k, "Disabled")
 		} else {
-			fmt.Printf("%-24s %s\n", k, "Enabled")
+			fmt.Printf("%-34s: %s\n", k, "Enabled")
+		}
+	}
+}
+
+func mapKeysToSnakeCase(s map[string]interface{}) map[string]interface{} {
+	m := make(map[string]interface{})
+	for k, v := range s {
+		if reflect.ValueOf(v).Kind() == reflect.Map {
+			for i, j := range v.(map[string]interface{}) {
+				m[strcase.ToSnake(i)] = j
+			}
 		}
+		m[strcase.ToSnake(k)] = v
 	}
+	return m
 }
 
 // getIpv6EnableStatus api returns the EnableIPv6 status
diff --git a/go.mod b/go.mod
index 08d8508e4e721..18628d3cfe995 100644
--- a/go.mod
+++ b/go.mod
@@ -50,6 +50,7 @@ require (
 	github.com/hashicorp/consul/api v1.3.0
 	github.com/hashicorp/go-immutable-radix v1.3.0
 	github.com/hashicorp/golang-lru v0.5.4
+	github.com/iancoleman/strcase v0.1.3
 	// must be bound to this old version not to break libnetwork
 	github.com/ishidawataru/sctp v0.0.0-20180213033435-07191f837fed // indirect
 	github.com/jeremywohl/flatten v1.0.1
diff --git a/go.sum b/go.sum
index 96b8fa9193205..ff7f62d004050 100644
--- a/go.sum
+++ b/go.sum
@@ -581,6 +581,8 @@ github.com/hashicorp/serf v0.8.2 h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
+github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
+github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
diff --git a/vendor/github.com/iancoleman/strcase/.travis.yml b/vendor/github.com/iancoleman/strcase/.travis.yml
new file mode 100644
index 0000000000000..79ebc5693be1d
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/.travis.yml
@@ -0,0 +1,10 @@
+sudo: false
+language: go
+go:
+  - 1.10.x
+  - 1.11.x
+  - 1.12.x
+  - 1.13.x
+  - 1.14.x
+  - 1.15.x
+  - master
diff --git a/vendor/github.com/iancoleman/strcase/LICENSE b/vendor/github.com/iancoleman/strcase/LICENSE
new file mode 100644
index 0000000000000..3e87ff70e77c4
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Ian Coleman
+Copyright (c) 2018 Ma_124, <github.com/Ma124>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, Subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or Substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/github.com/iancoleman/strcase/README.md b/vendor/github.com/iancoleman/strcase/README.md
new file mode 100644
index 0000000000000..7e935eb032abd
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/README.md
@@ -0,0 +1,59 @@
+# strcase
+[![Godoc Reference](https://godoc.org/github.com/iancoleman/strcase?status.svg)](http://godoc.org/github.com/iancoleman/strcase)
+[![Build Status](https://travis-ci.org/iancoleman/strcase.svg)](https://travis-ci.org/iancoleman/strcase)
+[![Coverage](http://gocover.io/_badge/github.com/iancoleman/strcase?0)](http://gocover.io/github.com/iancoleman/strcase)
+[![Go Report Card](https://goreportcard.com/badge/github.com/iancoleman/strcase)](https://goreportcard.com/report/github.com/iancoleman/strcase)
+
+strcase is a go package for converting string case to various cases (e.g. [snake case](https://en.wikipedia.org/wiki/Snake_case) or [camel case](https://en.wikipedia.org/wiki/CamelCase)) to see the full conversion table below.
+
+## Example
+
+```go
+s := "AnyKind of_string"
+```
+
+| Function                                  | Result               |
+|-------------------------------------------|----------------------|
+| `ToSnake(s)`                              | `any_kind_of_string` |
+| `ToSnakeWithIgnore(s, '.')`               | `any_kind.of_string` |
+| `ToScreamingSnake(s)`                     | `ANY_KIND_OF_STRING` |
+| `ToKebab(s)`                              | `any-kind-of-string` |
+| `ToScreamingKebab(s)`                     | `ANY-KIND-OF-STRING` |
+| `ToDelimited(s, '.')`                     | `any.kind.of.string` |
+| `ToScreamingDelimited(s, '.', '', true)`  | `ANY.KIND.OF.STRING` |
+| `ToScreamingDelimited(s, '.', ' ', true)` | `ANY.KIND OF.STRING` |
+| `ToCamel(s)`                              | `AnyKindOfString`    |
+| `ToLowerCamel(s)`                         | `anyKindOfString`    |
+
+
+## Install
+
+```bash
+go get -u github.com/iancoleman/strcase
+```
+
+## Custom Acronyms for ToCamel && ToLowerCamel
+
+Often times text can contain specific acronyms which you need to be handled a certain way.
+Out of the box `strcase` treats the string "ID" as "Id" or "id" but there is no way to cater
+for every case in the wild.
+
+To configure your custom acronym globally you can use the following before running any conversion
+
+```go
+import (
+    "github.com/iancoleman/strcase"
+)
+
+func init() {
+    // results in "Api" using ToCamel("API")
+    // results in "api" using ToLowerCamel("API")
+    strcase.ConfigureAcronym("API", "api")
+    
+    // results in "PostgreSQL" using ToCamel("PostgreSQL")
+    // results in "postgreSQL" using ToLowerCamel("PostgreSQL")
+    strcase.ConfigureAcronym("PostgreSQL", "PostgreSQL")
+
+}
+
+```
diff --git a/vendor/github.com/iancoleman/strcase/acronyms.go b/vendor/github.com/iancoleman/strcase/acronyms.go
new file mode 100644
index 0000000000000..9c3110dfffc05
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/acronyms.go
@@ -0,0 +1,10 @@
+package strcase
+
+var uppercaseAcronym = map[string]string{
+	"ID": "id",
+}
+
+// ConfigureAcronym allows you to add additional words which will be considered acronyms
+func ConfigureAcronym(key, val string) {
+	uppercaseAcronym[key] = val
+}
diff --git a/vendor/github.com/iancoleman/strcase/camel.go b/vendor/github.com/iancoleman/strcase/camel.go
new file mode 100644
index 0000000000000..cd5a260392a2d
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/camel.go
@@ -0,0 +1,80 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Ian Coleman
+ * Copyright (c) 2018 Ma_124, <github.com/Ma124>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, Subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or Substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package strcase
+
+import (
+	"strings"
+)
+
+// Converts a string to CamelCase
+func toCamelInitCase(s string, initCase bool) string {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return s
+	}
+	if a, ok := uppercaseAcronym[s]; ok {
+		s = a
+	}
+
+	n := strings.Builder{}
+	n.Grow(len(s))
+	capNext := initCase
+	for i, v := range []byte(s) {
+		vIsCap := v >= 'A' && v <= 'Z'
+		vIsLow := v >= 'a' && v <= 'z'
+		if capNext {
+			if vIsLow {
+				v += 'A'
+				v -= 'a'
+			}
+		} else if i == 0 {
+			if vIsCap {
+				v += 'a'
+				v -= 'A'
+			}
+		}
+		if vIsCap || vIsLow {
+			n.WriteByte(v)
+			capNext = false
+		} else if vIsNum := v >= '0' && v <= '9'; vIsNum {
+			n.WriteByte(v)
+			capNext = true
+		} else {
+			capNext = v == '_' || v == ' ' || v == '-' || v == '.'
+		}
+	}
+	return n.String()
+}
+
+// ToCamel converts a string to CamelCase
+func ToCamel(s string) string {
+	return toCamelInitCase(s, true)
+}
+
+// ToLowerCamel converts a string to lowerCamelCase
+func ToLowerCamel(s string) string {
+	return toCamelInitCase(s, false)
+}
diff --git a/vendor/github.com/iancoleman/strcase/doc.go b/vendor/github.com/iancoleman/strcase/doc.go
new file mode 100644
index 0000000000000..5e1825b9e04d6
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/doc.go
@@ -0,0 +1,12 @@
+// Package strcase converts strings to various cases. See the conversion table below:
+//   | Function                        | Result             |
+//   |---------------------------------|--------------------|
+//   | ToSnake(s)                      | any_kind_of_string |
+//   | ToScreamingSnake(s)             | ANY_KIND_OF_STRING |
+//   | ToKebab(s)                      | any-kind-of-string |
+//   | ToScreamingKebab(s)             | ANY-KIND-OF-STRING |
+//   | ToDelimited(s, '.')             | any.kind.of.string |
+//   | ToScreamingDelimited(s, '.')    | ANY.KIND.OF.STRING |
+//   | ToCamel(s)                      | AnyKindOfString    |
+//   | ToLowerCamel(s)                 | anyKindOfString    |
+package strcase
diff --git a/vendor/github.com/iancoleman/strcase/snake.go b/vendor/github.com/iancoleman/strcase/snake.go
new file mode 100644
index 0000000000000..cc9ffcbce8945
--- /dev/null
+++ b/vendor/github.com/iancoleman/strcase/snake.go
@@ -0,0 +1,114 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Ian Coleman
+ * Copyright (c) 2018 Ma_124, <github.com/Ma124>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, Subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or Substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package strcase
+
+import (
+	"strings"
+)
+
+// ToSnake converts a string to snake_case
+func ToSnake(s string) string {
+	return ToDelimited(s, '_')
+}
+
+func ToSnakeWithIgnore(s string, ignore uint8) string {
+	return ToScreamingDelimited(s, '_', ignore, false)
+}
+
+// ToScreamingSnake converts a string to SCREAMING_SNAKE_CASE
+func ToScreamingSnake(s string) string {
+	return ToScreamingDelimited(s, '_', 0, true)
+}
+
+// ToKebab converts a string to kebab-case
+func ToKebab(s string) string {
+	return ToDelimited(s, '-')
+}
+
+// ToScreamingKebab converts a string to SCREAMING-KEBAB-CASE
+func ToScreamingKebab(s string) string {
+	return ToScreamingDelimited(s, '-', 0, true)
+}
+
+// ToDelimited converts a string to delimited.snake.case
+// (in this case `delimiter = '.'`)
+func ToDelimited(s string, delimiter uint8) string {
+	return ToScreamingDelimited(s, delimiter, 0, false)
+}
+
+// ToScreamingDelimited converts a string to SCREAMING.DELIMITED.SNAKE.CASE
+// (in this case `delimiter = '.'; screaming = true`)
+// or delimited.snake.case
+// (in this case `delimiter = '.'; screaming = false`)
+func ToScreamingDelimited(s string, delimiter uint8, ignore uint8, screaming bool) string {
+	s = strings.TrimSpace(s)
+	n := strings.Builder{}
+	n.Grow(len(s) + 2) // nominal 2 bytes of extra space for inserted delimiters
+	for i, v := range []byte(s) {
+		vIsCap := v >= 'A' && v <= 'Z'
+		vIsLow := v >= 'a' && v <= 'z'
+		if vIsLow && screaming {
+			v += 'A'
+			v -= 'a'
+		} else if vIsCap && !screaming {
+			v += 'a'
+			v -= 'A'
+		}
+
+		// treat acronyms as words, eg for JSONData -> JSON is a whole word
+		if i+1 < len(s) {
+			next := s[i+1]
+			vIsNum := v >= '0' && v <= '9'
+			nextIsCap := next >= 'A' && next <= 'Z'
+			nextIsLow := next >= 'a' && next <= 'z'
+			nextIsNum := next >= '0' && next <= '9'
+			// add underscore if next letter case type is changed
+			if (vIsCap && (nextIsLow || nextIsNum)) || (vIsLow && (nextIsCap || nextIsNum)) || (vIsNum && (nextIsCap || nextIsLow)) {
+				if prevIgnore := ignore > 0 && i > 0 && s[i-1] == ignore; !prevIgnore {
+					if vIsCap && nextIsLow {
+						if prevIsCap := i > 0 && s[i-1] >= 'A' && s[i-1] <= 'Z'; prevIsCap {
+							n.WriteByte(delimiter)
+						}
+					}
+					n.WriteByte(v)
+					if vIsLow || vIsNum || nextIsNum {
+						n.WriteByte(delimiter)
+					}
+					continue
+				}
+			}
+		}
+
+		if (v == ' ' || v == '_' || v == '-') && uint8(v) != ignore {
+			// replace space/underscore/hyphen with delimiter
+			n.WriteByte(delimiter)
+		} else {
+			n.WriteByte(v)
+		}
+	}
+
+	return n.String()
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8e3358ba90f44..cfce528dce3ab 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -417,6 +417,9 @@ github.com/hashicorp/hcl/json/scanner
 github.com/hashicorp/hcl/json/token
 # github.com/hashicorp/serf v0.8.2
 github.com/hashicorp/serf/coordinate
+# github.com/iancoleman/strcase v0.1.3
+## explicit
+github.com/iancoleman/strcase
 # github.com/imdario/mergo v0.3.5
 github.com/imdario/mergo
 # github.com/inconshreveable/mousetrap v1.0.0

From 026a3b8870d20f9abe21709b982c06088561f685 Mon Sep 17 00:00:00 2001
From: Gaurav Genani <h3llix.pvt@gmail.com>
Date: Tue, 20 Jul 2021 00:09:59 +0530
Subject: [PATCH 3/4] cli: seperate read-only and read-write configuraitons

Add -r flag to show read-only configurations while default cilium config
show read-write configurations

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
---
 Documentation/cmdref/cilium_config.md         |   1 +
 cilium/cmd/config.go                          | 104 ++++++++++------
 cilium/cmd/config_get.go                      |  47 ++++++--
 cilium/cmd/endpoint_config.go                 |   4 +-
 cilium/cmd/helpers.go                         |  36 +++---
 clustermesh-apiserver/main.go                 |   2 +-
 daemon/cmd/config.go                          |   5 +-
 daemon/cmd/daemon.go                          |   2 +-
 daemon/cmd/ipam.go                            |   2 +-
 go.mod                                        |   1 -
 go.sum                                        |   2 -
 pkg/datapath/config.go                        |   2 +-
 pkg/datapath/iptables/iptables.go             |   2 +-
 pkg/ipam/crd.go                               |   6 +-
 pkg/ipam/ipam.go                              |   2 +-
 pkg/ipam/ipam_test.go                         |   2 +-
 pkg/k8s/utils/utils.go                        |   8 +-
 pkg/k8s/watchers/watcher_test.go              |   2 +-
 pkg/option/config.go                          |  32 ++---
 pkg/option/config_test.go                     |   2 +-
 .../github.com/iancoleman/strcase/.travis.yml |  10 --
 vendor/github.com/iancoleman/strcase/LICENSE  |  22 ----
 .../github.com/iancoleman/strcase/README.md   |  59 ---------
 .../github.com/iancoleman/strcase/acronyms.go |  10 --
 vendor/github.com/iancoleman/strcase/camel.go |  80 ------------
 vendor/github.com/iancoleman/strcase/doc.go   |  12 --
 vendor/github.com/iancoleman/strcase/snake.go | 114 ------------------
 vendor/modules.txt                            |   3 -
 28 files changed, 161 insertions(+), 413 deletions(-)
 delete mode 100644 vendor/github.com/iancoleman/strcase/.travis.yml
 delete mode 100644 vendor/github.com/iancoleman/strcase/LICENSE
 delete mode 100644 vendor/github.com/iancoleman/strcase/README.md
 delete mode 100644 vendor/github.com/iancoleman/strcase/acronyms.go
 delete mode 100644 vendor/github.com/iancoleman/strcase/camel.go
 delete mode 100644 vendor/github.com/iancoleman/strcase/doc.go
 delete mode 100644 vendor/github.com/iancoleman/strcase/snake.go

diff --git a/Documentation/cmdref/cilium_config.md b/Documentation/cmdref/cilium_config.md
index 34b3885eaa976..4f112c7550c3c 100644
--- a/Documentation/cmdref/cilium_config.md
+++ b/Documentation/cmdref/cilium_config.md
@@ -15,6 +15,7 @@ cilium config [<option>=(enable|disable) ...] [flags]
       --list-options    List available options
   -n, --num-pages int   Number of pages for perf ring buffer. New values have to be > 0
   -o, --output string   json| jsonpath='{}'
+  -r, --read-only       Display Read Only Configurations
 ```
 
 ### Options inherited from parent commands
diff --git a/cilium/cmd/config.go b/cilium/cmd/config.go
index 12f3b5d41fe29..891093f1204f2 100644
--- a/cilium/cmd/config.go
+++ b/cilium/cmd/config.go
@@ -18,7 +18,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var numPages int
+var (
+	numPages                   int
+	listReadOnlyConfigurations bool
+)
 
 // configCmd represents the config command
 var configCmd = &cobra.Command{
@@ -39,6 +42,7 @@ var configCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(configCmd)
 	configCmd.Flags().BoolVarP(&listOptions, "list-options", "", false, "List available options")
+	configCmd.Flags().BoolVarP(&listReadOnlyConfigurations, "read-only", "r", false, "Display Read Only Configurations")
 	configCmd.Flags().IntVarP(&numPages, "num-pages", "n", 0, "Number of pages for perf ring buffer. New values have to be > 0")
 	command.AddJSONOutput(configCmd)
 }
@@ -60,44 +64,7 @@ func configDaemon(cmd *cobra.Command, opts []string) {
 			dOpts["MonitorNumPages"] = strconv.Itoa(numPages)
 		}
 	} else if len(opts) == 0 {
-		if command.OutputJSON() {
-			if err := command.PrintOutput(cfgStatus.Realized.Options); err != nil {
-				os.Exit(1)
-			}
-			if err := command.PrintOutput(cfgStatus.DaemonConfigurationMap); err != nil {
-				os.Exit(1)
-			}
-			return
-		}
-		fmt.Print("### Read-Only Configurations ###\n\n")
-		keys := make([]string, 0, len(cfgStatus.DaemonConfigurationMap))
-		for k := range cfgStatus.DaemonConfigurationMap {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		for _, k := range keys {
-			v := cfgStatus.DaemonConfigurationMap[k]
-			if reflect.ValueOf(v).Kind() == reflect.Map {
-				mapString := make(map[string]string)
-				for key, value := range v.(map[string]interface{}) {
-					strKey := fmt.Sprintf("%v", key)
-					strValue := fmt.Sprintf("%v", value)
-					mapString[strKey] = strValue
-				}
-				dumpConfig(mapString)
-			} else {
-				fmt.Printf("%-34s: %v\n", k, v)
-			}
-		}
-		dumpConfig(cfgStatus.Immutable)
-		fmt.Print("\n\n##### Read Write Configurations #####\n")
-		dumpConfig(cfgStatus.Realized.Options)
-		fmt.Printf("%-34s: %s\n", "k8s-configuration", cfgStatus.K8sConfiguration)
-		fmt.Printf("%-34s: %s\n", "k8s-endpoint", cfgStatus.K8sEndpoint)
-		fmt.Printf("%-34s: %s\n", "PolicyEnforcement", cfgStatus.Realized.PolicyEnforcement)
-		if cfgStatus.NodeMonitor != nil {
-			fmt.Printf("%-34s: %d\n", "MonitorNumPages", cfgStatus.NodeMonitor.Npages)
-		}
+		printConfigurations(cfgStatus)
 		return
 	}
 
@@ -137,3 +104,62 @@ func configDaemon(cmd *cobra.Command, opts []string) {
 		Fatalf("Unable to change agent configuration: %s\n", err)
 	}
 }
+
+func printConfigurations(cfgStatus *models.DaemonConfigurationStatus) {
+	if command.OutputJSON() {
+		if listReadOnlyConfigurations {
+			if err := command.PrintOutput(cfgStatus.DaemonConfigurationMap); err != nil {
+				os.Exit(1)
+			}
+		} else {
+			if err := command.PrintOutput(cfgStatus.Realized); err != nil {
+				os.Exit(1)
+			}
+		}
+		return
+	}
+	if listReadOnlyConfigurations {
+		dumpReadOnlyConfigs(cfgStatus)
+	} else {
+		dumpReadWriteConfigs(cfgStatus)
+	}
+}
+
+func dumpReadOnlyConfigs(cfgStatus *models.DaemonConfigurationStatus) {
+	fmt.Print("#### Read-Only Configurations ####\n")
+	keys := make([]string, 0, len(cfgStatus.DaemonConfigurationMap))
+	for k := range cfgStatus.DaemonConfigurationMap {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		v := cfgStatus.DaemonConfigurationMap[k]
+		if reflect.ValueOf(v).Kind() == reflect.Map {
+			mapString := make(map[string]string)
+			m, ok := v.(map[string]interface{})
+			if ok {
+				fmt.Println(k)
+				for key, value := range m {
+					mapString[key] = fmt.Sprintf("%v", value)
+				}
+				dumpConfig(mapString, true)
+				continue
+			} else {
+				fmt.Fprintf(os.Stderr, "Error: cannot cast daemon config map to map[string]interface{}\n")
+			}
+		}
+		fmt.Printf("%-34s: %v\n", k, v)
+	}
+	fmt.Printf("%-34s: %s\n", "k8s-configuration", cfgStatus.K8sConfiguration)
+	fmt.Printf("%-34s: %s\n", "k8s-endpoint", cfgStatus.K8sEndpoint)
+	dumpConfig(cfgStatus.Immutable, false)
+}
+
+func dumpReadWriteConfigs(cfgStatus *models.DaemonConfigurationStatus) {
+	fmt.Print("##### Read-Write Configurations #####\n")
+	dumpConfig(cfgStatus.Realized.Options, false)
+	if cfgStatus.NodeMonitor != nil {
+		fmt.Printf("%-34s: %d\n", "MonitorNumPages", cfgStatus.NodeMonitor.Npages)
+	}
+	fmt.Printf("%-34s: %s\n", "PolicyEnforcement", cfgStatus.Realized.PolicyEnforcement)
+}
diff --git a/cilium/cmd/config_get.go b/cilium/cmd/config_get.go
index c42dc0e63f656..a944392b9ccfb 100644
--- a/cilium/cmd/config_get.go
+++ b/cilium/cmd/config_get.go
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 Authors of Cilium
+// Copyright 2021 Authors of Cilium
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,19 +16,26 @@ package cmd
 
 import (
 	"fmt"
+	"regexp"
+	"strings"
 
 	"github.com/cilium/cilium/pkg/command"
-	"github.com/iancoleman/strcase"
+	"github.com/cilium/cilium/test/helpers"
 	"github.com/spf13/cobra"
 )
 
+var (
+	removeHyphen = regexp.MustCompile(`[^\w]`)
+)
+
 // configGetCmd represents the config get command
 var configGetCmd = &cobra.Command{
 	Use:    "get <config name>",
 	Short:  "Retrieve cilium configuration",
 	PreRun: requireConfigName,
 	Run: func(cmd *cobra.Command, args []string) {
-		configName := strcase.ToSnake(args[0])
+		// removing hyphen from the config name and transforming it to lower case
+		configName := removeHyphen.ReplaceAllString(strings.ToLower(args[0]), "")
 		resp, err := client.ConfigGet()
 		if err != nil {
 			Fatalf("Error while retrieving configuration: %s", err)
@@ -37,12 +44,26 @@ var configGetCmd = &cobra.Command{
 			Fatalf("Empty configuration status returned")
 		}
 
-		cfgStatusMap := resp.Status.DaemonConfigurationMap
-		configMap := mapKeysToSnakeCase(cfgStatusMap)
-		if id, ok := configMap[configName]; ok {
-			fmt.Printf("%v\n", id)
+		readWriteConfigMap := make(map[string]interface{})
+		readOnlyConfigMap := resp.Status.DaemonConfigurationMap
+
+		for k, v := range resp.Status.Realized.Options {
+			readWriteConfigMap[k] = v
+		}
+		readWriteConfigMap[helpers.PolicyEnforcement] = resp.Status.Realized.PolicyEnforcement
+
+		// Key values are named as field names of `DaemonConfig` struct
+		// to match configuration input, map keys are transformed to lower case
+		readWriteConfigMap = mapKeysToLowerCase(readWriteConfigMap)
+		readOnlyConfigMap = mapKeysToLowerCase(readOnlyConfigMap)
+
+		// conifgMap holds both read-only and read-write configurations
+		configMap := mergeMaps(readOnlyConfigMap, readWriteConfigMap)
+
+		if value, ok := configMap[configName]; ok {
+			fmt.Printf("%v\n", value)
 		} else {
-			fmt.Printf("Configuration does not exist\n")
+			Fatalf("Configuration does not exist")
 		}
 	},
 }
@@ -51,3 +72,13 @@ func init() {
 	configCmd.AddCommand(configGetCmd)
 	command.AddJSONOutput(configGetCmd)
 }
+
+func requireConfigName(cmd *cobra.Command, args []string) {
+	if len(args) < 1 {
+		Usagef(cmd, "Missing config name argument")
+	}
+
+	if args[0] == "" {
+		Usagef(cmd, "Empty config argument")
+	}
+}
diff --git a/cilium/cmd/endpoint_config.go b/cilium/cmd/endpoint_config.go
index f895329591795..f45851d7dd077 100644
--- a/cilium/cmd/endpoint_config.go
+++ b/cilium/cmd/endpoint_config.go
@@ -62,8 +62,8 @@ func configEndpoint(cmd *cobra.Command, args []string) {
 			return
 		}
 
-		dumpConfig(cfg.Immutable)
-		dumpConfig(cfg.Realized.Options)
+		dumpConfig(cfg.Immutable, false)
+		dumpConfig(cfg.Realized.Options, false)
 		return
 	}
 
diff --git a/cilium/cmd/helpers.go b/cilium/cmd/helpers.go
index d4b23733bdb99..c62cc5c06a7cb 100644
--- a/cilium/cmd/helpers.go
+++ b/cilium/cmd/helpers.go
@@ -26,7 +26,6 @@ import (
 	"github.com/cilium/cilium/pkg/option"
 	"github.com/cilium/cilium/pkg/policy/trafficdirection"
 	"github.com/cilium/cilium/pkg/u8proto"
-	"github.com/iancoleman/strcase"
 
 	"github.com/spf13/cobra"
 )
@@ -92,16 +91,6 @@ func requirePath(cmd *cobra.Command, args []string) {
 	}
 }
 
-func requireConfigName(cmd *cobra.Command, args []string) {
-	if len(args) < 1 {
-		Usagef(cmd, "Missing config name argument")
-	}
-
-	if args[0] == "" {
-		Usagef(cmd, "Empty config argument")
-	}
-}
-
 func requireServiceID(cmd *cobra.Command, args []string) {
 	if len(args) < 1 {
 		Usagef(cmd, "Missing service id argument")
@@ -370,7 +359,7 @@ func updatePolicyKey(pa *PolicyUpdateArgs, add bool) {
 }
 
 // dumpConfig pretty prints boolean options
-func dumpConfig(Opts map[string]string) {
+func dumpConfig(Opts map[string]string, indented bool) {
 	opts := []string{}
 	for k := range Opts {
 		opts = append(opts, k)
@@ -380,26 +369,30 @@ func dumpConfig(Opts map[string]string) {
 	for _, k := range opts {
 		// XXX: Reuse the format function from *option.Library
 		value = Opts[k]
+		formatStr := "%-34s: %s\n"
+		if indented {
+			formatStr = "\t%-26s: %s\n"
+		}
 		if enabled, err := option.NormalizeBool(value); err != nil {
 			// If it cannot be parsed as a bool, just format the value.
-			fmt.Printf("%-34s: %s\n", k, value)
+			fmt.Printf(formatStr, k, value)
 		} else if enabled == option.OptionDisabled {
-			fmt.Printf("%-34s: %s\n", k, "Disabled")
+			fmt.Printf(formatStr, k, "Disabled")
 		} else {
-			fmt.Printf("%-34s: %s\n", k, "Enabled")
+			fmt.Printf(formatStr, k, "Enabled")
 		}
 	}
 }
 
-func mapKeysToSnakeCase(s map[string]interface{}) map[string]interface{} {
+func mapKeysToLowerCase(s map[string]interface{}) map[string]interface{} {
 	m := make(map[string]interface{})
 	for k, v := range s {
 		if reflect.ValueOf(v).Kind() == reflect.Map {
 			for i, j := range v.(map[string]interface{}) {
-				m[strcase.ToSnake(i)] = j
+				m[strings.ToLower(i)] = j
 			}
 		}
-		m[strcase.ToSnake(k)] = v
+		m[strings.ToLower(k)] = v
 	}
 	return m
 }
@@ -431,3 +424,10 @@ func getIpv6EnableStatus() bool {
 	// returning the EnableIPv6 default status
 	return defaults.EnableIPv6
 }
+
+func mergeMaps(m1, m2 map[string]interface{}) map[string]interface{} {
+	for k, v := range m1 {
+		m2[k] = v
+	}
+	return m2
+}
diff --git a/clustermesh-apiserver/main.go b/clustermesh-apiserver/main.go
index 50b72ed02f933..a356d284364e6 100644
--- a/clustermesh-apiserver/main.go
+++ b/clustermesh-apiserver/main.go
@@ -60,7 +60,7 @@ func (c configuration) LocalClusterName() string {
 	return c.clusterName
 }
 
-func (c configuration) K8sServiceProxyName() string {
+func (c configuration) K8sServiceProxyNameValue() string {
 	return c.serviceProxyName
 }
 
diff --git a/daemon/cmd/config.go b/daemon/cmd/config.go
index 096bb46de9686..49b619f2beb29 100644
--- a/daemon/cmd/config.go
+++ b/daemon/cmd/config.go
@@ -160,7 +160,10 @@ func (h *getConfig) Handle(params GetConfigParams) middleware.Responder {
 
 	for i := 0; i < e.NumField(); i++ {
 		if e.Field(i).Kind() != reflect.Func {
-			m[e.Type().Field(i).Name] = e.Field(i).Interface()
+			// Remove configurable opttions from read-only map
+			if e.Type().Field(i).Name != "Opts" {
+				m[e.Type().Field(i).Name] = e.Field(i).Interface()
+			}
 		}
 	}
 
diff --git a/daemon/cmd/daemon.go b/daemon/cmd/daemon.go
index f40704199ac2c..431993dcf0a9d 100644
--- a/daemon/cmd/daemon.go
+++ b/daemon/cmd/daemon.go
@@ -267,7 +267,7 @@ func restoreCiliumHostIPs(ipv6 bool, fromK8s net.IP) {
 		switch option.Config.IPAMMode() {
 		case ipamOption.IPAMCRD, ipamOption.IPAMENI, ipamOption.IPAMAzure, ipamOption.IPAMAlibabaCloud:
 			// The native routing CIDR is the pod CIDR in these IPAM modes.
-			cidr = option.Config.IPv4NativeRoutingCIDR()
+			cidr = option.Config.GetIPv4NativeRoutingCIDR()
 		default:
 			cidr = node.GetIPv4AllocRange()
 		}
diff --git a/daemon/cmd/ipam.go b/daemon/cmd/ipam.go
index 34c4d7d38b649..fa4af325d559b 100644
--- a/daemon/cmd/ipam.go
+++ b/daemon/cmd/ipam.go
@@ -327,7 +327,7 @@ func (d *Daemon) allocateIPs() error {
 	if option.Config.EnableIPv4 {
 		log.Infof("  IPv4 allocation prefix: %s", node.GetIPv4AllocRange())
 
-		if c := option.Config.IPv4NativeRoutingCIDR(); c != nil {
+		if c := option.Config.GetIPv4NativeRoutingCIDR(); c != nil {
 			log.Infof("  IPv4 native routing prefix: %s", c.String())
 		}
 
diff --git a/go.mod b/go.mod
index 18628d3cfe995..08d8508e4e721 100644
--- a/go.mod
+++ b/go.mod
@@ -50,7 +50,6 @@ require (
 	github.com/hashicorp/consul/api v1.3.0
 	github.com/hashicorp/go-immutable-radix v1.3.0
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/iancoleman/strcase v0.1.3
 	// must be bound to this old version not to break libnetwork
 	github.com/ishidawataru/sctp v0.0.0-20180213033435-07191f837fed // indirect
 	github.com/jeremywohl/flatten v1.0.1
diff --git a/go.sum b/go.sum
index ff7f62d004050..96b8fa9193205 100644
--- a/go.sum
+++ b/go.sum
@@ -581,8 +581,6 @@ github.com/hashicorp/serf v0.8.2 h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
-github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
-github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
diff --git a/pkg/datapath/config.go b/pkg/datapath/config.go
index 2ce858268de7a..85ae88a017161 100644
--- a/pkg/datapath/config.go
+++ b/pkg/datapath/config.go
@@ -120,7 +120,7 @@ type ConfigWriter interface {
 // packet sent from a local endpoint to an IP address belonging to the CIDR
 // should not be SNAT'd.
 func RemoteSNATDstAddrExclusionCIDRv4() *cidr.CIDR {
-	if c := option.Config.IPv4NativeRoutingCIDR(); c != nil {
+	if c := option.Config.GetIPv4NativeRoutingCIDR(); c != nil {
 		// ipv4-native-routing-cidr is set, so use it
 		return c
 	}
diff --git a/pkg/datapath/iptables/iptables.go b/pkg/datapath/iptables/iptables.go
index ce800aa448930..417f1ae176448 100644
--- a/pkg/datapath/iptables/iptables.go
+++ b/pkg/datapath/iptables/iptables.go
@@ -1323,7 +1323,7 @@ func (m *IptablesManager) installRules(ifName string) error {
 	}
 
 	if skipPodTrafficConntrack(false) {
-		podsCIDR := option.Config.IPv4NativeRoutingCIDR().String()
+		podsCIDR := option.Config.GetIPv4NativeRoutingCIDR().String()
 
 		if err := m.addNoTrackPodTrafficRules(ip4tables, podsCIDR); err != nil {
 			return fmt.Errorf("Cannot install rules to skip pod traffic CT: %w", err)
diff --git a/pkg/ipam/crd.go b/pkg/ipam/crd.go
index 62ac70b02b4fa..d844389cc21f8 100644
--- a/pkg/ipam/crd.go
+++ b/pkg/ipam/crd.go
@@ -261,7 +261,7 @@ func (n *nodeStore) hasMinimumIPsInPool() (minimumReached bool, required, numAva
 
 		if n.conf.IPAMMode() == ipamOption.IPAMENI || n.conf.IPAMMode() == ipamOption.IPAMAzure || n.conf.IPAMMode() == ipamOption.IPAMAlibabaCloud {
 			if vpcCIDR := deriveVpcCIDR(n.ownNode); vpcCIDR != nil {
-				if nativeCIDR := n.conf.IPv4NativeRoutingCIDR(); nativeCIDR != nil {
+				if nativeCIDR := n.conf.GetIPv4NativeRoutingCIDR(); nativeCIDR != nil {
 					logFields := logrus.Fields{
 						"vpc-cidr":                   vpcCIDR.String(),
 						option.IPv4NativeRoutingCIDR: nativeCIDR.String(),
@@ -501,8 +501,8 @@ func (a *crdAllocator) buildAllocationResult(ip net.IP, ipInfo *ipamTypes.Alloca
 				result.CIDRs = []string{eni.VPC.PrimaryCIDR}
 				result.CIDRs = append(result.CIDRs, eni.VPC.CIDRs...)
 				// Add manually configured Native Routing CIDR
-				if a.conf.IPv4NativeRoutingCIDR() != nil {
-					result.CIDRs = append(result.CIDRs, a.conf.IPv4NativeRoutingCIDR().String())
+				if a.conf.GetIPv4NativeRoutingCIDR() != nil {
+					result.CIDRs = append(result.CIDRs, a.conf.GetIPv4NativeRoutingCIDR().String())
 				}
 				if eni.Subnet.CIDR != "" {
 					// The gateway for a subnet and VPC is always x.x.x.1
diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go
index 861e54fa91b90..76225125e32a3 100644
--- a/pkg/ipam/ipam.go
+++ b/pkg/ipam/ipam.go
@@ -59,7 +59,7 @@ type Configuration interface {
 
 	// IPv4NativeRoutingCIDR is called by the IPAM module retrieve
 	// the native IPv4 routing CIDR if it exists
-	IPv4NativeRoutingCIDR() *cidr.CIDR
+	GetIPv4NativeRoutingCIDR() *cidr.CIDR
 }
 
 // Owner is the interface the owner of an IPAM allocator has to implement
diff --git a/pkg/ipam/ipam_test.go b/pkg/ipam/ipam_test.go
index 518647fd37be0..a7ef2960a38bf 100644
--- a/pkg/ipam/ipam_test.go
+++ b/pkg/ipam/ipam_test.go
@@ -44,7 +44,7 @@ func (t *testConfiguration) IPv6Enabled() bool                        { return t
 func (t *testConfiguration) HealthCheckingEnabled() bool              { return true }
 func (t *testConfiguration) IPAMMode() string                         { return ipamOption.IPAMClusterPool }
 func (t *testConfiguration) SetIPv4NativeRoutingCIDR(cidr *cidr.CIDR) {}
-func (t *testConfiguration) IPv4NativeRoutingCIDR() *cidr.CIDR        { return nil }
+func (t *testConfiguration) GetIPv4NativeRoutingCIDR() *cidr.CIDR     { return nil }
 
 func (s *IPAMSuite) TestLock(c *C) {
 	fakeAddressing := fake.NewNodeAddressing()
diff --git a/pkg/k8s/utils/utils.go b/pkg/k8s/utils/utils.go
index 5af06e8c0dbae..5cf3e390a3361 100644
--- a/pkg/k8s/utils/utils.go
+++ b/pkg/k8s/utils/utils.go
@@ -61,9 +61,9 @@ func GetObjNamespaceName(obj NamespaceNameGetter) string {
 
 // ServiceConfiguration is the required configuration for GetServiceListOptionsModifier
 type ServiceConfiguration interface {
-	// K8sServiceProxyName must return the value of the proxy name
+	// K8sServiceProxyNameValue must return the value of the proxy name
 	// annotation. If set, only services with this label will be handled.
-	K8sServiceProxyName() string
+	K8sServiceProxyNameValue() string
 }
 
 // GetServiceListOptionsModifier returns the options modifier for service object list.
@@ -85,12 +85,12 @@ func GetServiceListOptionsModifier(cfg ServiceConfiguration) (func(options *v1me
 		return nil, err
 	}
 
-	if cfg.K8sServiceProxyName() == "" {
+	if cfg.K8sServiceProxyNameValue() == "" {
 		serviceNameSelector, err = labels.NewRequirement(
 			serviceProxyNameLabel, selection.DoesNotExist, nil)
 	} else {
 		serviceNameSelector, err = labels.NewRequirement(
-			serviceProxyNameLabel, selection.DoubleEquals, []string{cfg.K8sServiceProxyName()})
+			serviceProxyNameLabel, selection.DoubleEquals, []string{cfg.K8sServiceProxyNameValue()})
 	}
 
 	if err != nil {
diff --git a/pkg/k8s/watchers/watcher_test.go b/pkg/k8s/watchers/watcher_test.go
index 9e9af555de1b9..5f976adf60194 100644
--- a/pkg/k8s/watchers/watcher_test.go
+++ b/pkg/k8s/watchers/watcher_test.go
@@ -41,7 +41,7 @@ var _ = Suite(&K8sWatcherSuite{})
 
 type fakeWatcherConfiguration struct{}
 
-func (f *fakeWatcherConfiguration) K8sServiceProxyName() string {
+func (f *fakeWatcherConfiguration) K8sServiceProxyNameValue() string {
 	return ""
 }
 
diff --git a/pkg/option/config.go b/pkg/option/config.go
index 312f07a8a12bc..b222b9b6e29f8 100644
--- a/pkg/option/config.go
+++ b/pkg/option/config.go
@@ -1768,8 +1768,8 @@ type DaemonConfig struct {
 	// CiliumNode resource for the local node
 	AutoCreateCiliumNodeResource bool
 
-	// Ipv4NativeRoutingCIDR describes a CIDR in which pod IPs are routable
-	Ipv4NativeRoutingCIDR *cidr.CIDR
+	// IPv4NativeRoutingCIDR describes a CIDR in which pod IPs are routable
+	IPv4NativeRoutingCIDR *cidr.CIDR
 
 	// EgressMasqueradeInterfaces is the selector used to select interfaces
 	// subject to egress masquerading
@@ -1919,12 +1919,12 @@ type DaemonConfig struct {
 	// LBMapEntries is the maximum number of entries allowed in BPF lbmap.
 	LBMapEntries int
 
-	// K8sServiceProxyNametest is the value of service.kubernetes.io/service-proxy-name label,
+	// K8sServiceProxyName is the value of service.kubernetes.io/service-proxy-name label,
 	// that identifies the service objects Cilium should handle.
 	// If the provided value is an empty string, Cilium will manage service objects when
 	// the label is not present. For more details -
 	// https://github.com/kubernetes/enhancements/blob/master/keps/sig-network/0031-20181017-kube-proxy-services-optional.md
-	K8sServiceProxyNametest string
+	K8sServiceProxyName string
 
 	// APIRateLimitName enables configuration of the API rate limits
 	APIRateLimit map[string]string
@@ -2018,10 +2018,10 @@ var (
 	}
 )
 
-// IPv4NativeRoutingCIDR returns the native routing CIDR if configured
-func (c *DaemonConfig) IPv4NativeRoutingCIDR() (cidr *cidr.CIDR) {
+// GetIPv4NativeRoutingCIDR returns the native routing CIDR if configured
+func (c *DaemonConfig) GetIPv4NativeRoutingCIDR() (cidr *cidr.CIDR) {
 	c.ConfigPatchMutex.RLock()
-	cidr = c.Ipv4NativeRoutingCIDR
+	cidr = c.IPv4NativeRoutingCIDR
 	c.ConfigPatchMutex.RUnlock()
 	return
 }
@@ -2029,7 +2029,7 @@ func (c *DaemonConfig) IPv4NativeRoutingCIDR() (cidr *cidr.CIDR) {
 // SetIPv4NativeRoutingCIDR sets the native routing CIDR
 func (c *DaemonConfig) SetIPv4NativeRoutingCIDR(cidr *cidr.CIDR) {
 	c.ConfigPatchMutex.Lock()
-	c.Ipv4NativeRoutingCIDR = cidr
+	c.IPv4NativeRoutingCIDR = cidr
 	c.ConfigPatchMutex.Unlock()
 }
 
@@ -2139,8 +2139,8 @@ func (c *DaemonConfig) LocalClusterName() string {
 // K8sServiceProxyName returns the required value for the
 // service.kubernetes.io/service-proxy-name label in order for services to be
 // handled.
-func (c *DaemonConfig) K8sServiceProxyName() string {
-	return c.K8sServiceProxyNametest
+func (c *DaemonConfig) K8sServiceProxyNameValue() string {
+	return c.K8sServiceProxyName
 }
 
 // CiliumNamespaceName returns the name of the namespace in which Cilium is
@@ -2515,7 +2515,7 @@ func (c *DaemonConfig) Populate() {
 	c.PolicyAuditMode = viper.GetBool(PolicyAuditModeArg)
 	c.EnableIPv4FragmentsTracking = viper.GetBool(EnableIPv4FragmentsTrackingName)
 	c.FragmentsMapEntries = viper.GetInt(FragmentsMapEntriesName)
-	c.K8sServiceProxyNametest = viper.GetString(K8sServiceProxyName)
+	c.K8sServiceProxyName = viper.GetString(K8sServiceProxyName)
 	c.CRDWaitTimeout = viper.GetDuration(CRDWaitTimeout)
 	c.LoadBalancerDSRDispatch = viper.GetString(LoadBalancerDSRDispatch)
 	c.LoadBalancerDSRL4Xlate = viper.GetString(LoadBalancerDSRL4Xlate)
@@ -2546,15 +2546,15 @@ func (c *DaemonConfig) Populate() {
 	}
 
 	if nativeRoutingCIDR != "" {
-		c.Ipv4NativeRoutingCIDR = cidr.MustParseCIDR(nativeRoutingCIDR)
+		c.IPv4NativeRoutingCIDR = cidr.MustParseCIDR(nativeRoutingCIDR)
 
-		if len(c.Ipv4NativeRoutingCIDR.IP) != net.IPv4len {
+		if len(c.IPv4NativeRoutingCIDR.IP) != net.IPv4len {
 			log.Fatalf("%s must be an IPv4 CIDR", NativeRoutingCIDR)
 		}
 	} else if ipv4NativeRoutingCIDR != "" {
-		c.Ipv4NativeRoutingCIDR = cidr.MustParseCIDR(ipv4NativeRoutingCIDR)
+		c.IPv4NativeRoutingCIDR = cidr.MustParseCIDR(ipv4NativeRoutingCIDR)
 
-		if len(c.Ipv4NativeRoutingCIDR.IP) != net.IPv4len {
+		if len(c.IPv4NativeRoutingCIDR.IP) != net.IPv4len {
 			log.Fatalf("%s must be an IPv4 CIDR", IPv4NativeRoutingCIDR)
 		}
 	}
@@ -2925,7 +2925,7 @@ func (c *DaemonConfig) checkMapSizeLimits() error {
 }
 
 func (c *DaemonConfig) checkIPv4NativeRoutingCIDR() error {
-	if c.IPv4NativeRoutingCIDR() == nil && c.EnableIPv4Masquerade && c.Tunnel == TunnelDisabled &&
+	if c.GetIPv4NativeRoutingCIDR() == nil && c.EnableIPv4Masquerade && c.Tunnel == TunnelDisabled &&
 		c.IPAMMode() != ipamOption.IPAMENI && c.EnableIPv4 && c.IPAMMode() != ipamOption.IPAMAlibabaCloud {
 		return fmt.Errorf(
 			"native routing cidr must be configured with option --%s "+
diff --git a/pkg/option/config_test.go b/pkg/option/config_test.go
index d33acae2eae97..820df38f30406 100644
--- a/pkg/option/config_test.go
+++ b/pkg/option/config_test.go
@@ -486,7 +486,7 @@ func TestCheckIPv4NativeRoutingCIDR(t *testing.T) {
 				EnableIPv6Masquerade:  true,
 				Tunnel:                TunnelDisabled,
 				IPAM:                  ipamOption.IPAMAzure,
-				Ipv4NativeRoutingCIDR: cidr.MustParseCIDR("10.127.64.0/18"),
+				IPv4NativeRoutingCIDR: cidr.MustParseCIDR("10.127.64.0/18"),
 				EnableIPv4:            true,
 			},
 			wantErr: false,
diff --git a/vendor/github.com/iancoleman/strcase/.travis.yml b/vendor/github.com/iancoleman/strcase/.travis.yml
deleted file mode 100644
index 79ebc5693be1d..0000000000000
--- a/vendor/github.com/iancoleman/strcase/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo: false
-language: go
-go:
-  - 1.10.x
-  - 1.11.x
-  - 1.12.x
-  - 1.13.x
-  - 1.14.x
-  - 1.15.x
-  - master
diff --git a/vendor/github.com/iancoleman/strcase/LICENSE b/vendor/github.com/iancoleman/strcase/LICENSE
deleted file mode 100644
index 3e87ff70e77c4..0000000000000
--- a/vendor/github.com/iancoleman/strcase/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Ian Coleman
-Copyright (c) 2018 Ma_124, <github.com/Ma124>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, Subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or Substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/iancoleman/strcase/README.md b/vendor/github.com/iancoleman/strcase/README.md
deleted file mode 100644
index 7e935eb032abd..0000000000000
--- a/vendor/github.com/iancoleman/strcase/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# strcase
-[![Godoc Reference](https://godoc.org/github.com/iancoleman/strcase?status.svg)](http://godoc.org/github.com/iancoleman/strcase)
-[![Build Status](https://travis-ci.org/iancoleman/strcase.svg)](https://travis-ci.org/iancoleman/strcase)
-[![Coverage](http://gocover.io/_badge/github.com/iancoleman/strcase?0)](http://gocover.io/github.com/iancoleman/strcase)
-[![Go Report Card](https://goreportcard.com/badge/github.com/iancoleman/strcase)](https://goreportcard.com/report/github.com/iancoleman/strcase)
-
-strcase is a go package for converting string case to various cases (e.g. [snake case](https://en.wikipedia.org/wiki/Snake_case) or [camel case](https://en.wikipedia.org/wiki/CamelCase)) to see the full conversion table below.
-
-## Example
-
-```go
-s := "AnyKind of_string"
-```
-
-| Function                                  | Result               |
-|-------------------------------------------|----------------------|
-| `ToSnake(s)`                              | `any_kind_of_string` |
-| `ToSnakeWithIgnore(s, '.')`               | `any_kind.of_string` |
-| `ToScreamingSnake(s)`                     | `ANY_KIND_OF_STRING` |
-| `ToKebab(s)`                              | `any-kind-of-string` |
-| `ToScreamingKebab(s)`                     | `ANY-KIND-OF-STRING` |
-| `ToDelimited(s, '.')`                     | `any.kind.of.string` |
-| `ToScreamingDelimited(s, '.', '', true)`  | `ANY.KIND.OF.STRING` |
-| `ToScreamingDelimited(s, '.', ' ', true)` | `ANY.KIND OF.STRING` |
-| `ToCamel(s)`                              | `AnyKindOfString`    |
-| `ToLowerCamel(s)`                         | `anyKindOfString`    |
-
-
-## Install
-
-```bash
-go get -u github.com/iancoleman/strcase
-```
-
-## Custom Acronyms for ToCamel && ToLowerCamel
-
-Often times text can contain specific acronyms which you need to be handled a certain way.
-Out of the box `strcase` treats the string "ID" as "Id" or "id" but there is no way to cater
-for every case in the wild.
-
-To configure your custom acronym globally you can use the following before running any conversion
-
-```go
-import (
-    "github.com/iancoleman/strcase"
-)
-
-func init() {
-    // results in "Api" using ToCamel("API")
-    // results in "api" using ToLowerCamel("API")
-    strcase.ConfigureAcronym("API", "api")
-    
-    // results in "PostgreSQL" using ToCamel("PostgreSQL")
-    // results in "postgreSQL" using ToLowerCamel("PostgreSQL")
-    strcase.ConfigureAcronym("PostgreSQL", "PostgreSQL")
-
-}
-
-```
diff --git a/vendor/github.com/iancoleman/strcase/acronyms.go b/vendor/github.com/iancoleman/strcase/acronyms.go
deleted file mode 100644
index 9c3110dfffc05..0000000000000
--- a/vendor/github.com/iancoleman/strcase/acronyms.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package strcase
-
-var uppercaseAcronym = map[string]string{
-	"ID": "id",
-}
-
-// ConfigureAcronym allows you to add additional words which will be considered acronyms
-func ConfigureAcronym(key, val string) {
-	uppercaseAcronym[key] = val
-}
diff --git a/vendor/github.com/iancoleman/strcase/camel.go b/vendor/github.com/iancoleman/strcase/camel.go
deleted file mode 100644
index cd5a260392a2d..0000000000000
--- a/vendor/github.com/iancoleman/strcase/camel.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Ian Coleman
- * Copyright (c) 2018 Ma_124, <github.com/Ma124>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, Subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or Substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package strcase
-
-import (
-	"strings"
-)
-
-// Converts a string to CamelCase
-func toCamelInitCase(s string, initCase bool) string {
-	s = strings.TrimSpace(s)
-	if s == "" {
-		return s
-	}
-	if a, ok := uppercaseAcronym[s]; ok {
-		s = a
-	}
-
-	n := strings.Builder{}
-	n.Grow(len(s))
-	capNext := initCase
-	for i, v := range []byte(s) {
-		vIsCap := v >= 'A' && v <= 'Z'
-		vIsLow := v >= 'a' && v <= 'z'
-		if capNext {
-			if vIsLow {
-				v += 'A'
-				v -= 'a'
-			}
-		} else if i == 0 {
-			if vIsCap {
-				v += 'a'
-				v -= 'A'
-			}
-		}
-		if vIsCap || vIsLow {
-			n.WriteByte(v)
-			capNext = false
-		} else if vIsNum := v >= '0' && v <= '9'; vIsNum {
-			n.WriteByte(v)
-			capNext = true
-		} else {
-			capNext = v == '_' || v == ' ' || v == '-' || v == '.'
-		}
-	}
-	return n.String()
-}
-
-// ToCamel converts a string to CamelCase
-func ToCamel(s string) string {
-	return toCamelInitCase(s, true)
-}
-
-// ToLowerCamel converts a string to lowerCamelCase
-func ToLowerCamel(s string) string {
-	return toCamelInitCase(s, false)
-}
diff --git a/vendor/github.com/iancoleman/strcase/doc.go b/vendor/github.com/iancoleman/strcase/doc.go
deleted file mode 100644
index 5e1825b9e04d6..0000000000000
--- a/vendor/github.com/iancoleman/strcase/doc.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Package strcase converts strings to various cases. See the conversion table below:
-//   | Function                        | Result             |
-//   |---------------------------------|--------------------|
-//   | ToSnake(s)                      | any_kind_of_string |
-//   | ToScreamingSnake(s)             | ANY_KIND_OF_STRING |
-//   | ToKebab(s)                      | any-kind-of-string |
-//   | ToScreamingKebab(s)             | ANY-KIND-OF-STRING |
-//   | ToDelimited(s, '.')             | any.kind.of.string |
-//   | ToScreamingDelimited(s, '.')    | ANY.KIND.OF.STRING |
-//   | ToCamel(s)                      | AnyKindOfString    |
-//   | ToLowerCamel(s)                 | anyKindOfString    |
-package strcase
diff --git a/vendor/github.com/iancoleman/strcase/snake.go b/vendor/github.com/iancoleman/strcase/snake.go
deleted file mode 100644
index cc9ffcbce8945..0000000000000
--- a/vendor/github.com/iancoleman/strcase/snake.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Ian Coleman
- * Copyright (c) 2018 Ma_124, <github.com/Ma124>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, Subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or Substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package strcase
-
-import (
-	"strings"
-)
-
-// ToSnake converts a string to snake_case
-func ToSnake(s string) string {
-	return ToDelimited(s, '_')
-}
-
-func ToSnakeWithIgnore(s string, ignore uint8) string {
-	return ToScreamingDelimited(s, '_', ignore, false)
-}
-
-// ToScreamingSnake converts a string to SCREAMING_SNAKE_CASE
-func ToScreamingSnake(s string) string {
-	return ToScreamingDelimited(s, '_', 0, true)
-}
-
-// ToKebab converts a string to kebab-case
-func ToKebab(s string) string {
-	return ToDelimited(s, '-')
-}
-
-// ToScreamingKebab converts a string to SCREAMING-KEBAB-CASE
-func ToScreamingKebab(s string) string {
-	return ToScreamingDelimited(s, '-', 0, true)
-}
-
-// ToDelimited converts a string to delimited.snake.case
-// (in this case `delimiter = '.'`)
-func ToDelimited(s string, delimiter uint8) string {
-	return ToScreamingDelimited(s, delimiter, 0, false)
-}
-
-// ToScreamingDelimited converts a string to SCREAMING.DELIMITED.SNAKE.CASE
-// (in this case `delimiter = '.'; screaming = true`)
-// or delimited.snake.case
-// (in this case `delimiter = '.'; screaming = false`)
-func ToScreamingDelimited(s string, delimiter uint8, ignore uint8, screaming bool) string {
-	s = strings.TrimSpace(s)
-	n := strings.Builder{}
-	n.Grow(len(s) + 2) // nominal 2 bytes of extra space for inserted delimiters
-	for i, v := range []byte(s) {
-		vIsCap := v >= 'A' && v <= 'Z'
-		vIsLow := v >= 'a' && v <= 'z'
-		if vIsLow && screaming {
-			v += 'A'
-			v -= 'a'
-		} else if vIsCap && !screaming {
-			v += 'a'
-			v -= 'A'
-		}
-
-		// treat acronyms as words, eg for JSONData -> JSON is a whole word
-		if i+1 < len(s) {
-			next := s[i+1]
-			vIsNum := v >= '0' && v <= '9'
-			nextIsCap := next >= 'A' && next <= 'Z'
-			nextIsLow := next >= 'a' && next <= 'z'
-			nextIsNum := next >= '0' && next <= '9'
-			// add underscore if next letter case type is changed
-			if (vIsCap && (nextIsLow || nextIsNum)) || (vIsLow && (nextIsCap || nextIsNum)) || (vIsNum && (nextIsCap || nextIsLow)) {
-				if prevIgnore := ignore > 0 && i > 0 && s[i-1] == ignore; !prevIgnore {
-					if vIsCap && nextIsLow {
-						if prevIsCap := i > 0 && s[i-1] >= 'A' && s[i-1] <= 'Z'; prevIsCap {
-							n.WriteByte(delimiter)
-						}
-					}
-					n.WriteByte(v)
-					if vIsLow || vIsNum || nextIsNum {
-						n.WriteByte(delimiter)
-					}
-					continue
-				}
-			}
-		}
-
-		if (v == ' ' || v == '_' || v == '-') && uint8(v) != ignore {
-			// replace space/underscore/hyphen with delimiter
-			n.WriteByte(delimiter)
-		} else {
-			n.WriteByte(v)
-		}
-	}
-
-	return n.String()
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index cfce528dce3ab..8e3358ba90f44 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -417,9 +417,6 @@ github.com/hashicorp/hcl/json/scanner
 github.com/hashicorp/hcl/json/token
 # github.com/hashicorp/serf v0.8.2
 github.com/hashicorp/serf/coordinate
-# github.com/iancoleman/strcase v0.1.3
-## explicit
-github.com/iancoleman/strcase
 # github.com/imdario/mergo v0.3.5
 github.com/imdario/mergo
 # github.com/inconshreveable/mousetrap v1.0.0

From 48ffe8ec420af47b5a9cb58d28864f83902afd1c Mon Sep 17 00:00:00 2001
From: Gaurav Genani <h3llix.pvt@gmail.com>
Date: Mon, 9 Aug 2021 14:38:04 +0530
Subject: [PATCH 4/4] cli: add -a flag to list all cilium configurations

Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
---
 Documentation/cmdref/cilium_config.md |  1 +
 cilium/cmd/config.go                  |  9 +++++
 pkg/command/output.go                 | 57 +++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/Documentation/cmdref/cilium_config.md b/Documentation/cmdref/cilium_config.md
index 4f112c7550c3c..6e9dc16b069e4 100644
--- a/Documentation/cmdref/cilium_config.md
+++ b/Documentation/cmdref/cilium_config.md
@@ -11,6 +11,7 @@ cilium config [<option>=(enable|disable) ...] [flags]
 ### Options
 
 ```
+  -a, --all             Display All Cilium Configurations
   -h, --help            help for config
       --list-options    List available options
   -n, --num-pages int   Number of pages for perf ring buffer. New values have to be > 0
diff --git a/cilium/cmd/config.go b/cilium/cmd/config.go
index 891093f1204f2..24075250fb8a3 100644
--- a/cilium/cmd/config.go
+++ b/cilium/cmd/config.go
@@ -21,6 +21,7 @@ import (
 var (
 	numPages                   int
 	listReadOnlyConfigurations bool
+	listAllConfigurations      bool
 )
 
 // configCmd represents the config command
@@ -43,6 +44,7 @@ func init() {
 	rootCmd.AddCommand(configCmd)
 	configCmd.Flags().BoolVarP(&listOptions, "list-options", "", false, "List available options")
 	configCmd.Flags().BoolVarP(&listReadOnlyConfigurations, "read-only", "r", false, "Display Read Only Configurations")
+	configCmd.Flags().BoolVarP(&listAllConfigurations, "all", "a", false, "Display All Cilium Configurations")
 	configCmd.Flags().IntVarP(&numPages, "num-pages", "n", 0, "Number of pages for perf ring buffer. New values have to be > 0")
 	command.AddJSONOutput(configCmd)
 }
@@ -111,6 +113,10 @@ func printConfigurations(cfgStatus *models.DaemonConfigurationStatus) {
 			if err := command.PrintOutput(cfgStatus.DaemonConfigurationMap); err != nil {
 				os.Exit(1)
 			}
+		} else if listAllConfigurations {
+			if err := command.PrintOutputWithPatch(cfgStatus.DaemonConfigurationMap, cfgStatus.Realized); err != nil {
+				os.Exit(1)
+			}
 		} else {
 			if err := command.PrintOutput(cfgStatus.Realized); err != nil {
 				os.Exit(1)
@@ -120,6 +126,9 @@ func printConfigurations(cfgStatus *models.DaemonConfigurationStatus) {
 	}
 	if listReadOnlyConfigurations {
 		dumpReadOnlyConfigs(cfgStatus)
+	} else if listAllConfigurations {
+		dumpReadOnlyConfigs(cfgStatus)
+		dumpReadWriteConfigs(cfgStatus)
 	} else {
 		dumpReadWriteConfigs(cfgStatus)
 	}
diff --git a/pkg/command/output.go b/pkg/command/output.go
index 54183cf1220f5..0a57f81395794 100644
--- a/pkg/command/output.go
+++ b/pkg/command/output.go
@@ -40,6 +40,63 @@ func PrintOutput(data interface{}) error {
 	return PrintOutputWithType(data, outputOpt)
 }
 
+//PrintOutput receives an interface and dump the data using the --output flag.
+//ATM only json or jsonpath. In the future yaml
+//PrintOutputWithPatch merges data with patch and dump the data using the --output flag.
+func PrintOutputWithPatch(data interface{}, patch interface{}) error {
+	mergedInterface, err := mergeInterfaces(data, patch)
+	if err != nil {
+		return fmt.Errorf("Unable to merge Interfaces:%v", err)
+	}
+	return PrintOutputWithType(mergedInterface, outputOpt)
+}
+
+func mergeInterfaces(data, patch interface{}) (interface{}, error) {
+	var i1, i2 interface{}
+
+	data1, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	data2, err := json.Marshal(patch)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(data1, &i1)
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(data2, &i2)
+	if err != nil {
+		return nil, err
+	}
+	return recursiveMerge(i1, i2), nil
+}
+
+func recursiveMerge(i1, i2 interface{}) interface{} {
+	switch i1 := i1.(type) {
+	case map[string]interface{}:
+		i2, ok := i2.(map[string]interface{})
+		if !ok {
+			return i1
+		}
+		for k, v2 := range i2 {
+			if v1, ok := i1[k]; ok {
+				i1[k] = recursiveMerge(v1, v2)
+			} else {
+				i1[k] = v2
+			}
+		}
+	case nil:
+		i2, ok := i2.(map[string]interface{})
+		if ok {
+			return i2
+		}
+	}
+	return i1
+}
+
 //PrintOutputWithType receives an interface and dump the data using the --output flag.
 //ATM only json or jsonpath. In the future yaml
 func PrintOutputWithType(data interface{}, outputType string) error {