Skip to content

Commit

Permalink
Switch from private to public
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
caboteria committed Sep 13, 2023
1 parent 99d61c2 commit 2736057
Show file tree
Hide file tree
Showing 45 changed files with 283 additions and 244 deletions.
9 changes: 3 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand 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
Expand All @@ -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
12 changes: 0 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
202 changes: 202 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REPO ?= registry.gitlab.com/acnodal/epic
REPO ?= quay.io/epic-gateway
PREFIX = resource-model
SUFFIX = ${USER}-dev

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
29 changes: 0 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

## Useful Commands

To generate a new custom resource definition:
Expand Down
Loading

0 comments on commit 2736057

Please sign in to comment.