Skip to content

Commit

Permalink
Removing unused / dead code
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Campbell <marc.e.campbell@gmail.com>
  • Loading branch information
marccampbell committed Mar 19, 2021
1 parent c9e45e8 commit af26e76
Show file tree
Hide file tree
Showing 13 changed files with 11 additions and 412 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,42 +102,3 @@ jobs:
- run: chmod +x bin/kubectl-schemahero
- run: make -C integration/tests/sqlite ${{matrix.sqlite_version}}

kots:
runs-on: ubuntu-latest
name: kots
needs: [test-mysql, test-postgres]
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Download kubectl-schemahero binary
uses: actions/download-artifact@v2.0.8
with:
name: kubectl-schemahero
path: bin/
- run: chmod +x bin/kubectl-schemahero

- uses: azure/docker-login@v1
with:
login-server: registry.replicated.com
username: ${{ secrets.REPLICATED_API_TOKEN }}
password: ${{ secrets.REPLICATED_API_TOKEN }}
- run: make kotsimages

- run: ./bin/kubectl-schemahero install --yaml --out-dir=./kots --enterprise --namespace="repl{{ Namespace }}" --enterprise-tag=alpha

- name: Lint the release
id: lint-action
uses: replicatedhq/action-kots-lint@v0.2.0
with:
replicated-app: "schemahero-enterprise"
replicated-api-token: ${{ secrets.REPLICATED_API_TOKEN }}
yaml-dir: kots

- name: Create the release
id: test-action
uses: replicatedhq/action-kots-release@v0.5.0
with:
replicated-app: "schemahero-enterprise"
replicated-api-token: ${{ secrets.REPLICATED_API_TOKEN }}
yaml-dir: kots
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ microk8s: bin/kubectl-schemahero manager
.PHONY: kind
kind: bin/kubectl-schemahero manager

.PHONY: kotsimages
kotsimages: bin/kubectl-schemahero manager

.PHONY: contoller-gen
controller-gen:
ifeq (, $(shell which controller-gen))
Expand Down
13 changes: 0 additions & 13 deletions kots/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions kots/application.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions kots/config.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions kots/preflight.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions kots/replicated-app.yaml

This file was deleted.

32 changes: 0 additions & 32 deletions kots/support-bundle.yaml

This file was deleted.

7 changes: 2 additions & 5 deletions pkg/cli/schemaherokubectlcli/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func InstallCmd() *cobra.Command {
}

if v.GetBool("yaml") {
manifests, err := installer.GenerateOperatorYAML(v.GetString("extensions-api"), v.GetBool("enterprise"), v.GetString("enterprise-tag"), v.GetString("namespace"))
manifests, err := installer.GenerateOperatorYAML(v.GetString("extensions-api"), v.GetString("namespace"))
if err != nil {
fmt.Printf("Error: %s\n", err.Error())
return err
Expand Down Expand Up @@ -69,7 +69,7 @@ func InstallCmd() *cobra.Command {
}
return nil
}
if err := installer.InstallOperator(v.GetBool("enterprise"), v.GetString("namespace")); err != nil {
if err := installer.InstallOperator(v.GetString("namespace")); err != nil {
fmt.Printf("Error: %s\n", err.Error())
return err
}
Expand All @@ -83,9 +83,6 @@ func InstallCmd() *cobra.Command {
cmd.Flags().String("out-dir", "", "If present and --yaml also specified, write all of the manifests to this directory")
cmd.Flags().String("extensions-api", "", "version of apiextensions.k8s.io to generate. if unset, will detect best version from kubernetes version")

cmd.Flags().Bool("enterprise", false, "If preset, generate enterprise YAML with KOTS template functions. This probably isn't what you want")
cmd.Flags().String("enterprise-tag", "latest", "the tag of the enterprise images to include")

cmd.Flags().StringP("namespace", "n", "schemahero-system", "The namespace to install SchemaHero Operator into")

return cmd
Expand Down
113 changes: 0 additions & 113 deletions pkg/installer/enterprise_api.go

This file was deleted.

0 comments on commit af26e76

Please sign in to comment.