Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ if not os.path.exists("../cluster-bootstrap-controller"):
if not os.path.exists("../cluster-controller"):
fail("You need to git clone https://github.com/weaveworks/cluster-controller to a directory next to this")

if not os.path.exists("../templates-controller"):
fail("You need to git clone https://github.com/weaveworks/templates-controller to a directory next to this")

# This is needed for javascript access
if not os.getenv('GITHUB_TOKEN'):
Expand All @@ -35,10 +37,8 @@ k8s_yaml(helm(
values=helm_values,
))

k8s_yaml(kustomize('../cluster-controller/config/crd'))
k8s_yaml(kustomize('../cluster-bootstrap-controller/config/crd'))

docker_build('weaveworks/cluster-controller', '../cluster-controller/')
docker_build('weaveworks/templates-controller', '../templates-controller/')
docker_build('weaveworks/cluster-bootstrap-controller', '../cluster-bootstrap-controller/',
build_args={'GITHUB_BUILD_USERNAME': 'wge-build-bot', 'GITHUB_BUILD_TOKEN': os.getenv('GITHUB_TOKEN')}
)
Expand Down
7 changes: 5 additions & 2 deletions charts/mccp/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ dependencies:
- name: cluster-controller
repository: file://../cluster-controller
version: 1.0.0
- name: templates-controller
repository: file://../templates-controller
version: 0.1.0
- name: policy-agent
repository: https://weaveworks.github.io/policy-agent
version: 2.2.0
- name: pipeline-controller
repository: oci://ghcr.io/weaveworks/charts
version: 0.8.0
digest: sha256:bac4061360b443273f5e32a874014348c9e8bf0a1d8579df05acb45a6dc47eff
generated: "2022-12-20T13:27:12.179981527+02:00"
digest: sha256:7c47a2b47cd2969cdb6c4f6b407c05badd3360f33624f8a8127e0e74bbc79b59
generated: "2022-12-20T13:54:53.150146+01:00"
4 changes: 4 additions & 0 deletions charts/mccp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ dependencies:
version: "1.0.0"
repository: "file://../cluster-controller"
condition: cluster-controller.enabled
- name: templates-controller
version: "0.1.0"
repository: "file://../templates-controller"
condition: templates-controller.enabled
- name: policy-agent
version: "2.2.0"
repository: "https://weaveworks.github.io/policy-agent"
Expand Down
136 changes: 0 additions & 136 deletions charts/mccp/crds/capi.weave.works_capitemplates.yaml

This file was deleted.

136 changes: 0 additions & 136 deletions charts/mccp/crds/templates.weave.works_gitopstemplates.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions charts/mccp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,11 @@ networkPolicy:
global:
capiEnabled: true
useK8sCachedClients: false

templates-controller:
enabled: true
fullnameOverride: templates-controller
controllerManager:
manager:
image:
tag: v0.1.1
23 changes: 23 additions & 0 deletions charts/templates-controller/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
21 changes: 21 additions & 0 deletions charts/templates-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: v2
name: templates-controller
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.0"
Loading