From 2736057ff7415eba259f96ca7a8ddb226a655a89 Mon Sep 17 00:00:00 2001 From: Toby Cabot Date: Wed, 6 Sep 2023 15:49:13 -0400 Subject: [PATCH] Switch from private to public We're using vanity packages so we hopefully won't need to do this again. This does depend on the epic-gateway.org website being up and redirecting the golang module requests. Signed-off-by: Toby Cabot --- .gitlab-ci.yml | 9 +- Dockerfile | 12 -- LICENSE | 202 ++++++++++++++++++ Makefile | 6 +- PROJECT | 18 +- README.md | 29 --- api/v1/epic_types.go | 8 +- api/v1/gwproxy_webhook_test.go | 2 +- api/v1/lbservicegroup_webhook_test.go | 2 +- api/v1/loadbalancer_webhook_test.go | 2 +- api/v1/serviceprefix_webhook_test.go | 2 +- cmd/adhoc-agent.go | 8 +- cmd/controller_manager.go | 6 +- cmd/node-agent.go | 8 +- config/samples/epic_v1_epic.yaml | 4 +- config/snap/README.md | 2 - config/snap/epic_v1_epic.yaml | 14 -- config/snap/epic_v1_lbservicegroup.yaml | 86 -------- config/snap/epic_v1_serviceprefix.yaml | 10 - controllers/epic_agent_controller.go | 4 +- controllers/gwendpointslice_controller.go | 2 +- controllers/gwproxy_adhoc_controller.go | 4 +- controllers/gwproxy_agent_controller.go | 6 +- controllers/gwproxy_controller.go | 7 +- controllers/gwroute_controller.go | 2 +- controllers/loadbalancer_agent_controller.go | 6 +- controllers/loadbalancer_controller.go | 7 +- controllers/namespace_controller.go | 5 +- controllers/pod_agent_controller.go | 4 +- controllers/pod_controller.go | 2 +- controllers/remoteendpoint_controller.go | 2 +- controllers/serviceprefix_agent_controller.go | 4 +- controllers/serviceprefix_controller.go | 4 +- controllers/suite_test.go | 2 +- go.mod | 6 +- go.sum | 8 +- internal/allocator/allocator.go | 2 +- internal/allocator/allocator_test.go | 2 +- internal/allocator/stats.go | 2 +- internal/contour/dag/gatewayapi_processor.go | 2 +- internal/envoy/resource.go | 4 +- internal/envoy/resource_test.go | 4 +- internal/network/network.go | 2 +- internal/pfc/setup.go | 2 +- main.go | 2 +- 45 files changed, 283 insertions(+), 244 deletions(-) create mode 100644 LICENSE delete mode 100644 config/snap/README.md delete mode 100644 config/snap/epic_v1_epic.yaml delete mode 100644 config/snap/epic_v1_lbservicegroup.yaml delete mode 100644 config/snap/epic_v1_serviceprefix.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d33699..976fde3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,10 +16,6 @@ manifest: - *set-tag - apt-get update - apt-get install -y gettext-base - # this lets the CI runner clone any repo that the pushing user can - # clone. We need to clone private repos, e.g., epic/true-ingress - # since this project depends on them. - - echo "machine gitlab.com login gitlab-ci-token password ${CI_JOB_TOKEN}" > ~/.netrc script: - make SUFFIX=${TAG_SPECIFIC} all @@ -30,6 +26,7 @@ manifest: - 'curl --silent --show-error --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file deploy/manager.service "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/manifest-package/${TAG_SPECIFIC}/manager.service"' - 'curl --silent --show-error --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file deploy/manager-restart.service "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/manifest-package/${TAG_SPECIFIC}/manager-restart.service"' - 'curl --silent --show-error --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file deploy/manager-restart.path "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/manifest-package/${TAG_SPECIFIC}/manager-restart.path"' + # FIXME: "go list" this module to add it to the checksum db docker: image: docker:20.10.5 @@ -39,7 +36,7 @@ docker: before_script: - *set-tag - apk add make bash - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u epic-gateway+gitlab_ci -p $QUAY_EPIC_GATEWAY quay.io script: - - make SUFFIX=${TAG_SPECIFIC} GITLAB_USER=gitlab-ci-token GITLAB_PASSWORD=${CI_JOB_TOKEN} docker-build docker-push + - make SUFFIX=${TAG_SPECIFIC} docker-build docker-push diff --git a/Dockerfile b/Dockerfile index c31e9f9..367f694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,5 @@ FROM golang:1.19-alpine as builder -# Configure golang for our private modules at gitlab -ENV GONOPROXY=gitlab.com/acnodal -ENV GONOSUMDB=gitlab.com/acnodal -ENV GOPRIVATE=gitlab.com/acnodal -ARG GITLAB_USER -ARG GITLAB_PASSWORD - -# install and configure git. we need it because some of our modules -# (e.g., packet-forwarding-component) are private -RUN apk add git -RUN echo "machine gitlab.com login ${GITLAB_USER} password ${GITLAB_PASSWORD}" > ~/.netrc - WORKDIR /opt/acnodal/src # Copy the Go Modules manifests diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/Makefile b/Makefile index bc298c0..40cbd91 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -REPO ?= registry.gitlab.com/acnodal/epic +REPO ?= quay.io/epic-gateway PREFIX = resource-model SUFFIX = ${USER}-dev @@ -43,7 +43,7 @@ test: generate fmt vet manifests # Build manager binary manager: generate fmt vet - CGO_ENABLED=0 go build -ldflags "-X gitlab.com/acnodal/epic/resource-model/cmd.version=${SUFFIX}" -o bin/manager . + CGO_ENABLED=0 go build -ldflags "-X epic-gateway.org/resource-model/cmd.version=${SUFFIX}" -o bin/manager . # Run against the configured Kubernetes cluster in ~/.kube/config run-manager: generate fmt vet manifests @@ -77,7 +77,7 @@ generate: controller-gen # Build the docker image docker-build: - docker build . --build-arg=GITLAB_USER --build-arg=GITLAB_PASSWORD -t ${IMG} + docker build . -t ${IMG} # Push the docker image docker-push: diff --git a/PROJECT b/PROJECT index 9837d96..1ccfcfc 100644 --- a/PROJECT +++ b/PROJECT @@ -4,37 +4,37 @@ layout: plugins: go.sdk.operatorframework.io/v2-alpha: {} projectName: epic-resource-model -repo: gitlab.com/acnodal/epic/resource-model +repo: github.com/epic-gateway/resource-model resources: - controller: true domain: acnodal.io group: epic kind: Account - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - controller: true domain: acnodal.io group: epic kind: LBServiceGroup - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - controller: true domain: acnodal.io group: epic kind: LoadBalancer - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - controller: true domain: acnodal.io group: epic kind: ServicePrefix - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - controller: true domain: acnodal.io group: epic kind: EPIC - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - api: crdVersion: v1beta1 @@ -43,7 +43,7 @@ resources: domain: acnodal.io group: epic kind: GWProxy - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - api: crdVersion: v1beta1 @@ -52,7 +52,7 @@ resources: domain: acnodal.io group: epic kind: GWRoute - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 - api: crdVersion: v1beta1 @@ -61,6 +61,6 @@ resources: domain: acnodal.io group: epic kind: GWEndpointSlice - path: gitlab.com/acnodal/epic/resource-model/api/v1 + path: epic-gateway.org/resource-model/api/v1 version: v1 version: "3" diff --git a/README.md b/README.md index 14dab22..a7f5b6a 100644 --- a/README.md +++ b/README.md @@ -2,35 +2,6 @@ The EPIC operator manages Envoy pods based on our custom resources. The data model and operator code are scaffolded by https://operatorframework.io/. -## Developer Setup - -This project depends on modules that are not publicly visible, so you -need to configure git so that it can clone our private module repos -even when it is being run by commands like "go get". There are two -ways that this can happen: inside of docker (for example, when you're -building images to run in k8s), and outside of docker (for example, -when you're running go programs at the command line for debugging -purposes). - -To set up "inside docker" access, first create a GitLab Personal -Access Token that can read repos. You can do that at -https://gitlab.com/profile/personal_access_tokens . Then define an -environment variable in your account called GITLAB_PASSWORD that -contains the token, and another called GITLAB_USER that contains -"oauth2". This project's Makefile will pass these variables into -Docker which will use them to clone our private module repos when it -builds our go programs. - -To set up "outside docker" access, configure git to use the token you -created in the previous paragraphs to clone Acnodal repos on -gitlab. This can be done using a ~/.netrc file containing: - - machine gitlab.com login oauth2 password {put your token here} - -You can test this by running the command: - - $ go get gitlab.com/acnodal/epic/resource-model@v0.1.0-pre1 - ## Useful Commands To generate a new custom resource definition: diff --git a/api/v1/epic_types.go b/api/v1/epic_types.go index aeab383..0b50d84 100644 --- a/api/v1/epic_types.go +++ b/api/v1/epic_types.go @@ -30,7 +30,7 @@ type Node struct { type EPICSpec struct { // EDSImage is the name of the EPIC EDS control plane Docker image // to run. - // +kubebuilder:default="registry.gitlab.com/acnodal/xds-operator:latest" + // +kubebuilder:default="quay.io/epic-gateway/eds-server:latest" EDSImage string `json:"eds-image"` // EnvoyImage is the default Envoy Docker image name. This value can @@ -43,12 +43,12 @@ type EPICSpec struct { // the marin3r deployment manifest. XDSImage *string `json:"xds-image,omitempty"` - // ServiceCIDR is the pool from which internal service addresses - // are allocated. In microk8s it's hard-coded and passed on the + // ServiceCIDR is the pool from which internal service addresses are + // allocated. In microk8s it's hard-coded and passed on the // kubeapiserver command line (see // epicmgr-resources/default-args/kube-apiserver). We need a way to // discover this value so we can configure routes in the Envoy pod. - // The snap package will set this value when it installs the epic + // The installer will set this value when it installs the epic // singleton custom resource. ServiceCIDR string `json:"service-cidr"` diff --git a/api/v1/gwproxy_webhook_test.go b/api/v1/gwproxy_webhook_test.go index 8739cd1..3a6d81b 100644 --- a/api/v1/gwproxy_webhook_test.go +++ b/api/v1/gwproxy_webhook_test.go @@ -1,9 +1,9 @@ package v1_test import ( + v1 "epic-gateway.org/resource-model/api/v1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - v1 "gitlab.com/acnodal/epic/resource-model/api/v1" ) var _ = Describe("GWProxyWebhook", func() { diff --git a/api/v1/lbservicegroup_webhook_test.go b/api/v1/lbservicegroup_webhook_test.go index 4c72c15..b51d12c 100644 --- a/api/v1/lbservicegroup_webhook_test.go +++ b/api/v1/lbservicegroup_webhook_test.go @@ -1,7 +1,7 @@ package v1_test import ( - v1 "gitlab.com/acnodal/epic/resource-model/api/v1" + v1 "epic-gateway.org/resource-model/api/v1" "sigs.k8s.io/controller-runtime/pkg/webhook" ) diff --git a/api/v1/loadbalancer_webhook_test.go b/api/v1/loadbalancer_webhook_test.go index 13e11c3..a3c7d55 100644 --- a/api/v1/loadbalancer_webhook_test.go +++ b/api/v1/loadbalancer_webhook_test.go @@ -1,9 +1,9 @@ package v1_test import ( + v1 "epic-gateway.org/resource-model/api/v1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - v1 "gitlab.com/acnodal/epic/resource-model/api/v1" ) var _ = Describe("LoadbalancerWebhook", func() { diff --git a/api/v1/serviceprefix_webhook_test.go b/api/v1/serviceprefix_webhook_test.go index 6880afd..bc43544 100644 --- a/api/v1/serviceprefix_webhook_test.go +++ b/api/v1/serviceprefix_webhook_test.go @@ -1,7 +1,7 @@ package v1_test import ( - v1 "gitlab.com/acnodal/epic/resource-model/api/v1" + v1 "epic-gateway.org/resource-model/api/v1" "sigs.k8s.io/controller-runtime/pkg/webhook" ) diff --git a/cmd/adhoc-agent.go b/cmd/adhoc-agent.go index 1f2f818..94e4d6d 100644 --- a/cmd/adhoc-agent.go +++ b/cmd/adhoc-agent.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" ctrl "sigs.k8s.io/controller-runtime" - "gitlab.com/acnodal/epic/resource-model/controllers" - "gitlab.com/acnodal/epic/resource-model/internal/exec" - "gitlab.com/acnodal/epic/resource-model/internal/network" - "gitlab.com/acnodal/epic/resource-model/internal/pfc" + "epic-gateway.org/resource-model/controllers" + "epic-gateway.org/resource-model/internal/exec" + "epic-gateway.org/resource-model/internal/network" + "epic-gateway.org/resource-model/internal/pfc" // +kubebuilder:scaffold:imports ) diff --git a/cmd/controller_manager.go b/cmd/controller_manager.go index 12af25b..fef544a 100644 --- a/cmd/controller_manager.go +++ b/cmd/controller_manager.go @@ -17,9 +17,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/controllers" - "gitlab.com/acnodal/epic/resource-model/internal/allocator" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/controllers" + "epic-gateway.org/resource-model/internal/allocator" // +kubebuilder:scaffold:imports ) diff --git a/cmd/node-agent.go b/cmd/node-agent.go index 4ff4956..2fb42cd 100644 --- a/cmd/node-agent.go +++ b/cmd/node-agent.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/cobra" ctrl "sigs.k8s.io/controller-runtime" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/controllers" - "gitlab.com/acnodal/epic/resource-model/internal/exec" - "gitlab.com/acnodal/epic/true-ingress/pfc" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/controllers" + "epic-gateway.org/resource-model/internal/exec" + "epic-gateway.org/true-ingress/pfc" // +kubebuilder:scaffold:imports ) diff --git a/config/samples/epic_v1_epic.yaml b/config/samples/epic_v1_epic.yaml index 3565bf7..62fd735 100644 --- a/config/samples/epic_v1_epic.yaml +++ b/config/samples/epic_v1_epic.yaml @@ -5,8 +5,8 @@ metadata: name: epic spec: xds-image: quay.io/3scale/marin3r:v0.7.0 - eds-image: registry.gitlab.com/acnodal/xds-operator:latest - envoy-image: registry.gitlab.com/acnodal/epic/envoy:latest + eds-image: quay.io/epic-gateway/eds-server:latest + envoy-image: quay.io/epic-gateway/envoy:latest base: gue-endpoint: epic-address: 192.168.1.40 diff --git a/config/snap/README.md b/config/snap/README.md deleted file mode 100644 index a8eba9a..0000000 --- a/config/snap/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Manifests used during the snap package installation. - diff --git a/config/snap/epic_v1_epic.yaml b/config/snap/epic_v1_epic.yaml deleted file mode 100644 index 3565bf7..0000000 --- a/config/snap/epic_v1_epic.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: epic.acnodal.io/v1 -kind: EPIC -metadata: - namespace: epic - name: epic -spec: - xds-image: quay.io/3scale/marin3r:v0.7.0 - eds-image: registry.gitlab.com/acnodal/xds-operator:latest - envoy-image: registry.gitlab.com/acnodal/epic/envoy:latest - base: - gue-endpoint: - epic-address: 192.168.1.40 - gue-ingress-nics: - - enp1s0 diff --git a/config/snap/epic_v1_lbservicegroup.yaml b/config/snap/epic_v1_lbservicegroup.yaml deleted file mode 100644 index 57c27d3..0000000 --- a/config/snap/epic_v1_lbservicegroup.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -apiVersion: epic.acnodal.io/v1 -kind: LBServiceGroup -metadata: - namespace: epic-root - name: samplehttp - labels: - owning-account: root - owning-serviceprefix: default -spec: - can-be-shared: yes - endpoint-template: - dnsName: "{{.PureLBServiceName}}.{{.LBSGName}}.client.acnodal.io" - recordTTL: 180 - recordType: A - envoy-replica-count: 1 - envoy-template: - envoyAPI: v3 - serialization: yaml - nodeID: SET_BY_EPIC - envoyResources: - endpoints: - - name: SET_BY_EPIC - value: | - cluster_name: {{.ClusterName}} - {{- if .Endpoints}} - endpoints: - - lb_endpoints: - {{- range .Endpoints}} - - endpoint: - address: - socket_address: - address: {{.Spec.Address}} - protocol: {{.Spec.Port.Protocol | ToUpper}} - port_value: {{.Spec.Port.Port}} - {{- end}} - {{- end}} - clusters: - - name: SET_BY_EPIC - value: | - name: {{.ClusterName}} - connect_timeout: 2s - type: EDS - eds_cluster_config: - eds_config: - resource_api_version: V3 - api_config_source: - api_type: GRPC - transport_api_version: V3 - grpc_services: - - envoy_grpc: - cluster_name: eds-server - lb_policy: ROUND_ROBIN - listeners: - - name: SET_BY_EPIC - value: | - name: {{.PortName}} - address: - socket_address: - address: 0.0.0.0 - port_value: {{.Port}} - protocol: {{.Protocol | ToUpper}} - filter_chains: - - filters: - - name: envoy.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: {{ .ServiceName }} - route_config: - name: local_route - virtual_hosts: - - name: purelb - domains: ["*"] - routes: - - match: - prefix: "/" - route: - weighted_clusters: - total_weight: {{ .TotalWeight }} - clusters: - {{- range $i, $cl := .Clusters}} - - name: {{$cl}} - weight: {{ $.ClusterWeight }} - {{- end}} - http_filters: - - name: envoy.filters.http.router diff --git a/config/snap/epic_v1_serviceprefix.yaml b/config/snap/epic_v1_serviceprefix.yaml deleted file mode 100644 index 6d1bff2..0000000 --- a/config/snap/epic_v1_serviceprefix.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: epic.acnodal.io/v1 -kind: ServicePrefix -metadata: - name: default - namespace: epic -spec: - subnet: EPIC_LB_SUBNET - pool: EPIC_LB_ADDRESS_POOL - aggregation: default diff --git a/controllers/epic_agent_controller.go b/controllers/epic_agent_controller.go index d9c3411..94b01da 100644 --- a/controllers/epic_agent_controller.go +++ b/controllers/epic_agent_controller.go @@ -8,8 +8,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/pfc" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/pfc" ) // EPICAgentReconciler reconciles a EPIC object diff --git a/controllers/gwendpointslice_controller.go b/controllers/gwendpointslice_controller.go index b2a4172..495ad30 100644 --- a/controllers/gwendpointslice_controller.go +++ b/controllers/gwendpointslice_controller.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" ) // GWEndpointSliceReconciler reconciles a GWEndpointSlice object diff --git a/controllers/gwproxy_adhoc_controller.go b/controllers/gwproxy_adhoc_controller.go index 57f6d02..bf9dcd2 100644 --- a/controllers/gwproxy_adhoc_controller.go +++ b/controllers/gwproxy_adhoc_controller.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - epicexec "gitlab.com/acnodal/epic/resource-model/internal/exec" + epicv1 "epic-gateway.org/resource-model/api/v1" + epicexec "epic-gateway.org/resource-model/internal/exec" ) // GWProxyAdhocReconciler reconciles a GWProxy object by performing diff --git a/controllers/gwproxy_agent_controller.go b/controllers/gwproxy_agent_controller.go index d1846d3..28e79a5 100644 --- a/controllers/gwproxy_agent_controller.go +++ b/controllers/gwproxy_agent_controller.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - epicexec "gitlab.com/acnodal/epic/resource-model/internal/exec" - "gitlab.com/acnodal/epic/resource-model/internal/network" + epicv1 "epic-gateway.org/resource-model/api/v1" + epicexec "epic-gateway.org/resource-model/internal/exec" + "epic-gateway.org/resource-model/internal/network" ) // GWProxyAgentReconciler reconciles a GWProxy object by performing diff --git a/controllers/gwproxy_controller.go b/controllers/gwproxy_controller.go index c286281..ba44a17 100644 --- a/controllers/gwproxy_controller.go +++ b/controllers/gwproxy_controller.go @@ -22,13 +22,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/gateway-api/apis/v1alpha2" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/allocator" - "gitlab.com/acnodal/epic/resource-model/internal/envoy" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/allocator" + "epic-gateway.org/resource-model/internal/envoy" ) const ( - gitlabSecret = "gitlab" cniAnnotation = "k8s.v1.cni.cncf.io/networks" // serviceCIDREnv is the name of the env var that tells the Envoy diff --git a/controllers/gwroute_controller.go b/controllers/gwroute_controller.go index afe2dee..584dab8 100644 --- a/controllers/gwroute_controller.go +++ b/controllers/gwroute_controller.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" ) // GWRouteReconciler reconciles a GWRoute object diff --git a/controllers/loadbalancer_agent_controller.go b/controllers/loadbalancer_agent_controller.go index 7e5080d..79d53c3 100644 --- a/controllers/loadbalancer_agent_controller.go +++ b/controllers/loadbalancer_agent_controller.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - epicexec "gitlab.com/acnodal/epic/resource-model/internal/exec" - "gitlab.com/acnodal/epic/resource-model/internal/network" + epicv1 "epic-gateway.org/resource-model/api/v1" + epicexec "epic-gateway.org/resource-model/internal/exec" + "epic-gateway.org/resource-model/internal/network" ) // LoadBalancerAgentReconciler reconciles a LoadBalancer object by diff --git a/controllers/loadbalancer_controller.go b/controllers/loadbalancer_controller.go index d990378..66fd7d2 100644 --- a/controllers/loadbalancer_controller.go +++ b/controllers/loadbalancer_controller.go @@ -20,8 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/allocator" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/allocator" ) // LoadBalancerReconciler reconciles a LoadBalancer object @@ -209,9 +209,6 @@ func (r *LoadBalancerReconciler) deploymentForLB(lb *epicv1.LoadBalancer, sp *ep Spec: v1.PodSpec{ Hostname: epicv1.EDSServerName, Subdomain: "epic", - ImagePullSecrets: []v1.LocalObjectReference{ - {Name: "gitlab"}, - }, Containers: []v1.Container{{ Name: epicv1.EDSServerName, Image: envoyImage, diff --git a/controllers/namespace_controller.go b/controllers/namespace_controller.go index 67733b0..300f28d 100644 --- a/controllers/namespace_controller.go +++ b/controllers/namespace_controller.go @@ -4,9 +4,9 @@ import ( "context" "strings" + epicv1 "epic-gateway.org/resource-model/api/v1" marin3r "github.com/3scale-ops/marin3r/apis/operator.marin3r/v1alpha1" "github.com/go-logr/logr" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -339,9 +339,6 @@ func maybeCreateEDSDeployment(ctx context.Context, cl client.Client, l logr.Logg Spec: v1.PodSpec{ Hostname: epicv1.EDSServerName, Subdomain: "epic", - ImagePullSecrets: []v1.LocalObjectReference{ - {Name: "gitlab"}, - }, Containers: []v1.Container{{ Name: epicv1.EDSServerName, Image: edsImage, diff --git a/controllers/pod_agent_controller.go b/controllers/pod_agent_controller.go index de43220..9f5d797 100644 --- a/controllers/pod_agent_controller.go +++ b/controllers/pod_agent_controller.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/pfc" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/pfc" ) // PodAgentReconciler reconciles a Pod object diff --git a/controllers/pod_controller.go b/controllers/pod_controller.go index a96b61b..fedd4be 100644 --- a/controllers/pod_controller.go +++ b/controllers/pod_controller.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" ) // PodReconciler reconciles a Pod object diff --git a/controllers/remoteendpoint_controller.go b/controllers/remoteendpoint_controller.go index fe136b6..4d18386 100644 --- a/controllers/remoteendpoint_controller.go +++ b/controllers/remoteendpoint_controller.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" ) // RemoteEndpointReconciler reconciles RemoteEndpoint objects. diff --git a/controllers/serviceprefix_agent_controller.go b/controllers/serviceprefix_agent_controller.go index 9146b99..ac96e0a 100644 --- a/controllers/serviceprefix_agent_controller.go +++ b/controllers/serviceprefix_agent_controller.go @@ -11,8 +11,8 @@ import ( netclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/network" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/network" ) // ServicePrefixAgentReconciler reconciles a ServicePrefix object diff --git a/controllers/serviceprefix_controller.go b/controllers/serviceprefix_controller.go index 5449596..008b3e8 100644 --- a/controllers/serviceprefix_controller.go +++ b/controllers/serviceprefix_controller.go @@ -17,8 +17,8 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/allocator" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/allocator" ) // ServicePrefixReconciler reconciles a ServicePrefix object diff --git a/controllers/suite_test.go b/controllers/suite_test.go index a358b9c..a78ccab 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -14,7 +14,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" // +kubebuilder:scaffold:imports ) diff --git a/go.mod b/go.mod index b897302..2ea3760 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ -module gitlab.com/acnodal/epic/resource-model +module epic-gateway.org/resource-model go 1.19 -replace github.com/3scale-ops/marin3r => gitlab.com/acnodal/epic/marin3r v0.9.1-epic7 +replace github.com/3scale-ops/marin3r => epic-gateway.org/marin3r v0.9.1-epic7 require ( + epic-gateway.org/true-ingress v0.22.4 github.com/3scale-ops/marin3r v0.9.1 github.com/containernetworking/plugins v0.8.7 github.com/go-logr/logr v1.2.0 @@ -17,7 +18,6 @@ require ( github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.7.0 github.com/vishvananda/netlink v1.1.0 - gitlab.com/acnodal/epic/true-ingress v0.16.2 k8s.io/api v0.24.2 k8s.io/apimachinery v0.24.2 k8s.io/client-go v0.24.2 diff --git a/go.sum b/go.sum index e63e103..2daad0c 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,10 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +epic-gateway.org/marin3r v0.9.1-epic7 h1:YuEyZTZdJUs27qrkcW2o/xWe/f1SJpjSpJcQALmHFSE= +epic-gateway.org/marin3r v0.9.1-epic7/go.mod h1:bVIvwvEFiAtfPZnjDUJBt4Ujb6jvfeqzemOBmaEw750= +epic-gateway.org/true-ingress v0.22.4 h1:6y3NOAK8XvRGEwvhO6LUzi1C+jMQbVkF0T3WNshSkgo= +epic-gateway.org/true-ingress v0.22.4/go.mod h1:V2xlNKPoJvztoDAyyWxHmPNuTqwfWQGOxlObDeRpGVI= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -692,10 +696,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -gitlab.com/acnodal/epic/marin3r v0.9.1-epic7 h1:lezEEYtuSvcPZuwvX5Sb4fgtR72rq9Ck+tM80a8Mm8A= -gitlab.com/acnodal/epic/marin3r v0.9.1-epic7/go.mod h1:bVIvwvEFiAtfPZnjDUJBt4Ujb6jvfeqzemOBmaEw750= -gitlab.com/acnodal/epic/true-ingress v0.16.2 h1:RN01xQc3v/gPAaW3OVa0xYLovhfZr/YS2+1keWmtw5I= -gitlab.com/acnodal/epic/true-ingress v0.16.2/go.mod h1:S+uue1HGho5wOAGWZCwMv1DqhVUmhNwfv6RLCFcbYKE= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= diff --git a/internal/allocator/allocator.go b/internal/allocator/allocator.go index 7c47884..ebbae99 100644 --- a/internal/allocator/allocator.go +++ b/internal/allocator/allocator.go @@ -18,7 +18,7 @@ import ( "fmt" "net" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/allocator/allocator_test.go b/internal/allocator/allocator_test.go index e2d9491..0f6ec5d 100644 --- a/internal/allocator/allocator_test.go +++ b/internal/allocator/allocator_test.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" ) var ( diff --git a/internal/allocator/stats.go b/internal/allocator/stats.go index e216e4c..12eeb57 100644 --- a/internal/allocator/stats.go +++ b/internal/allocator/stats.go @@ -15,7 +15,7 @@ package allocator import ( - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" + epicv1 "epic-gateway.org/resource-model/api/v1" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/contour/dag/gatewayapi_processor.go b/internal/contour/dag/gatewayapi_processor.go index f03a71a..242f6c9 100644 --- a/internal/contour/dag/gatewayapi_processor.go +++ b/internal/contour/dag/gatewayapi_processor.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" gatewayapi_v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "gitlab.com/acnodal/epic/resource-model/internal/contour/gatewayapi" + "epic-gateway.org/resource-model/internal/contour/gatewayapi" ) // ComputeHosts returns the set of hostnames to match for a route. Both the result diff --git a/internal/envoy/resource.go b/internal/envoy/resource.go index 4de3a74..061622e 100644 --- a/internal/envoy/resource.go +++ b/internal/envoy/resource.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/contour/dag" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/contour/dag" ) const ( diff --git a/internal/envoy/resource_test.go b/internal/envoy/resource_test.go index fa38984..2dbf832 100644 --- a/internal/envoy/resource_test.go +++ b/internal/envoy/resource_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/utils/pointer" gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - epicv1 "gitlab.com/acnodal/epic/resource-model/api/v1" - "gitlab.com/acnodal/epic/resource-model/internal/contour/gatewayapi" + epicv1 "epic-gateway.org/resource-model/api/v1" + "epic-gateway.org/resource-model/internal/contour/gatewayapi" ) var ( diff --git a/internal/network/network.go b/internal/network/network.go index 9832bd3..27c026c 100644 --- a/internal/network/network.go +++ b/internal/network/network.go @@ -7,10 +7,10 @@ import ( "net" "syscall" + epicexec "epic-gateway.org/resource-model/internal/exec" "github.com/containernetworking/plugins/pkg/utils/sysctl" "github.com/go-logr/logr" "github.com/vishvananda/netlink" - epicexec "gitlab.com/acnodal/epic/resource-model/internal/exec" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/pfc/setup.go b/internal/pfc/setup.go index 5c4118e..27127c7 100644 --- a/internal/pfc/setup.go +++ b/internal/pfc/setup.go @@ -3,8 +3,8 @@ package pfc import ( "fmt" + epicexec "epic-gateway.org/resource-model/internal/exec" "github.com/go-logr/logr" - epicexec "gitlab.com/acnodal/epic/resource-model/internal/exec" ) // SetupNIC adds the PFC components to nic. diff --git a/main.go b/main.go index be84127..19f0b1c 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - "gitlab.com/acnodal/epic/resource-model/cmd" + "epic-gateway.org/resource-model/cmd" ) func init() {