Skip to content

Commit

Permalink
misc: remove production/ in favor of operations/ (#6107)
Browse files Browse the repository at this point in the history
This commit entirely removes the production/ folder in favor of
operations/; all known valid external references to the old production
folder have been removed.

Closes #6077.
  • Loading branch information
rfratto authored Jan 10, 2024
1 parent ee98c5f commit d226a0e
Show file tree
Hide file tree
Showing 85 changed files with 13 additions and 19,189 deletions.
20 changes: 1 addition & 19 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,24 +119,6 @@ trigger:
type: docker
---
kind: pipeline
name: Test manifests
platform:
arch: amd64
os: linux
steps:
- commands:
- make generate-manifests
- ERR_MSG="The environment manifests are out of date. Please run 'make generate-manifests'
and commit changes!"
- if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi
image: grafana/agent-build-image:0.30.4
name: Regenerate environment manifests
trigger:
event:
- pull_request
type: docker
---
kind: pipeline
name: Test
platform:
arch: amd64
Expand Down Expand Up @@ -1427,6 +1409,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 28ba52df6f22c10bf77a95386a49aff65a1c372127f7d89489ac2d3ee02ce618
hmac: c6d9dd05507a2967a2ba394ee5e411e9dff9135335d31881d0d3ee262c7ea63a

...
17 changes: 0 additions & 17 deletions .drone/pipelines/test.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,6 @@ local pipelines = import '../util/pipelines.jsonnet';
}],
},

pipelines.linux('Test manifests') {
trigger: {
event: ['pull_request'],
},
steps: [{
name: 'Regenerate environment manifests',
image: build_image.linux,

commands: [
'make generate-manifests',
'ERR_MSG="The environment manifests are out of date. Please run \'make generate-manifests\' and commit changes!"',
// "git status --porcelain" reports if there's any new, modified, or deleted files.
'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
],
}],
},

pipelines.linux('Test') {
trigger: {
event: ['pull_request'],
Expand Down
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
## generate-drone Generate the Drone YAML from Jsonnet.
## generate-helm-docs Generate Helm chart documentation.
## generate-helm-tests Generate Helm chart tests.
## generate-manifests Generate production/kubernetes YAML manifests.
## generate-dashboards Generate dashboards in example/docker-compose after
## changing Jsonnet.
## generate-protos Generate protobuf files.
Expand Down Expand Up @@ -286,8 +285,8 @@ smoke-image:
# Targets for generating assets
#

.PHONY: generate generate-crds generate-drone generate-helm-docs generate-helm-tests generate-manifests generate-dashboards generate-protos generate-ui generate-versioned-files
generate: generate-crds generate-drone generate-helm-docs generate-helm-tests generate-manifests generate-dashboards generate-protos generate-ui generate-versioned-files generate-docs
.PHONY: generate generate-crds generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files
generate: generate-crds generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files generate-docs

generate-crds:
ifeq ($(USE_CONTAINER),1)
Expand All @@ -314,13 +313,6 @@ else
bash ./operations/helm/scripts/rebuild-tests.sh
endif

generate-manifests:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
cd production/kubernetes/build && bash build.sh
endif

generate-dashboards:
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose/grafana/dashboards/template.jsonnet
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local agentDashboards = import 'grafana-agent-mixin/dashboards.libsonnet';
local agentDebugging = import 'grafana-agent-mixin/debugging.libsonnet';
local agentDashboards = import 'agent-static-mixin/dashboards.libsonnet';
local agentDebugging = import 'agent-static-mixin/debugging.libsonnet';

local result = agentDashboards + agentDebugging {
files: {
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"source": {
"local": {
"directory": "../../production/grafana-agent-mixin"
"directory": "../../operations/agent-static-mixin"
}
},
"version": ""
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"source": {
"local": {
"directory": "../../production/grafana-agent-mixin"
"directory": "../../operations/agent-static-mixin"
}
},
"version": ""
Expand Down
1 change: 0 additions & 1 deletion production/README.md

This file was deleted.

Loading

0 comments on commit d226a0e

Please sign in to comment.