diff --git a/go.mod b/go.mod index d109f0ea46..49ccbe207e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/blang/semver/v4 v4.0.0 github.com/cilium/charts v0.0.0-20220504171207-4989b5fd96bd - github.com/cilium/cilium v1.12.0-rc1.0.20220502150516-d29221d4dfcc + github.com/cilium/cilium v1.12.0-rc2.0.20220511145855-a1f773994542 github.com/cilium/hubble v0.9.0 github.com/cilium/proxy v0.0.0-20220310090216-617157adcd74 github.com/cilium/workerpool v1.1.2 @@ -39,7 +39,7 @@ require ( cloud.google.com/go/compute v1.5.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.25 // indirect + github.com/Azure/go-autorest/autorest v0.11.27 // indirect github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect @@ -91,7 +91,7 @@ require ( github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/loads v0.21.1 // indirect github.com/go-openapi/runtime v0.24.0 // indirect - github.com/go-openapi/spec v0.20.5 // indirect + github.com/go-openapi/spec v0.20.6 // indirect github.com/go-openapi/swag v0.21.1 // indirect github.com/go-openapi/validate v0.21.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -176,7 +176,7 @@ require ( github.com/russross/blackfriday v1.5.2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/shirou/gopsutil/v3 v3.22.3 // indirect + github.com/shirou/gopsutil/v3 v3.22.4 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect diff --git a/go.sum b/go.sum index 6e2a69ccfb..5dbf554cfb 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSW github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.20/go.mod h1:o3tqFY+QR40VOlk+pV4d77mORO64jOXSgEnPQgLK6JY= -github.com/Azure/go-autorest/autorest v0.11.25 h1:yp+V8DGur2aIUE87ebP8twPLz6k68jtJTlg61mEoByA= -github.com/Azure/go-autorest/autorest v0.11.25/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= +github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= @@ -277,8 +277,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/charts v0.0.0-20220504171207-4989b5fd96bd h1:ffkeipQKgiIhmMAlpXxDTW8eYaek38Y1MhlKSIW6OKM= github.com/cilium/charts v0.0.0-20220504171207-4989b5fd96bd/go.mod h1:M3C9VOlFvRzuV+a01t07Tw4uFLSfkCH3L542IWjf6BU= -github.com/cilium/cilium v1.12.0-rc1.0.20220502150516-d29221d4dfcc h1:oH6lJcjBglkvl/GqDGr5qShLKJvg5oFW7PDIPVRreKU= -github.com/cilium/cilium v1.12.0-rc1.0.20220502150516-d29221d4dfcc/go.mod h1:ezZiofi0sndHOEotGusdHd2cwMSSXhGEV06zlalDXac= +github.com/cilium/cilium v1.12.0-rc2.0.20220511145855-a1f773994542 h1:Dh7+A2r8h5nZ2mBK/LLBzpsJbn0ur2DbvHcmfossa+M= +github.com/cilium/cilium v1.12.0-rc2.0.20220511145855-a1f773994542/go.mod h1:C53mMY6B/LUSbxJXs2hh2iGkG8Uw043NfDQWONKVmFE= github.com/cilium/dns v1.1.4-0.20190417235132-8e25ec9a0ff3/go.mod h1:cXN7jgo+gsGlNvQ7Vqu2ELdc3f7i7PPgupHqSkLzzBo= github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= @@ -611,8 +611,8 @@ github.com/go-openapi/runtime v0.24.0/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvla github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/spec v0.20.5 h1:skHa8av4VnAtJU5zyAUXrrdK/NDiVX8lchbG+BfcdrE= -github.com/go-openapi/spec v0.20.5/go.mod h1:QbfOSIVt3/sac+a1wzmKbbcLXm5NdZnyBZYtCijp43o= +github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= +github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2 h1:5NDNgadiX1Vhemth/TH4gCGopWSTdDjxl60H3B7f+os= @@ -1367,8 +1367,8 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= -github.com/shirou/gopsutil/v3 v3.22.3 h1:UebRzEomgMpv61e3hgD1tGooqX5trFbdU/ehphbHd00= -github.com/shirou/gopsutil/v3 v3.22.3/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM= +github.com/shirou/gopsutil/v3 v3.22.4 h1:srAQaiX6jX/cYL6q29aE0m8lOskT9CurZ9N61YR3yoI= +github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= diff --git a/k8s/client.go b/k8s/client.go index ef28943298..ba97c8f961 100644 --- a/k8s/client.go +++ b/k8s/client.go @@ -556,8 +556,8 @@ func (c *Client) ListCiliumEndpoints(ctx context.Context, namespace string, opti return c.CiliumClientset.CiliumV2().CiliumEndpoints(namespace).List(ctx, options) } -func (c *Client) ListCiliumEnvoyConfigs(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2alpha1.CiliumEnvoyConfigList, error) { - return c.CiliumClientset.CiliumV2alpha1().CiliumEnvoyConfigs(namespace).List(ctx, options) +func (c *Client) ListCiliumEnvoyConfigs(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2.CiliumEnvoyConfigList, error) { + return c.CiliumClientset.CiliumV2().CiliumEnvoyConfigs(namespace).List(ctx, options) } func (c *Client) ListNodes(ctx context.Context, options metav1.ListOptions) (*corev1.NodeList, error) { @@ -604,8 +604,8 @@ func (c *Client) ListCiliumClusterwideNetworkPolicies(ctx context.Context, opts return c.CiliumClientset.CiliumV2().CiliumClusterwideNetworkPolicies().List(ctx, opts) } -func (c *Client) ListCiliumClusterwideEnvoyConfigs(ctx context.Context, opts metav1.ListOptions) (*ciliumv2alpha1.CiliumClusterwideEnvoyConfigList, error) { - return c.CiliumClientset.CiliumV2alpha1().CiliumClusterwideEnvoyConfigs().List(ctx, opts) +func (c *Client) ListCiliumClusterwideEnvoyConfigs(ctx context.Context, opts metav1.ListOptions) (*ciliumv2.CiliumClusterwideEnvoyConfigList, error) { + return c.CiliumClientset.CiliumV2().CiliumClusterwideEnvoyConfigs().List(ctx, opts) } func (c *Client) GetCiliumClusterwideNetworkPolicy(ctx context.Context, name string, opts metav1.GetOptions) (*ciliumv2.CiliumClusterwideNetworkPolicy, error) { diff --git a/sysdump/client.go b/sysdump/client.go index 68cd96a425..865211098e 100644 --- a/sysdump/client.go +++ b/sysdump/client.go @@ -8,8 +8,6 @@ import ( "context" "time" - ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" - ciliumv2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" @@ -17,6 +15,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" + ciliumv2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" + "github.com/cilium/cilium-cli/k8s" ) @@ -33,11 +34,11 @@ type KubernetesClient interface { GetSecret(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.Secret, error) GetVersion(ctx context.Context) (string, error) ListCiliumClusterwideNetworkPolicies(ctx context.Context, opts metav1.ListOptions) (*ciliumv2.CiliumClusterwideNetworkPolicyList, error) - ListCiliumClusterwideEnvoyConfigs(ctx context.Context, opts metav1.ListOptions) (*ciliumv2alpha1.CiliumClusterwideEnvoyConfigList, error) + ListCiliumClusterwideEnvoyConfigs(ctx context.Context, opts metav1.ListOptions) (*ciliumv2.CiliumClusterwideEnvoyConfigList, error) ListCiliumIdentities(ctx context.Context) (*ciliumv2.CiliumIdentityList, error) ListCiliumEgressNATPolicies(ctx context.Context, opts metav1.ListOptions) (*ciliumv2alpha1.CiliumEgressNATPolicyList, error) ListCiliumEndpoints(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2.CiliumEndpointList, error) - ListCiliumEnvoyConfigs(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2alpha1.CiliumEnvoyConfigList, error) + ListCiliumEnvoyConfigs(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2.CiliumEnvoyConfigList, error) ListCiliumLocalRedirectPolicies(ctx context.Context, namespace string, options metav1.ListOptions) (*ciliumv2.CiliumLocalRedirectPolicyList, error) ListCiliumNetworkPolicies(ctx context.Context, namespace string, opts metav1.ListOptions) (*ciliumv2.CiliumNetworkPolicyList, error) ListCiliumNodes(ctx context.Context) (*ciliumv2.CiliumNodeList, error) diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go b/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go index e19ea7556d..b0a53769f2 100644 --- a/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go +++ b/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go @@ -34,8 +34,10 @@ const ( var environments = map[string]Environment{ "AZURECHINACLOUD": ChinaCloud, "AZUREGERMANCLOUD": GermanCloud, + "AZURECLOUD": PublicCloud, "AZUREPUBLICCLOUD": PublicCloud, - "AZUREUSGOVERNMENTCLOUD": USGovernmentCloud, + "AZUREUSGOVERNMENT": USGovernmentCloud, + "AZUREUSGOVERNMENTCLOUD": USGovernmentCloud, //TODO: deprecate } // ResourceIdentifier contains a set of Azure resource IDs. @@ -52,6 +54,7 @@ type ResourceIdentifier struct { SQLDatabase string `json:"sqlDatabase"` CosmosDB string `json:"cosmosDB"` ManagedHSM string `json:"managedHSM"` + MicrosoftGraph string `json:"microsoftGraph"` } // Environment represents a set of endpoints for each of Azure's Clouds. @@ -68,6 +71,7 @@ type Environment struct { GraphEndpoint string `json:"graphEndpoint"` ServiceBusEndpoint string `json:"serviceBusEndpoint"` BatchManagementEndpoint string `json:"batchManagementEndpoint"` + MicrosoftGraphEndpoint string `json:"microsoftGraphEndpoint"` StorageEndpointSuffix string `json:"storageEndpointSuffix"` CosmosDBDNSSuffix string `json:"cosmosDBDNSSuffix"` MariaDBDNSSuffix string `json:"mariaDBDNSSuffix"` @@ -84,6 +88,7 @@ type Environment struct { TokenAudience string `json:"tokenAudience"` APIManagementHostNameSuffix string `json:"apiManagementHostNameSuffix"` SynapseEndpointSuffix string `json:"synapseEndpointSuffix"` + DatalakeSuffix string `json:"datalakeSuffix"` ResourceIdentifiers ResourceIdentifier `json:"resourceIdentifiers"` } @@ -102,6 +107,7 @@ var ( GraphEndpoint: "https://graph.windows.net/", ServiceBusEndpoint: "https://servicebus.windows.net/", BatchManagementEndpoint: "https://batch.core.windows.net/", + MicrosoftGraphEndpoint: "https://graph.microsoft.com/", StorageEndpointSuffix: "core.windows.net", CosmosDBDNSSuffix: "documents.azure.com", MariaDBDNSSuffix: "mariadb.database.azure.com", @@ -118,6 +124,7 @@ var ( TokenAudience: "https://management.azure.com/", APIManagementHostNameSuffix: "azure-api.net", SynapseEndpointSuffix: "dev.azuresynapse.net", + DatalakeSuffix: "azuredatalakestore.net", ResourceIdentifiers: ResourceIdentifier{ Graph: "https://graph.windows.net/", KeyVault: "https://vault.azure.net", @@ -131,6 +138,7 @@ var ( SQLDatabase: "https://database.windows.net/", CosmosDB: "https://cosmos.azure.com", ManagedHSM: "https://managedhsm.azure.net", + MicrosoftGraph: "https://graph.microsoft.com/", }, } @@ -148,6 +156,7 @@ var ( GraphEndpoint: "https://graph.windows.net/", ServiceBusEndpoint: "https://servicebus.usgovcloudapi.net/", BatchManagementEndpoint: "https://batch.core.usgovcloudapi.net/", + MicrosoftGraphEndpoint: "https://graph.microsoft.us/", StorageEndpointSuffix: "core.usgovcloudapi.net", CosmosDBDNSSuffix: "documents.azure.us", MariaDBDNSSuffix: "mariadb.database.usgovcloudapi.net", @@ -163,7 +172,8 @@ var ( ContainerRegistryDNSSuffix: "azurecr.us", TokenAudience: "https://management.usgovcloudapi.net/", APIManagementHostNameSuffix: "azure-api.us", - SynapseEndpointSuffix: NotAvailable, + SynapseEndpointSuffix: "dev.azuresynapse.usgovcloudapi.net", + DatalakeSuffix: NotAvailable, ResourceIdentifiers: ResourceIdentifier{ Graph: "https://graph.windows.net/", KeyVault: "https://vault.usgovcloudapi.net", @@ -172,11 +182,12 @@ var ( OperationalInsights: "https://api.loganalytics.us", OSSRDBMS: "https://ossrdbms-aad.database.usgovcloudapi.net", Storage: "https://storage.azure.com/", - Synapse: NotAvailable, + Synapse: "https://dev.azuresynapse.usgovcloudapi.net", ServiceBus: "https://servicebus.azure.net/", SQLDatabase: "https://database.usgovcloudapi.net/", CosmosDB: "https://cosmos.azure.com", ManagedHSM: NotAvailable, + MicrosoftGraph: "https://graph.microsoft.us/", }, } @@ -194,6 +205,7 @@ var ( GraphEndpoint: "https://graph.chinacloudapi.cn/", ServiceBusEndpoint: "https://servicebus.chinacloudapi.cn/", BatchManagementEndpoint: "https://batch.chinacloudapi.cn/", + MicrosoftGraphEndpoint: "https://microsoftgraph.chinacloudapi.cn/", StorageEndpointSuffix: "core.chinacloudapi.cn", CosmosDBDNSSuffix: "documents.azure.cn", MariaDBDNSSuffix: "mariadb.database.chinacloudapi.cn", @@ -210,6 +222,7 @@ var ( TokenAudience: "https://management.chinacloudapi.cn/", APIManagementHostNameSuffix: "azure-api.cn", SynapseEndpointSuffix: "dev.azuresynapse.azure.cn", + DatalakeSuffix: NotAvailable, ResourceIdentifiers: ResourceIdentifier{ Graph: "https://graph.chinacloudapi.cn/", KeyVault: "https://vault.azure.cn", @@ -223,6 +236,7 @@ var ( SQLDatabase: "https://database.chinacloudapi.cn/", CosmosDB: "https://cosmos.azure.com", ManagedHSM: NotAvailable, + MicrosoftGraph: "https://microsoftgraph.chinacloudapi.cn", }, } @@ -240,6 +254,7 @@ var ( GraphEndpoint: "https://graph.cloudapi.de/", ServiceBusEndpoint: "https://servicebus.cloudapi.de/", BatchManagementEndpoint: "https://batch.cloudapi.de/", + MicrosoftGraphEndpoint: NotAvailable, StorageEndpointSuffix: "core.cloudapi.de", CosmosDBDNSSuffix: "documents.microsoftazure.de", MariaDBDNSSuffix: "mariadb.database.cloudapi.de", @@ -256,6 +271,7 @@ var ( TokenAudience: "https://management.microsoftazure.de/", APIManagementHostNameSuffix: NotAvailable, SynapseEndpointSuffix: NotAvailable, + DatalakeSuffix: NotAvailable, ResourceIdentifiers: ResourceIdentifier{ Graph: "https://graph.cloudapi.de/", KeyVault: "https://vault.microsoftazure.de", @@ -269,6 +285,7 @@ var ( SQLDatabase: "https://database.cloudapi.de/", CosmosDB: "https://cosmos.azure.com", ManagedHSM: NotAvailable, + MicrosoftGraph: NotAvailable, }, } ) diff --git a/vendor/github.com/cilium/cilium/AUTHORS b/vendor/github.com/cilium/cilium/AUTHORS index 13b465f967..f919bfb585 100644 --- a/vendor/github.com/cilium/cilium/AUTHORS +++ b/vendor/github.com/cilium/cilium/AUTHORS @@ -20,6 +20,7 @@ Alexei Starovoitov alexei.starovoitov@gmail.com Alex Romanov alex@romanov.ws Alex Szakaly alex.szakaly@gmail.com Amey Bhide amey@covalent.io +Amol Ambekar ambekara@google.com Amre Shakimov amre@covalent.io Anderson, David L david.l.anderson@intel.com Andor Nemeth andor_nemeth@swissre.com @@ -142,6 +143,7 @@ Fredrik Lönnegren fredrik.lonnegren@gmail.com Fulvio Risso fulvio.risso@polito.it Gaurav Genani h3llix.pvt@gmail.com Gaurav Yadav gaurav.dev.iiitm@gmail.com +Gavin McNair gavin.mcnair@kaluza.com George Gaál gb12335@gmail.com George Kontridze gkontridze@plaid.com Geyslan G. Bem geyslan@gmail.com @@ -177,6 +179,7 @@ Jean Raby jean@raby.sh Jed Salazar jed@isovalent.com Jerry J. Muzsik jerrymuzsik@icloud.com Jess Frazelle acidburn@microsoft.com +Jiang Wang jiang.wang@bytedance.com Jianlin Lv Jianlin.Lv@arm.com JieJhih Jhang jiejhihjhang@gmail.com Jim Angel jimangel@google.com.com @@ -255,6 +258,7 @@ Martynas Pumputis m@lambda.lt Matej Gera matejgera@gmail.com Mathias Herzog mathu@gmx.ch Mathieu Tortuyaux mtortuyaux@microsoft.com +Matt Anderson matanderson@equinix.com Matthew Fenwick mfenwick100@gmail.com Matthew Gumport me@gum.pt Matthieu Antoine matthieu.antoine@jumo.world @@ -263,6 +267,7 @@ Mauricio Vásquez mauricio@kinvolk.io Maxime Visonneau maxime.visonneau@gmail.com Maximilian Bischoff maximilian.bischoff@inovex.de Maximilian Mack max@mack.io +Max Körbächer 16919345+mkorbi@users.noreply.github.com Melissa Peiffer mbp83@nau.edu Michael Fischer fiscmi@amazon.com Michael Fornaro 20387402+xUnholy@users.noreply.github.com @@ -284,12 +289,14 @@ nathannaveen 42319948+nathannaveen@users.noreply.gith Nathan Taylor ntaylor1781@gmail.com necatican necaticanyildirim@gmail.com Neela Jacques neela@isovalent.com +Neil Seward neil.seward@elasticpath.com Neil Wilson neil@aldur.co.uk Nick M 4718+rkage@users.noreply.github.com Nicolas Busseneau nicolas@isovalent.com Nirmoy Das ndas@suse.de Nitish Malhotra nitishm@microsoft.com Noel Georgi git@frezbo.dev +Oilbeater mengxin@alauda.io Ole Markus With o.with@sportradar.com Oliver Wang a0924100192@gmail.com Omar Aloraini ooraini.dev@gmail.com diff --git a/vendor/github.com/cilium/cilium/pkg/client/client.go b/vendor/github.com/cilium/cilium/pkg/client/client.go index 86b25784a1..dbed9d7d9d 100644 --- a/vendor/github.com/cilium/cilium/pkg/client/client.go +++ b/vendor/github.com/cilium/cilium/pkg/client/client.go @@ -355,7 +355,7 @@ func FormatStatusResponse(w io.Writer, sr *models.StatusResponse, sd StatusDetai fmt.Fprintf(w, "IPAM:\t%s\n", sr.Ipam.Status) if sd.AllAddresses { fmt.Fprintf(w, "Allocated addresses:\n") - out := []string{} + out := make([]string, 0, len(sr.Ipam.Allocations)) for ip, owner := range sr.Ipam.Allocations { out = append(out, fmt.Sprintf(" %s (%s)", ip, owner)) } diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/ccec_types.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/ccec_types.go similarity index 98% rename from vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/ccec_types.go rename to vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/ccec_types.go index 62f048e1d9..8628e7fdc1 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/ccec_types.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/ccec_types.go @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright Authors of Cilium -package v2alpha1 +package v2 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/cec_types.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/cec_types.go similarity index 99% rename from vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/cec_types.go rename to vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/cec_types.go index 2361d1c88b..964cb8aac5 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/cec_types.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/cec_types.go @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright Authors of Cilium -package v2alpha1 +package v2 import ( "bytes" diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/logfields.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/logfields.go similarity index 83% rename from vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/logfields.go rename to vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/logfields.go index c8b0e56d14..b4f5563730 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/logfields.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/logfields.go @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright Authors of Cilium -package v2alpha1 +package v2 import ( "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" ) -var log = logging.DefaultLogger.WithField(logfields.LogSubsys, "k8s-apis-cilium.io-v2alpha1") +var log = logging.DefaultLogger.WithField(logfields.LogSubsys, "k8s-apis-cilium.io-v2") diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/register.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/register.go index 4d5907a859..7da09dac50 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/register.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/register.go @@ -23,7 +23,7 @@ const ( // // Maintainers: Run ./Documentation/check-crd-compat-table.sh for each release // Developers: Bump patch for each change in the CRD schema. - CustomResourceDefinitionSchemaVersion = "1.26.1" + CustomResourceDefinitionSchemaVersion = "1.25.2" // CustomResourceDefinitionSchemaVersionKey is key to label which holds the CRD schema version CustomResourceDefinitionSchemaVersionKey = "io.cilium.k8s.crd.schema.version" @@ -125,6 +125,34 @@ const ( // CEWName is the full name of Cilium External Workload CEWName = CEWPluralName + "." + CustomResourceDefinitionGroup + + // Cilium Cluster Envoy Config (CCEC) + + // CCECSingularName is the singular name of Cilium Clusterwide Envoy Config + CCECSingularName = "ciliumclusterwideenvoyconfig" + + // CCECPluralName is the plural name of Cilium Clusterwide Envoy Config + CCECPluralName = "ciliumclusterwideenvoyconfigs" + + // CCECKindDefinition is the kind name of Cilium Clusterwide Envoy Config + CCECKindDefinition = "CiliumClusterwideEnvoyConfig" + + // CCECName is the full name of Cilium Clusterwide Envoy Config + CCECName = CCECPluralName + "." + CustomResourceDefinitionGroup + + // Cilium Envoy Config (CEC) + + // CECSingularName is the singular name of Cilium Envoy Config + CECSingularName = "ciliumenvoyconfig" + + // CECPluralName is the plural name of Cilium Envoy Config + CECPluralName = "ciliumenvoyconfigs" + + // CECKindDefinition is the kind name of Cilium Envoy Config + CECKindDefinition = "CiliumEnvoyConfig" + + // CECName is the full name of Cilium Envoy Config + CECName = CECPluralName + "." + CustomResourceDefinitionGroup ) // SchemeGroupVersion is group version used to register these objects @@ -182,6 +210,10 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CiliumIdentityList{}, &CiliumLocalRedirectPolicy{}, &CiliumLocalRedirectPolicyList{}, + &CiliumEnvoyConfig{}, + &CiliumEnvoyConfigList{}, + &CiliumClusterwideEnvoyConfig{}, + &CiliumClusterwideEnvoyConfigList{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepcopy.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepcopy.go index 15cbc0a978..a37bea7e43 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepcopy.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepcopy.go @@ -14,6 +14,66 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumClusterwideEnvoyConfig) DeepCopyInto(out *CiliumClusterwideEnvoyConfig) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumClusterwideEnvoyConfig. +func (in *CiliumClusterwideEnvoyConfig) DeepCopy() *CiliumClusterwideEnvoyConfig { + if in == nil { + return nil + } + out := new(CiliumClusterwideEnvoyConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CiliumClusterwideEnvoyConfig) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumClusterwideEnvoyConfigList) DeepCopyInto(out *CiliumClusterwideEnvoyConfigList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CiliumClusterwideEnvoyConfig, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumClusterwideEnvoyConfigList. +func (in *CiliumClusterwideEnvoyConfigList) DeepCopy() *CiliumClusterwideEnvoyConfigList { + if in == nil { + return nil + } + out := new(CiliumClusterwideEnvoyConfigList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CiliumClusterwideEnvoyConfigList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CiliumClusterwideNetworkPolicy) DeepCopyInto(out *CiliumClusterwideNetworkPolicy) { *out = *in @@ -150,6 +210,111 @@ func (in *CiliumEndpointList) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumEnvoyConfig) DeepCopyInto(out *CiliumEnvoyConfig) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfig. +func (in *CiliumEnvoyConfig) DeepCopy() *CiliumEnvoyConfig { + if in == nil { + return nil + } + out := new(CiliumEnvoyConfig) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CiliumEnvoyConfig) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumEnvoyConfigList) DeepCopyInto(out *CiliumEnvoyConfigList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CiliumEnvoyConfig, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfigList. +func (in *CiliumEnvoyConfigList) DeepCopy() *CiliumEnvoyConfigList { + if in == nil { + return nil + } + out := new(CiliumEnvoyConfigList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *CiliumEnvoyConfigList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CiliumEnvoyConfigSpec) DeepCopyInto(out *CiliumEnvoyConfigSpec) { + *out = *in + if in.Services != nil { + in, out := &in.Services, &out.Services + *out = make([]*ServiceListener, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(ServiceListener) + **out = **in + } + } + } + if in.BackendServices != nil { + in, out := &in.BackendServices, &out.BackendServices + *out = make([]*Service, len(*in)) + for i := range *in { + if (*in)[i] != nil { + in, out := &(*in)[i], &(*out)[i] + *out = new(Service) + **out = **in + } + } + } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = make([]XDSResource, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfigSpec. +func (in *CiliumEnvoyConfigSpec) DeepCopy() *CiliumEnvoyConfigSpec { + if in == nil { + return nil + } + out := new(CiliumEnvoyConfigSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CiliumExternalWorkload) DeepCopyInto(out *CiliumExternalWorkload) { *out = *in @@ -1014,6 +1179,22 @@ func (in *RedirectFrontend) DeepCopy() *RedirectFrontend { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Service) DeepCopyInto(out *Service) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service. +func (in *Service) DeepCopy() *Service { + if in == nil { + return nil + } + out := new(Service) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServiceInfo) DeepCopyInto(out *ServiceInfo) { *out = *in @@ -1034,3 +1215,29 @@ func (in *ServiceInfo) DeepCopy() *ServiceInfo { in.DeepCopyInto(out) return out } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ServiceListener) DeepCopyInto(out *ServiceListener) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceListener. +func (in *ServiceListener) DeepCopy() *ServiceListener { + if in == nil { + return nil + } + out := new(ServiceListener) + in.DeepCopyInto(out) + return out +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new XDSResource. +func (in *XDSResource) DeepCopy() *XDSResource { + if in == nil { + return nil + } + out := new(XDSResource) + in.DeepCopyInto(out) + return out +} diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepequal.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepequal.go index d73884a075..19dd60f9eb 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepequal.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2/zz_generated.deepequal.go @@ -65,6 +65,20 @@ func (in *AllowedIdentityList) DeepEqual(other *AllowedIdentityList) bool { return true } +// DeepEqual is an autogenerated deepequal function, deeply comparing the +// receiver with other. in must be non-nil. +func (in *CiliumClusterwideEnvoyConfig) DeepEqual(other *CiliumClusterwideEnvoyConfig) bool { + if other == nil { + return false + } + + if !in.Spec.DeepEqual(&other.Spec) { + return false + } + + return true +} + // deepEqual is an autogenerated deepequal function, deeply comparing the // receiver with other. in must be non-nil. func (in *CiliumClusterwideNetworkPolicy) deepEqual(other *CiliumClusterwideNetworkPolicy) bool { @@ -108,6 +122,81 @@ func (in *CiliumEndpoint) DeepEqual(other *CiliumEndpoint) bool { return true } +// DeepEqual is an autogenerated deepequal function, deeply comparing the +// receiver with other. in must be non-nil. +func (in *CiliumEnvoyConfig) DeepEqual(other *CiliumEnvoyConfig) bool { + if other == nil { + return false + } + + if !in.Spec.DeepEqual(&other.Spec) { + return false + } + + return true +} + +// DeepEqual is an autogenerated deepequal function, deeply comparing the +// receiver with other. in must be non-nil. +func (in *CiliumEnvoyConfigSpec) DeepEqual(other *CiliumEnvoyConfigSpec) bool { + if other == nil { + return false + } + + if ((in.Services != nil) && (other.Services != nil)) || ((in.Services == nil) != (other.Services == nil)) { + in, other := &in.Services, &other.Services + if other == nil { + return false + } + + if len(*in) != len(*other) { + return false + } else { + for i, inElement := range *in { + if !inElement.DeepEqual((*other)[i]) { + return false + } + } + } + } + + if ((in.BackendServices != nil) && (other.BackendServices != nil)) || ((in.BackendServices == nil) != (other.BackendServices == nil)) { + in, other := &in.BackendServices, &other.BackendServices + if other == nil { + return false + } + + if len(*in) != len(*other) { + return false + } else { + for i, inElement := range *in { + if !inElement.DeepEqual((*other)[i]) { + return false + } + } + } + } + + if ((in.Resources != nil) && (other.Resources != nil)) || ((in.Resources == nil) != (other.Resources == nil)) { + in, other := &in.Resources, &other.Resources + if other == nil { + return false + } + + if len(*in) != len(*other) { + return false + } else { + for i, inElement := range *in { + if !inElement.DeepEqual(&(*other)[i]) { + return false + } + } + } + } + + return true +} + // DeepEqual is an autogenerated deepequal function, deeply comparing the // receiver with other. in must be non-nil. func (in *CiliumExternalWorkload) DeepEqual(other *CiliumExternalWorkload) bool { @@ -1004,6 +1093,23 @@ func (in *RedirectFrontend) DeepEqual(other *RedirectFrontend) bool { return true } +// DeepEqual is an autogenerated deepequal function, deeply comparing the +// receiver with other. in must be non-nil. +func (in *Service) DeepEqual(other *Service) bool { + if other == nil { + return false + } + + if in.Name != other.Name { + return false + } + if in.Namespace != other.Namespace { + return false + } + + return true +} + // DeepEqual is an autogenerated deepequal function, deeply comparing the // receiver with other. in must be non-nil. func (in *ServiceInfo) DeepEqual(other *ServiceInfo) bool { @@ -1036,3 +1142,23 @@ func (in *ServiceInfo) DeepEqual(other *ServiceInfo) bool { return true } + +// DeepEqual is an autogenerated deepequal function, deeply comparing the +// receiver with other. in must be non-nil. +func (in *ServiceListener) DeepEqual(other *ServiceListener) bool { + if other == nil { + return false + } + + if in.Name != other.Name { + return false + } + if in.Namespace != other.Namespace { + return false + } + if in.Listener != other.Listener { + return false + } + + return true +} diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/register.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/register.go index 7ad271aa9e..2dec1db1a6 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/register.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/register.go @@ -23,7 +23,7 @@ const ( // // Maintainers: Run ./Documentation/check-crd-compat-table.sh for each release // Developers: Bump patch for each change in the CRD schema. - CustomResourceDefinitionSchemaVersion = "1.26.1" + CustomResourceDefinitionSchemaVersion = "1.25.2" // CustomResourceDefinitionSchemaVersionKey is key to label which holds the CRD schema version CustomResourceDefinitionSchemaVersionKey = "io.cilium.k8s.crd.schema.version" @@ -56,34 +56,6 @@ const ( // CESName is the full name of Cilium Endpoint Slice CESName = CESPluralName + "." + CustomResourceDefinitionGroup - // Cilium Cluster Envoy Config (CCEC) - - // CCECSingularName is the singular name of Cilium Clusterwide Envoy Config - CCECSingularName = "ciliumclusterwideenvoyconfig" - - // CCECPluralName is the plural name of Cilium Clusterwide Envoy Config - CCECPluralName = "ciliumclusterwideenvoyconfigs" - - // CCECKindDefinition is the kind name of Cilium Clusterwide Envoy Config - CCECKindDefinition = "CiliumClusterwideEnvoyConfig" - - // CCECName is the full name of Cilium Clusterwide Envoy Config - CCECName = CCECPluralName + "." + CustomResourceDefinitionGroup - - // Cilium Envoy Config (CEC) - - // CECSingularName is the singular name of Cilium Envoy Config - CECSingularName = "ciliumenvoyconfig" - - // CECPluralName is the plural name of Cilium Envoy Config - CECPluralName = "ciliumenvoyconfigs" - - // CECKindDefinition is the kind name of Cilium Envoy Config - CECKindDefinition = "CiliumEnvoyConfig" - - // CECName is the full name of Cilium Envoy Config - CECName = CECPluralName + "." + CustomResourceDefinitionGroup - // Cilium BGP Peering Policy (BGPP) // BGPPSingularName is the singular name of Cilium BGP Peering Policy @@ -158,10 +130,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CiliumEgressNATPolicyList{}, &CiliumEndpointSlice{}, &CiliumEndpointSliceList{}, - &CiliumEnvoyConfig{}, - &CiliumEnvoyConfigList{}, - &CiliumClusterwideEnvoyConfig{}, - &CiliumClusterwideEnvoyConfigList{}, &CiliumBGPPeeringPolicy{}, &CiliumBGPPeeringPolicyList{}, &CiliumBGPLoadBalancerIPPool{}, diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go index 1a4ba27856..df139bba55 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepcopy.go @@ -226,66 +226,6 @@ func (in *CiliumBGPVirtualRouter) DeepCopy() *CiliumBGPVirtualRouter { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CiliumClusterwideEnvoyConfig) DeepCopyInto(out *CiliumClusterwideEnvoyConfig) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumClusterwideEnvoyConfig. -func (in *CiliumClusterwideEnvoyConfig) DeepCopy() *CiliumClusterwideEnvoyConfig { - if in == nil { - return nil - } - out := new(CiliumClusterwideEnvoyConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CiliumClusterwideEnvoyConfig) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CiliumClusterwideEnvoyConfigList) DeepCopyInto(out *CiliumClusterwideEnvoyConfigList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CiliumClusterwideEnvoyConfig, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumClusterwideEnvoyConfigList. -func (in *CiliumClusterwideEnvoyConfigList) DeepCopy() *CiliumClusterwideEnvoyConfigList { - if in == nil { - return nil - } - out := new(CiliumClusterwideEnvoyConfigList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CiliumClusterwideEnvoyConfigList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CiliumEgressNATPolicy) DeepCopyInto(out *CiliumEgressNATPolicy) { *out = *in @@ -445,111 +385,6 @@ func (in *CiliumEndpointSliceList) DeepCopyObject() runtime.Object { return nil } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CiliumEnvoyConfig) DeepCopyInto(out *CiliumEnvoyConfig) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfig. -func (in *CiliumEnvoyConfig) DeepCopy() *CiliumEnvoyConfig { - if in == nil { - return nil - } - out := new(CiliumEnvoyConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CiliumEnvoyConfig) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CiliumEnvoyConfigList) DeepCopyInto(out *CiliumEnvoyConfigList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CiliumEnvoyConfig, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfigList. -func (in *CiliumEnvoyConfigList) DeepCopy() *CiliumEnvoyConfigList { - if in == nil { - return nil - } - out := new(CiliumEnvoyConfigList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *CiliumEnvoyConfigList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CiliumEnvoyConfigSpec) DeepCopyInto(out *CiliumEnvoyConfigSpec) { - *out = *in - if in.Services != nil { - in, out := &in.Services, &out.Services - *out = make([]*ServiceListener, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(ServiceListener) - **out = **in - } - } - } - if in.BackendServices != nil { - in, out := &in.BackendServices, &out.BackendServices - *out = make([]*Service, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(Service) - **out = **in - } - } - } - if in.Resources != nil { - in, out := &in.Resources, &out.Resources - *out = make([]XDSResource, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CiliumEnvoyConfigSpec. -func (in *CiliumEnvoyConfigSpec) DeepCopy() *CiliumEnvoyConfigSpec { - if in == nil { - return nil - } - out := new(CiliumEnvoyConfigSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CoreCiliumEndpoint) DeepCopyInto(out *CoreCiliumEndpoint) { *out = *in @@ -629,45 +464,3 @@ func (in *EgressRule) DeepCopy() *EgressRule { in.DeepCopyInto(out) return out } - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Service) DeepCopyInto(out *Service) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service. -func (in *Service) DeepCopy() *Service { - if in == nil { - return nil - } - out := new(Service) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ServiceListener) DeepCopyInto(out *ServiceListener) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceListener. -func (in *ServiceListener) DeepCopy() *ServiceListener { - if in == nil { - return nil - } - out := new(ServiceListener) - in.DeepCopyInto(out) - return out -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new XDSResource. -func (in *XDSResource) DeepCopy() *XDSResource { - if in == nil { - return nil - } - out := new(XDSResource) - in.DeepCopyInto(out) - return out -} diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go index 5f3f8d8b99..aaf8af09c8 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1/zz_generated.deepequal.go @@ -154,20 +154,6 @@ func (in *CiliumBGPVirtualRouter) DeepEqual(other *CiliumBGPVirtualRouter) bool return true } -// DeepEqual is an autogenerated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -func (in *CiliumClusterwideEnvoyConfig) DeepEqual(other *CiliumClusterwideEnvoyConfig) bool { - if other == nil { - return false - } - - if !in.Spec.DeepEqual(&other.Spec) { - return false - } - - return true -} - // DeepEqual is an autogenerated deepequal function, deeply comparing the // receiver with other. in must be non-nil. func (in *CiliumEgressNATPolicy) DeepEqual(other *CiliumEgressNATPolicy) bool { @@ -267,81 +253,6 @@ func (in *CiliumEndpointSlice) DeepEqual(other *CiliumEndpointSlice) bool { return true } -// DeepEqual is an autogenerated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -func (in *CiliumEnvoyConfig) DeepEqual(other *CiliumEnvoyConfig) bool { - if other == nil { - return false - } - - if !in.Spec.DeepEqual(&other.Spec) { - return false - } - - return true -} - -// DeepEqual is an autogenerated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -func (in *CiliumEnvoyConfigSpec) DeepEqual(other *CiliumEnvoyConfigSpec) bool { - if other == nil { - return false - } - - if ((in.Services != nil) && (other.Services != nil)) || ((in.Services == nil) != (other.Services == nil)) { - in, other := &in.Services, &other.Services - if other == nil { - return false - } - - if len(*in) != len(*other) { - return false - } else { - for i, inElement := range *in { - if !inElement.DeepEqual((*other)[i]) { - return false - } - } - } - } - - if ((in.BackendServices != nil) && (other.BackendServices != nil)) || ((in.BackendServices == nil) != (other.BackendServices == nil)) { - in, other := &in.BackendServices, &other.BackendServices - if other == nil { - return false - } - - if len(*in) != len(*other) { - return false - } else { - for i, inElement := range *in { - if !inElement.DeepEqual((*other)[i]) { - return false - } - } - } - } - - if ((in.Resources != nil) && (other.Resources != nil)) || ((in.Resources == nil) != (other.Resources == nil)) { - in, other := &in.Resources, &other.Resources - if other == nil { - return false - } - - if len(*in) != len(*other) { - return false - } else { - for i, inElement := range *in { - if !inElement.DeepEqual(&(*other)[i]) { - return false - } - } - } - } - - return true -} - // DeepEqual is an autogenerated deepequal function, deeply comparing the // receiver with other. in must be non-nil. func (in *CoreCiliumEndpoint) DeepEqual(other *CoreCiliumEndpoint) bool { @@ -437,40 +348,3 @@ func (in *EgressRule) DeepEqual(other *EgressRule) bool { return true } - -// DeepEqual is an autogenerated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -func (in *Service) DeepEqual(other *Service) bool { - if other == nil { - return false - } - - if in.Name != other.Name { - return false - } - if in.Namespace != other.Namespace { - return false - } - - return true -} - -// DeepEqual is an autogenerated deepequal function, deeply comparing the -// receiver with other. in must be non-nil. -func (in *ServiceListener) DeepEqual(other *ServiceListener) bool { - if other == nil { - return false - } - - if in.Name != other.Name { - return false - } - if in.Namespace != other.Namespace { - return false - } - if in.Listener != other.Listener { - return false - } - - return true -} diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/cilium.io_client.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/cilium.io_client.go index cc2bc5d60f..6acf89c69a 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/cilium.io_client.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/cilium.io_client.go @@ -15,8 +15,10 @@ import ( type CiliumV2Interface interface { RESTClient() rest.Interface + CiliumClusterwideEnvoyConfigsGetter CiliumClusterwideNetworkPoliciesGetter CiliumEndpointsGetter + CiliumEnvoyConfigsGetter CiliumExternalWorkloadsGetter CiliumIdentitiesGetter CiliumLocalRedirectPoliciesGetter @@ -29,6 +31,10 @@ type CiliumV2Client struct { restClient rest.Interface } +func (c *CiliumV2Client) CiliumClusterwideEnvoyConfigs() CiliumClusterwideEnvoyConfigInterface { + return newCiliumClusterwideEnvoyConfigs(c) +} + func (c *CiliumV2Client) CiliumClusterwideNetworkPolicies() CiliumClusterwideNetworkPolicyInterface { return newCiliumClusterwideNetworkPolicies(c) } @@ -37,6 +43,10 @@ func (c *CiliumV2Client) CiliumEndpoints(namespace string) CiliumEndpointInterfa return newCiliumEndpoints(c, namespace) } +func (c *CiliumV2Client) CiliumEnvoyConfigs(namespace string) CiliumEnvoyConfigInterface { + return newCiliumEnvoyConfigs(c, namespace) +} + func (c *CiliumV2Client) CiliumExternalWorkloads() CiliumExternalWorkloadInterface { return newCiliumExternalWorkloads(c) } diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumclusterwideenvoyconfig.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumclusterwideenvoyconfig.go similarity index 76% rename from vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumclusterwideenvoyconfig.go rename to vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumclusterwideenvoyconfig.go index 93206a1e6a..cf8eecec3b 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumclusterwideenvoyconfig.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumclusterwideenvoyconfig.go @@ -3,13 +3,13 @@ // Code generated by client-gen. DO NOT EDIT. -package v2alpha1 +package v2 import ( "context" "time" - v2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" + v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" scheme "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -25,14 +25,14 @@ type CiliumClusterwideEnvoyConfigsGetter interface { // CiliumClusterwideEnvoyConfigInterface has methods to work with CiliumClusterwideEnvoyConfig resources. type CiliumClusterwideEnvoyConfigInterface interface { - Create(ctx context.Context, ciliumClusterwideEnvoyConfig *v2alpha1.CiliumClusterwideEnvoyConfig, opts v1.CreateOptions) (*v2alpha1.CiliumClusterwideEnvoyConfig, error) - Update(ctx context.Context, ciliumClusterwideEnvoyConfig *v2alpha1.CiliumClusterwideEnvoyConfig, opts v1.UpdateOptions) (*v2alpha1.CiliumClusterwideEnvoyConfig, error) + Create(ctx context.Context, ciliumClusterwideEnvoyConfig *v2.CiliumClusterwideEnvoyConfig, opts v1.CreateOptions) (*v2.CiliumClusterwideEnvoyConfig, error) + Update(ctx context.Context, ciliumClusterwideEnvoyConfig *v2.CiliumClusterwideEnvoyConfig, opts v1.UpdateOptions) (*v2.CiliumClusterwideEnvoyConfig, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v2alpha1.CiliumClusterwideEnvoyConfig, error) - List(ctx context.Context, opts v1.ListOptions) (*v2alpha1.CiliumClusterwideEnvoyConfigList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v2.CiliumClusterwideEnvoyConfig, error) + List(ctx context.Context, opts v1.ListOptions) (*v2.CiliumClusterwideEnvoyConfigList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.CiliumClusterwideEnvoyConfig, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2.CiliumClusterwideEnvoyConfig, err error) CiliumClusterwideEnvoyConfigExpansion } @@ -42,15 +42,15 @@ type ciliumClusterwideEnvoyConfigs struct { } // newCiliumClusterwideEnvoyConfigs returns a CiliumClusterwideEnvoyConfigs -func newCiliumClusterwideEnvoyConfigs(c *CiliumV2alpha1Client) *ciliumClusterwideEnvoyConfigs { +func newCiliumClusterwideEnvoyConfigs(c *CiliumV2Client) *ciliumClusterwideEnvoyConfigs { return &ciliumClusterwideEnvoyConfigs{ client: c.RESTClient(), } } // Get takes name of the ciliumClusterwideEnvoyConfig, and returns the corresponding ciliumClusterwideEnvoyConfig object, and an error if there is any. -func (c *ciliumClusterwideEnvoyConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v2alpha1.CiliumClusterwideEnvoyConfig, err error) { - result = &v2alpha1.CiliumClusterwideEnvoyConfig{} +func (c *ciliumClusterwideEnvoyConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v2.CiliumClusterwideEnvoyConfig, err error) { + result = &v2.CiliumClusterwideEnvoyConfig{} err = c.client.Get(). Resource("ciliumclusterwideenvoyconfigs"). Name(name). @@ -61,12 +61,12 @@ func (c *ciliumClusterwideEnvoyConfigs) Get(ctx context.Context, name string, op } // List takes label and field selectors, and returns the list of CiliumClusterwideEnvoyConfigs that match those selectors. -func (c *ciliumClusterwideEnvoyConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v2alpha1.CiliumClusterwideEnvoyConfigList, err error) { +func (c *ciliumClusterwideEnvoyConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v2.CiliumClusterwideEnvoyConfigList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v2alpha1.CiliumClusterwideEnvoyConfigList{} + result = &v2.CiliumClusterwideEnvoyConfigList{} err = c.client.Get(). Resource("ciliumclusterwideenvoyconfigs"). VersionedParams(&opts, scheme.ParameterCodec). @@ -91,8 +91,8 @@ func (c *ciliumClusterwideEnvoyConfigs) Watch(ctx context.Context, opts v1.ListO } // Create takes the representation of a ciliumClusterwideEnvoyConfig and creates it. Returns the server's representation of the ciliumClusterwideEnvoyConfig, and an error, if there is any. -func (c *ciliumClusterwideEnvoyConfigs) Create(ctx context.Context, ciliumClusterwideEnvoyConfig *v2alpha1.CiliumClusterwideEnvoyConfig, opts v1.CreateOptions) (result *v2alpha1.CiliumClusterwideEnvoyConfig, err error) { - result = &v2alpha1.CiliumClusterwideEnvoyConfig{} +func (c *ciliumClusterwideEnvoyConfigs) Create(ctx context.Context, ciliumClusterwideEnvoyConfig *v2.CiliumClusterwideEnvoyConfig, opts v1.CreateOptions) (result *v2.CiliumClusterwideEnvoyConfig, err error) { + result = &v2.CiliumClusterwideEnvoyConfig{} err = c.client.Post(). Resource("ciliumclusterwideenvoyconfigs"). VersionedParams(&opts, scheme.ParameterCodec). @@ -103,8 +103,8 @@ func (c *ciliumClusterwideEnvoyConfigs) Create(ctx context.Context, ciliumCluste } // Update takes the representation of a ciliumClusterwideEnvoyConfig and updates it. Returns the server's representation of the ciliumClusterwideEnvoyConfig, and an error, if there is any. -func (c *ciliumClusterwideEnvoyConfigs) Update(ctx context.Context, ciliumClusterwideEnvoyConfig *v2alpha1.CiliumClusterwideEnvoyConfig, opts v1.UpdateOptions) (result *v2alpha1.CiliumClusterwideEnvoyConfig, err error) { - result = &v2alpha1.CiliumClusterwideEnvoyConfig{} +func (c *ciliumClusterwideEnvoyConfigs) Update(ctx context.Context, ciliumClusterwideEnvoyConfig *v2.CiliumClusterwideEnvoyConfig, opts v1.UpdateOptions) (result *v2.CiliumClusterwideEnvoyConfig, err error) { + result = &v2.CiliumClusterwideEnvoyConfig{} err = c.client.Put(). Resource("ciliumclusterwideenvoyconfigs"). Name(ciliumClusterwideEnvoyConfig.Name). @@ -141,8 +141,8 @@ func (c *ciliumClusterwideEnvoyConfigs) DeleteCollection(ctx context.Context, op } // Patch applies the patch and returns the patched ciliumClusterwideEnvoyConfig. -func (c *ciliumClusterwideEnvoyConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.CiliumClusterwideEnvoyConfig, err error) { - result = &v2alpha1.CiliumClusterwideEnvoyConfig{} +func (c *ciliumClusterwideEnvoyConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2.CiliumClusterwideEnvoyConfig, err error) { + result = &v2.CiliumClusterwideEnvoyConfig{} err = c.client.Patch(pt). Resource("ciliumclusterwideenvoyconfigs"). Name(name). diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumenvoyconfig.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumenvoyconfig.go similarity index 78% rename from vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumenvoyconfig.go rename to vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumenvoyconfig.go index 2836233459..9f5acd456d 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/ciliumenvoyconfig.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/ciliumenvoyconfig.go @@ -3,13 +3,13 @@ // Code generated by client-gen. DO NOT EDIT. -package v2alpha1 +package v2 import ( "context" "time" - v2alpha1 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1" + v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2" scheme "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -25,14 +25,14 @@ type CiliumEnvoyConfigsGetter interface { // CiliumEnvoyConfigInterface has methods to work with CiliumEnvoyConfig resources. type CiliumEnvoyConfigInterface interface { - Create(ctx context.Context, ciliumEnvoyConfig *v2alpha1.CiliumEnvoyConfig, opts v1.CreateOptions) (*v2alpha1.CiliumEnvoyConfig, error) - Update(ctx context.Context, ciliumEnvoyConfig *v2alpha1.CiliumEnvoyConfig, opts v1.UpdateOptions) (*v2alpha1.CiliumEnvoyConfig, error) + Create(ctx context.Context, ciliumEnvoyConfig *v2.CiliumEnvoyConfig, opts v1.CreateOptions) (*v2.CiliumEnvoyConfig, error) + Update(ctx context.Context, ciliumEnvoyConfig *v2.CiliumEnvoyConfig, opts v1.UpdateOptions) (*v2.CiliumEnvoyConfig, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v2alpha1.CiliumEnvoyConfig, error) - List(ctx context.Context, opts v1.ListOptions) (*v2alpha1.CiliumEnvoyConfigList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v2.CiliumEnvoyConfig, error) + List(ctx context.Context, opts v1.ListOptions) (*v2.CiliumEnvoyConfigList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.CiliumEnvoyConfig, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2.CiliumEnvoyConfig, err error) CiliumEnvoyConfigExpansion } @@ -43,7 +43,7 @@ type ciliumEnvoyConfigs struct { } // newCiliumEnvoyConfigs returns a CiliumEnvoyConfigs -func newCiliumEnvoyConfigs(c *CiliumV2alpha1Client, namespace string) *ciliumEnvoyConfigs { +func newCiliumEnvoyConfigs(c *CiliumV2Client, namespace string) *ciliumEnvoyConfigs { return &ciliumEnvoyConfigs{ client: c.RESTClient(), ns: namespace, @@ -51,8 +51,8 @@ func newCiliumEnvoyConfigs(c *CiliumV2alpha1Client, namespace string) *ciliumEnv } // Get takes name of the ciliumEnvoyConfig, and returns the corresponding ciliumEnvoyConfig object, and an error if there is any. -func (c *ciliumEnvoyConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v2alpha1.CiliumEnvoyConfig, err error) { - result = &v2alpha1.CiliumEnvoyConfig{} +func (c *ciliumEnvoyConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v2.CiliumEnvoyConfig, err error) { + result = &v2.CiliumEnvoyConfig{} err = c.client.Get(). Namespace(c.ns). Resource("ciliumenvoyconfigs"). @@ -64,12 +64,12 @@ func (c *ciliumEnvoyConfigs) Get(ctx context.Context, name string, options v1.Ge } // List takes label and field selectors, and returns the list of CiliumEnvoyConfigs that match those selectors. -func (c *ciliumEnvoyConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v2alpha1.CiliumEnvoyConfigList, err error) { +func (c *ciliumEnvoyConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v2.CiliumEnvoyConfigList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v2alpha1.CiliumEnvoyConfigList{} + result = &v2.CiliumEnvoyConfigList{} err = c.client.Get(). Namespace(c.ns). Resource("ciliumenvoyconfigs"). @@ -96,8 +96,8 @@ func (c *ciliumEnvoyConfigs) Watch(ctx context.Context, opts v1.ListOptions) (wa } // Create takes the representation of a ciliumEnvoyConfig and creates it. Returns the server's representation of the ciliumEnvoyConfig, and an error, if there is any. -func (c *ciliumEnvoyConfigs) Create(ctx context.Context, ciliumEnvoyConfig *v2alpha1.CiliumEnvoyConfig, opts v1.CreateOptions) (result *v2alpha1.CiliumEnvoyConfig, err error) { - result = &v2alpha1.CiliumEnvoyConfig{} +func (c *ciliumEnvoyConfigs) Create(ctx context.Context, ciliumEnvoyConfig *v2.CiliumEnvoyConfig, opts v1.CreateOptions) (result *v2.CiliumEnvoyConfig, err error) { + result = &v2.CiliumEnvoyConfig{} err = c.client.Post(). Namespace(c.ns). Resource("ciliumenvoyconfigs"). @@ -109,8 +109,8 @@ func (c *ciliumEnvoyConfigs) Create(ctx context.Context, ciliumEnvoyConfig *v2al } // Update takes the representation of a ciliumEnvoyConfig and updates it. Returns the server's representation of the ciliumEnvoyConfig, and an error, if there is any. -func (c *ciliumEnvoyConfigs) Update(ctx context.Context, ciliumEnvoyConfig *v2alpha1.CiliumEnvoyConfig, opts v1.UpdateOptions) (result *v2alpha1.CiliumEnvoyConfig, err error) { - result = &v2alpha1.CiliumEnvoyConfig{} +func (c *ciliumEnvoyConfigs) Update(ctx context.Context, ciliumEnvoyConfig *v2.CiliumEnvoyConfig, opts v1.UpdateOptions) (result *v2.CiliumEnvoyConfig, err error) { + result = &v2.CiliumEnvoyConfig{} err = c.client.Put(). Namespace(c.ns). Resource("ciliumenvoyconfigs"). @@ -150,8 +150,8 @@ func (c *ciliumEnvoyConfigs) DeleteCollection(ctx context.Context, opts v1.Delet } // Patch applies the patch and returns the patched ciliumEnvoyConfig. -func (c *ciliumEnvoyConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2alpha1.CiliumEnvoyConfig, err error) { - result = &v2alpha1.CiliumEnvoyConfig{} +func (c *ciliumEnvoyConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v2.CiliumEnvoyConfig, err error) { + result = &v2.CiliumEnvoyConfig{} err = c.client.Patch(pt). Namespace(c.ns). Resource("ciliumenvoyconfigs"). diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/generated_expansion.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/generated_expansion.go index 78d73251f1..eb834a26e3 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/generated_expansion.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2/generated_expansion.go @@ -5,10 +5,14 @@ package v2 +type CiliumClusterwideEnvoyConfigExpansion interface{} + type CiliumClusterwideNetworkPolicyExpansion interface{} type CiliumEndpointExpansion interface{} +type CiliumEnvoyConfigExpansion interface{} + type CiliumExternalWorkloadExpansion interface{} type CiliumIdentityExpansion interface{} diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/cilium.io_client.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/cilium.io_client.go index f3672e3bd5..e1fa5552ed 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/cilium.io_client.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/cilium.io_client.go @@ -17,10 +17,8 @@ type CiliumV2alpha1Interface interface { RESTClient() rest.Interface CiliumBGPLoadBalancerIPPoolsGetter CiliumBGPPeeringPoliciesGetter - CiliumClusterwideEnvoyConfigsGetter CiliumEgressNATPoliciesGetter CiliumEndpointSlicesGetter - CiliumEnvoyConfigsGetter } // CiliumV2alpha1Client is used to interact with features provided by the cilium.io group. @@ -36,10 +34,6 @@ func (c *CiliumV2alpha1Client) CiliumBGPPeeringPolicies() CiliumBGPPeeringPolicy return newCiliumBGPPeeringPolicies(c) } -func (c *CiliumV2alpha1Client) CiliumClusterwideEnvoyConfigs() CiliumClusterwideEnvoyConfigInterface { - return newCiliumClusterwideEnvoyConfigs(c) -} - func (c *CiliumV2alpha1Client) CiliumEgressNATPolicies() CiliumEgressNATPolicyInterface { return newCiliumEgressNATPolicies(c) } @@ -48,10 +42,6 @@ func (c *CiliumV2alpha1Client) CiliumEndpointSlices() CiliumEndpointSliceInterfa return newCiliumEndpointSlices(c) } -func (c *CiliumV2alpha1Client) CiliumEnvoyConfigs(namespace string) CiliumEnvoyConfigInterface { - return newCiliumEnvoyConfigs(c, namespace) -} - // NewForConfig creates a new CiliumV2alpha1Client for the given config. // NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), // where httpClient was generated with rest.HTTPClientFor(c). diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/generated_expansion.go b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/generated_expansion.go index a4a005c65a..7ac963891b 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/generated_expansion.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/generated_expansion.go @@ -9,10 +9,6 @@ type CiliumBGPLoadBalancerIPPoolExpansion interface{} type CiliumBGPPeeringPolicyExpansion interface{} -type CiliumClusterwideEnvoyConfigExpansion interface{} - type CiliumEgressNATPolicyExpansion interface{} type CiliumEndpointSliceExpansion interface{} - -type CiliumEnvoyConfigExpansion interface{} diff --git a/vendor/github.com/cilium/cilium/pkg/option/config.go b/vendor/github.com/cilium/cilium/pkg/option/config.go index 1a4725fc11..866e9d7369 100644 --- a/vendor/github.com/cilium/cilium/pkg/option/config.go +++ b/vendor/github.com/cilium/cilium/pkg/option/config.go @@ -479,6 +479,15 @@ const ( // endpoints that are larger than 512 Bytes or the EDNS0 option, if present. ToFQDNsEnableDNSCompression = "tofqdns-enable-dns-compression" + // DNSProxyConcurrencyLimit limits parallel processing of DNS messages in + // DNS proxy at any given point in time. + DNSProxyConcurrencyLimit = "dnsproxy-concurrency-limit" + + // DNSProxyConcurrencyProcessingGracePeriod is the amount of grace time to + // wait while processing DNS messages when the DNSProxyConcurrencyLimit has + // been reached. + DNSProxyConcurrencyProcessingGracePeriod = "dnsproxy-concurrency-processing-grace-period" + // MTUName is the name of the MTU option MTUName = "mtu" @@ -838,9 +847,6 @@ const ( // CiliumNode resource for the local node AutoCreateCiliumNodeResource = "auto-create-cilium-node-resource" - // NativeRoutingCIDR describes a v4 CIDR in which pod IPs are routable - NativeRoutingCIDR = "native-routing-cidr" - // IPv4NativeRoutingCIDR describes a v4 CIDR in which pod IPs are routable IPv4NativeRoutingCIDR = "ipv4-native-routing-cidr" @@ -1022,10 +1028,6 @@ const ( // Otherwise, it will use the old scheme. EgressMultiHomeIPRuleCompat = "egress-multi-home-ip-rule-compat" - // EnableBPFBypassFIBLookup instructs Cilium to enable the FIB lookup bypass - // optimization for nodeport reverse NAT handling (DEPRECATED). - EnableBPFBypassFIBLookup = "bpf-lb-bypass-fib-lookup" - // EnableCustomCallsName is the name of the option to enable tail calls // for user-defined custom eBPF programs. EnableCustomCallsName = "enable-custom-calls" @@ -1678,6 +1680,15 @@ type DaemonConfig struct { // endpoints that are larger than 512 Bytes or the EDNS0 option, if present. ToFQDNsEnableDNSCompression bool + // DNSProxyConcurrencyLimit limits parallel processing of DNS messages in + // DNS proxy at any given point in time. + DNSProxyConcurrencyLimit int + + // DNSProxyConcurrencyProcessingGracePeriod is the amount of grace time to + // wait while processing DNS messages when the DNSProxyConcurrencyLimit has + // been reached. + DNSProxyConcurrencyProcessingGracePeriod time.Duration + // EnableXTSocketFallback allows disabling of kernel's ip_early_demux // sysctl option if `xt_socket` kernel module is not available. EnableXTSocketFallback bool @@ -2912,20 +2923,9 @@ func (c *DaemonConfig) Populate() { c.AddressScopeMax = defaults.AddressScopeMax } - nativeRoutingCIDR := viper.GetString(NativeRoutingCIDR) ipv4NativeRoutingCIDR := viper.GetString(IPv4NativeRoutingCIDR) - if nativeRoutingCIDR != "" && ipv4NativeRoutingCIDR != "" { - log.Fatalf("Cannot specify both %s and %s", NativeRoutingCIDR, IPv4NativeRoutingCIDR) - } - - if nativeRoutingCIDR != "" { - c.IPv4NativeRoutingCIDR = cidr.MustParseCIDR(nativeRoutingCIDR) - - if len(c.IPv4NativeRoutingCIDR.IP) != net.IPv4len { - log.Fatalf("%s must be an IPv4 CIDR", NativeRoutingCIDR) - } - } else if ipv4NativeRoutingCIDR != "" { + if ipv4NativeRoutingCIDR != "" { c.IPv4NativeRoutingCIDR = cidr.MustParseCIDR(ipv4NativeRoutingCIDR) if len(c.IPv4NativeRoutingCIDR.IP) != net.IPv4len { @@ -2933,7 +2933,7 @@ func (c *DaemonConfig) Populate() { } } - if c.EnableIPv4 && nativeRoutingCIDR == "" && ipv4NativeRoutingCIDR == "" && c.EnableAutoDirectRouting { + if c.EnableIPv4 && ipv4NativeRoutingCIDR == "" && c.EnableAutoDirectRouting { log.Warnf("If %s is enabled, then you are recommended to also configure %s. If %s is not configured, this may lead to pod to pod traffic being masqueraded, "+ "which can cause problems with performance, observability and policy", EnableAutoDirectRoutingName, IPv4NativeRoutingCIDR, IPv4NativeRoutingCIDR) } @@ -2980,6 +2980,8 @@ func (c *DaemonConfig) Populate() { c.ToFQDNsProxyPort = viper.GetInt(ToFQDNsProxyPort) c.ToFQDNsPreCache = viper.GetString(ToFQDNsPreCache) c.ToFQDNsEnableDNSCompression = viper.GetBool(ToFQDNsEnableDNSCompression) + c.DNSProxyConcurrencyLimit = viper.GetInt(DNSProxyConcurrencyLimit) + c.DNSProxyConcurrencyProcessingGracePeriod = viper.GetDuration(DNSProxyConcurrencyProcessingGracePeriod) // Convert IP strings into net.IPNet types subnets, invalid := ip.ParseCIDRs(viper.GetStringSlice(IPv4PodSubnets)) diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go b/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go new file mode 100644 index 0000000000..2488f18517 --- /dev/null +++ b/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go @@ -0,0 +1,38 @@ +//go:build openbsd && arm +// +build openbsd,arm + +// Code generated by cmd/cgo -godefs; DO NOT EDIT. +// cgo -godefs mem/types_openbsd.go + +package mem + +const ( + CTLVfs = 10 + VfsGeneric = 0 + VfsBcacheStat = 3 +) + +const ( + sizeOfBcachestats = 0x90 +) + +type Bcachestats struct { + Numbufs int64 + Numbufpages int64 + Numdirtypages int64 + Numcleanpages int64 + Pendingwrites int64 + Pendingreads int64 + Numwrites int64 + Numreads int64 + Cachehits int64 + Busymapped int64 + Dmapages int64 + Highpages int64 + Delwribufs int64 + Kvaslots int64 + Avail int64 + Highflips int64 + Highflops int64 + Dmaflips int64 +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 6bed850a33..a2937891ec 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,7 +8,7 @@ github.com/Azure/go-ansiterm/winterm # github.com/Azure/go-autorest v14.2.0+incompatible ## explicit github.com/Azure/go-autorest -# github.com/Azure/go-autorest/autorest v0.11.25 +# github.com/Azure/go-autorest/autorest v0.11.27 ## explicit; go 1.15 github.com/Azure/go-autorest/autorest github.com/Azure/go-autorest/autorest/azure @@ -74,7 +74,7 @@ github.com/chai2010/gettext-go/gettext/po # github.com/cilium/charts v0.0.0-20220504171207-4989b5fd96bd ## explicit; go 1.17 github.com/cilium/charts -# github.com/cilium/cilium v1.12.0-rc1.0.20220502150516-d29221d4dfcc +# github.com/cilium/cilium v1.12.0-rc2.0.20220511145855-a1f773994542 ## explicit; go 1.17 github.com/cilium/cilium/api/v1/client github.com/cilium/cilium/api/v1/client/daemon @@ -415,7 +415,7 @@ github.com/go-openapi/runtime/middleware/header github.com/go-openapi/runtime/middleware/untyped github.com/go-openapi/runtime/security github.com/go-openapi/runtime/yamlpc -# github.com/go-openapi/spec v0.20.5 +# github.com/go-openapi/spec v0.20.6 ## explicit; go 1.13 github.com/go-openapi/spec # github.com/go-openapi/strfmt v0.21.2 @@ -780,7 +780,7 @@ github.com/russross/blackfriday/v2 # github.com/sasha-s/go-deadlock v0.3.1 ## explicit github.com/sasha-s/go-deadlock -# github.com/shirou/gopsutil/v3 v3.22.3 +# github.com/shirou/gopsutil/v3 v3.22.4 ## explicit; go 1.15 github.com/shirou/gopsutil/v3/internal/common github.com/shirou/gopsutil/v3/mem