Skip to content

Commit

Permalink
Remove v1 code (#681)
Browse files Browse the repository at this point in the history
<!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
    for Pulumi's contribution guidelines.

    Help us merge your changes more quickly by adding more details such
    as labels, milestones, and reviewers.-->

### Proposed changes

Remove any now-obsolete v1 code and fix-up the Makefile. Most of the
top-level build targets work as expected, often by delegating to the
sub-Makefiles.

TODO:

- [ ] CI scripts

Later:

- Deployment-related changes (to take place in a separate PR)
- Top-level tests

#### New Help Output
```
❯ make help

Usage:
  make <target>

General
  help             Display this help.

Development
  codegen          Generate CRDs and documentation
  generate-crdocs  Generate API Reference documentation into 'docs/crds/'.

Build
  build            Build the agent and operator binaries. 
  build-agent      Build the agent binary.
  build-operator   Build the operator manager binary.
  build-image      Build the operator image.
  push-image       Push the operator image.

Deployment
  install-crds     Install CRDs into the K8s cluster specified in ~/.kube/config.
  deploy           Deploy controller manager to the K8s cluster specified in ~/.kube/config.

Release
  prep             Prepare the next release.

Build Dependencies
  crdoc            Download crdoc locally if necessary. No version check.

```
### Related issues (optional)

<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes
#1234'.
Or link to full URLs to issues or pull requests in other GitHub
repositories. -->
  • Loading branch information
EronWright authored Sep 25, 2024
1 parent 181286c commit 8ac74b0
Show file tree
Hide file tree
Showing 59 changed files with 105,632 additions and 7,959 deletions.
90 changes: 0 additions & 90 deletions .github/workflows/master.yaml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ jobs:
- name: Login to Docker Hub
run: |
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login docker.io -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
- name: GoReleaser
uses: goreleaser/goreleaser-action@v2
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6
with:
version: v1.26.2
args: release --skip-sign
distribution: goreleaser
version: '~> v2'
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
98 changes: 0 additions & 98 deletions .github/workflows/run-acceptance-tests.yaml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ tags
### IntelliJ ###
.idea
.envrc
bin/*
33 changes: 6 additions & 27 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ version: 2
project_name: pulumi-kubernetes-operator

builds:
- ldflags:
- -X github.com/pulumi/pulumi-kubernetes-operator/version.Version={{.Tag}}
- id: pulumi-kubernetes-operator
ldflags:
- -X github.com/pulumi/pulumi-kubernetes-operator/operator/version.Version={{.Tag}}
- -w -extldflags "-static"
flags:
- -a
Expand All @@ -16,7 +17,8 @@ builds:
env:
- CGO_ENABLED=0
- GO111MODULE=on
main: ./cmd/manager/main.go
main: ./cmd/main.go
dir: operator
binary: pulumi-kubernetes-operator

- id: pulumi-kubernetes-agent
Expand Down Expand Up @@ -72,7 +74,7 @@ dockers:
goarch: amd64

# Path to the Dockerfile (from the project root).
dockerfile: Dockerfile
dockerfile: operator/Dockerfile

# Templates of the Docker image names.
image_templates:
Expand All @@ -85,26 +87,3 @@ dockers:
- "--label=org.label-schema.name={{ .ProjectName }}"
- "--label=org.label-schema.vcs-ref={{ .ShortCommit }}"
- "--label=org.label-schema.vcs-url='{{ .GitURL }}'"

- id: pulumi-kubernetes-agent
# GOOS of the built binary that should be used.
goos: linux

# GOARCH of the built binary that should be used.
goarch: amd64

# Path to the Dockerfile (from the project root).
dockerfile: agent/Dockerfile

# Templates of the Docker image names.
image_templates:
- "pulumi/pulumi-kubernetes-agent:latest"
- "pulumi/pulumi-kubernetes-agent:{{ .Version }}"

build_flag_templates:
- "--pull"
- "--label=org.label-schema.build-date={{.Date}}"
- "--label=org.label-schema.name={{ .ProjectName }}"
- "--label=org.label-schema.vcs-ref={{ .ShortCommit }}"
- "--label=org.label-schema.vcs-url='{{ .GitURL }}'"

22 changes: 0 additions & 22 deletions Dockerfile

This file was deleted.

Loading

0 comments on commit 8ac74b0

Please sign in to comment.