Skip to content

Commit

Permalink
Remove remaining bazel references
Browse files Browse the repository at this point in the history
  • Loading branch information
rifelpet committed May 1, 2022
1 parent 275264a commit 5368c55
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 199 deletions.
1 change: 0 additions & 1 deletion .gitattributes
@@ -1,5 +1,4 @@
**/zz_generated.*.go linguist-generated=true
BUILD.bazel linguist-generated=true
/docs/cli/** linguist-generated=true
/protokube/pkg/gossip/mesh/mesh.pb.go linguist-generated=true
/protokube/pkg/gossip/mesh/mesh.proto linguist-generated=true
Expand Down
13 changes: 0 additions & 13 deletions .gitignore
Expand Up @@ -62,24 +62,11 @@ network_closure.sh

# build stuff
.build
.bazelbuild

# Ignore all Exhuberant Ctags files
# Removed for now - we have a package named tags
# tags

# Bazel output directories
# bazel-bin is now a symlink to .bazel-bin
bazel-genfiles
bazel-kops
bazel-out
bazel-testlogs
.bazel-bin
.bazel-genfiles
.bazel-kops
.bazel-out
.bazel-testlogs

# Ignore default apiserver config
apiserver.local.config

Expand Down
3 changes: 0 additions & 3 deletions Makefile
Expand Up @@ -250,7 +250,6 @@ gcs-upload-and-tag: gsutil gcs-upload

# gcs-publish-ci is the entry point for CI testing
# In CI testing, always upload the CI version.
# The last copy part is to satisfy kubetest2 path expectations
.PHONY: gcs-publish-ci
gcs-publish-ci: VERSION := ${KOPS_CI_VERSION}+${GITSHA}
gcs-publish-ci: gsutil version-dist-ci
Expand All @@ -259,8 +258,6 @@ gcs-publish-ci: gsutil version-dist-ci
echo "VERSION: ${VERSION}"
echo "${GCS_URL}/${VERSION}" > ${UPLOAD}/${LATEST_FILE}
gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/${LATEST_FILE} ${GCS_LOCATION}
mkdir -p .bazel-bin/cmd/kops/linux-amd64/
cp ${DIST}/linux/amd64/kops .bazel-bin/cmd/kops/linux-amd64/

.PHONY: gen-cli-docs
gen-cli-docs: kops # Regenerate CLI docs
Expand Down
126 changes: 0 additions & 126 deletions WORKSPACE

This file was deleted.

1 change: 0 additions & 1 deletion bazel-bin

This file was deleted.

6 changes: 3 additions & 3 deletions docs/contributing/adding_a_feature.md
Expand Up @@ -237,7 +237,7 @@ and then push nodeup using:
export S3_BUCKET_NAME=<yourbucketname>
make kops-install dev-upload UPLOAD_DEST=s3://${S3_BUCKET_NAME}
KOPS_VERSION=`bazelisk run //cmd/kops version -- --short`
KOPS_VERSION=`.build/dist/$(go env GOOS)/$(go env GOARCH)/kops version -- --short`
export KOPS_BASE_URL=https://${S3_BUCKET_NAME}.s3.amazonaws.com/kops/${KOPS_VERSION}/
export KOPS_ARCH=amd64
kops create cluster <clustername> --zones us-east-1b
Expand All @@ -249,7 +249,7 @@ If you have changed the dns or kOps controllers, you would want to test them as
For dns-controller:

```bash
KOPS_VERSION=`bazelisk run //cmd/kops version -- --short`
KOPS_VERSION=`.build/dist/$(go env GOOS)/$(go env GOARCH)/kops version -- --short`
export DOCKER_IMAGE_PREFIX=${USER}/
export DOCKER_REGISTRY=
make dns-controller-push
Expand All @@ -259,7 +259,7 @@ export DNSCONTROLLER_IMAGE=${DOCKER_IMAGE_PREFIX}dns-controller:${KOPS_VERSION}
For kops-controller:

```bash
KOPS_VERSION=`bazelisk run //cmd/kops version -- --short`
KOPS_VERSION=`.build/dist/$(go env GOOS)/$(go env GOARCH)/kops version -- --short`
export DOCKER_IMAGE_PREFIX=${USER}/
export DOCKER_REGISTRY=
make kops-controller-push
Expand Down
36 changes: 0 additions & 36 deletions docs/contributing/bazel.md

This file was deleted.

8 changes: 0 additions & 8 deletions docs/contributing/new_kubernetes_version.md
@@ -1,13 +1,5 @@
## Checklist for a new kubernetes version

### Update bazel rules_go / rules_docker / gazelle etc

### Run gazelle

```bash
make gazelle
```

### Check go version used in k/k

### Update base images
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing/testing.md
Expand Up @@ -49,7 +49,7 @@ kubetest2 kops \
--test \
--cloud-provider=aws \
--cluster-name=my.testcluster.com \
--kops-binary-path=${KOPS_ROOT}/.bazel-bin/cmd/kops/linux-amd64/kops \
--kops-binary-path=${KOPS_ROOT}/.build/dist/$(go env GOOS)/$(go env GOARCH)/kops \
--kubernetes-version=v1.20.2 \
--test=kops \
-- \
Expand All @@ -73,7 +73,7 @@ kubetest2 kops \
--cloud-provider=aws \
--cluster-name=my.testcluster.com \
--create-args="--networking calico" \
--kops-binary-path=${KOPS_ROOT}/.bazel-bin/cmd/kops/linux-amd64/kops \
--kops-binary-path=${KOPS_ROOT}/.build/dist/$(go env GOOS)/$(go env GOARCH)/kops \
--kubernetes-version=v1.20.2 \
--test=kops \
--
Expand All @@ -99,7 +99,7 @@ kubetest2 kops \
--up \
--cloud-provider=aws \
--cluster-name=my.testcluster.com \
--kops-binary-path=${KOPS_ROOT}/.bazel-bin/cmd/kops/linux-amd64/kops \
--kops-binary-path=${KOPS_ROOT}/.build/dist/$(go env GOOS)/$(go env GOARCH)/kops \
--kubernetes-version=v1.20.2 \
--template-path=my.testcluster.com.yaml \
--test=kops \
Expand Down
1 change: 0 additions & 1 deletion mkdocs.yml
Expand Up @@ -148,7 +148,6 @@ nav:
- Low level description on how kOps works: "contributing/how_it_works.md"
- Notes on Gossip design: "contributing/gossip.md"
- Notes on master instance sizing: "contributing/instancesizes.md"
- Bazel: "contributing/bazel.md"
- Vendoring: "contributing/vendoring.md"
- Ports: "contributing/ports.md"
- Cluster Addons & Manager : "contributing/addons.md"
Expand Down
4 changes: 2 additions & 2 deletions pkg/wellknownusers/wellknownusers.go
Expand Up @@ -28,15 +28,15 @@ const (
AWSAuthenticator = 10000

// KopsControllerID is the user id for kops-controller, which needs some extra permissions e.g. to write local logs
// This should match the user in cmd/kops-controller/BUILD.bazel
// This should match the kops-controller DaemonSet's runAsUser
KopsControllerID = 10011

// KopsControllerName is the username for the kops-controller user
KopsControllerName = "kops-controller"

// KubeApiserverHealthcheckID is the user id for kube-apiserver-healthcheck sidecar
// The user needs some extra permissions e.g. to read local secrets
// This should match the user in cmd/kube-apiserver-healthcheck/BUILD.bazel
// This should match the static pod's runAsUser
KubeApiserverHealthcheckID = 10012

// KubeApiserverHealthcheckName is the username for the kube-apiserver-healthcheck user
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/scenarios/digital-ocean/run-test
Expand Up @@ -21,9 +21,10 @@ set -o xtrace

export KOPS_FEATURE_FLAGS="SpecOverrideFlag,${KOPS_FEATURE_FLAGS:-}"
REPO_ROOT=$(git rev-parse --show-toplevel);
PATH=$REPO_ROOT/.bazel-bin/cmd/kops/$(go env GOOS)-$(go env GOARCH):$PATH
KOPSPATH=$REPO_ROOT/.build/dist/$(go env GOOS)/$(go env GOARCH)
PATH=$KOPSPATH:$PATH

KUBETEST2_COMMON_ARGS="-v=2 --cloud-provider=digitalocean --cluster-name=e2e-test-do.k8s.local --kops-binary-path=${REPO_ROOT}/.bazel-bin/cmd/kops/linux-amd64/kops"
KUBETEST2_COMMON_ARGS="-v=2 --cloud-provider=digitalocean --cluster-name=e2e-test-do.k8s.local --kops-binary-path=${KOPSPATH}/kops"
KUBETEST2_COMMON_ARGS="${KUBETEST2_COMMON_ARGS} --admin-access=${ADMIN_ACCESS:-}"

export GO111MODULE=on
Expand Down

0 comments on commit 5368c55

Please sign in to comment.