Skip to content

Commit d226a0e

Browse files
authored
misc: remove production/ in favor of operations/ (#6107)
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.
1 parent ee98c5f commit d226a0e

File tree

85 files changed

+13
-19189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+13
-19189
lines changed

Diff for: .drone/drone.yml

+1-19
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,6 @@ trigger:
119119
type: docker
120120
---
121121
kind: pipeline
122-
name: Test manifests
123-
platform:
124-
arch: amd64
125-
os: linux
126-
steps:
127-
- commands:
128-
- make generate-manifests
129-
- ERR_MSG="The environment manifests are out of date. Please run 'make generate-manifests'
130-
and commit changes!"
131-
- if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi
132-
image: grafana/agent-build-image:0.30.4
133-
name: Regenerate environment manifests
134-
trigger:
135-
event:
136-
- pull_request
137-
type: docker
138-
---
139-
kind: pipeline
140122
name: Test
141123
platform:
142124
arch: amd64
@@ -1427,6 +1409,6 @@ kind: secret
14271409
name: updater_private_key
14281410
---
14291411
kind: signature
1430-
hmac: 28ba52df6f22c10bf77a95386a49aff65a1c372127f7d89489ac2d3ee02ce618
1412+
hmac: c6d9dd05507a2967a2ba394ee5e411e9dff9135335d31881d0d3ee262c7ea63a
14311413

14321414
...

Diff for: .drone/pipelines/test.jsonnet

-17
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,6 @@ local pipelines = import '../util/pipelines.jsonnet';
5050
}],
5151
},
5252

53-
pipelines.linux('Test manifests') {
54-
trigger: {
55-
event: ['pull_request'],
56-
},
57-
steps: [{
58-
name: 'Regenerate environment manifests',
59-
image: build_image.linux,
60-
61-
commands: [
62-
'make generate-manifests',
63-
'ERR_MSG="The environment manifests are out of date. Please run \'make generate-manifests\' and commit changes!"',
64-
// "git status --porcelain" reports if there's any new, modified, or deleted files.
65-
'if [ ! -z "$(git status --porcelain)" ]; then echo $ERR_MSG >&2; exit 1; fi',
66-
],
67-
}],
68-
},
69-
7053
pipelines.linux('Test') {
7154
trigger: {
7255
event: ['pull_request'],

Diff for: Makefile

+2-10
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
## generate-drone Generate the Drone YAML from Jsonnet.
5757
## generate-helm-docs Generate Helm chart documentation.
5858
## generate-helm-tests Generate Helm chart tests.
59-
## generate-manifests Generate production/kubernetes YAML manifests.
6059
## generate-dashboards Generate dashboards in example/docker-compose after
6160
## changing Jsonnet.
6261
## generate-protos Generate protobuf files.
@@ -286,8 +285,8 @@ smoke-image:
286285
# Targets for generating assets
287286
#
288287

289-
.PHONY: generate generate-crds generate-drone generate-helm-docs generate-helm-tests generate-manifests generate-dashboards generate-protos generate-ui generate-versioned-files
290-
generate: generate-crds generate-drone generate-helm-docs generate-helm-tests generate-manifests generate-dashboards generate-protos generate-ui generate-versioned-files generate-docs
288+
.PHONY: generate generate-crds generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files
289+
generate: generate-crds generate-drone generate-helm-docs generate-helm-tests generate-dashboards generate-protos generate-ui generate-versioned-files generate-docs
291290

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

317-
generate-manifests:
318-
ifeq ($(USE_CONTAINER),1)
319-
$(RERUN_IN_CONTAINER)
320-
else
321-
cd production/kubernetes/build && bash build.sh
322-
endif
323-
324316
generate-dashboards:
325317
ifeq ($(USE_CONTAINER),1)
326318
$(RERUN_IN_CONTAINER)

Diff for: example/docker-compose/grafana/dashboards/template.jsonnet

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
local agentDashboards = import 'grafana-agent-mixin/dashboards.libsonnet';
2-
local agentDebugging = import 'grafana-agent-mixin/debugging.libsonnet';
1+
local agentDashboards = import 'agent-static-mixin/dashboards.libsonnet';
2+
local agentDebugging = import 'agent-static-mixin/debugging.libsonnet';
33

44
local result = agentDashboards + agentDebugging {
55
files: {

Diff for: example/docker-compose/jsonnetfile.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"source": {
66
"local": {
7-
"directory": "../../production/grafana-agent-mixin"
7+
"directory": "../../operations/agent-static-mixin"
88
}
99
},
1010
"version": ""

Diff for: example/docker-compose/jsonnetfile.lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"source": {
2626
"local": {
27-
"directory": "../../production/grafana-agent-mixin"
27+
"directory": "../../operations/agent-static-mixin"
2828
}
2929
},
3030
"version": ""

Diff for: production/README.md

-1
This file was deleted.

0 commit comments

Comments
 (0)