Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: giantswarm/app-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6e87f72d78bc1b0a278640a5e74929def8a83aa0
Choose a base ref
..
head repository: giantswarm/app-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16cba30be4e877eaabe460f36a84fdfc6048e681
Choose a head ref
Showing with 541 additions and 413 deletions.
  1. +8 −0 .abs/main.yaml
  2. +154 −145 .circleci/config.yml
  3. +2 −1 .github/workflows/pre_commit_go.yaml
  4. +2 −2 .github/workflows/zz_generated.check_values_schema.yaml
  5. +5 −5 .github/workflows/zz_generated.create_release.yaml
  6. +41 −3 .github/workflows/zz_generated.create_release_pr.yaml
  7. +2 −2 .github/workflows/zz_generated.gitleaks.yaml
  8. +4 −4 .github/workflows/zz_generated.run_ossf_scorecard.yaml
  9. +5 −5 .nancy-ignore
  10. +1 −1 .pre-commit-config.yaml
  11. +34 −1 CHANGELOG.md
  12. +1 −1 Dockerfile
  13. +1 −1 flag/flag.go
  14. +1 −1 flag/service/helm/helm.go
  15. +8 −8 flag/service/service.go
  16. +2 −3 go.mod
  17. +2 −3 go.sum
  18. +2 −2 helm/app-operator/Chart.yaml
  19. +13 −2 helm/app-operator/templates/_helpers.tpl
  20. +3 −1 helm/app-operator/templates/deployment.yaml
  21. +0 −36 helm/app-operator/templates/psp.yaml
  22. +0 −33 helm/app-operator/templates/rbac.yaml
  23. +0 −13 helm/app-operator/values.schema.json
  24. +1 −9 helm/app-operator/values.yaml
  25. +11 −3 integration/key/key.go
  26. +2 −2 integration/setup/config.go
  27. +3 −3 integration/setup/setup.go
  28. +6 −1 integration/templates/chart_operator_values.go
  29. +6 −6 integration/test/app/basic/basic_test.go
  30. +1 −1 integration/test/app/basic/main_test.go
  31. +1 −1 integration/test/app/workload/main_test.go
  32. +5 −5 integration/test/app/workload/workload_cluster_test.go
  33. +3 −3 integration/test/catalog/appcatalogentry/app_catalog_entry_test.go
  34. +1 −1 integration/test/catalog/appcatalogentry/main_test.go
  35. +2 −2 integration/test/watcher/configmap/configmap_test.go
  36. +1 −1 integration/test/watcher/configmap/main_test.go
  37. +4 −4 main.go
  38. +1 −1 pkg/label/label.go
  39. +1 −1 pkg/project/project.go
  40. +1 −1 server/endpoint/endpoint.go
  41. +1 −1 server/middleware/middleware.go
  42. +3 −3 server/server.go
  43. +5 −5 service/controller/app/app.go
  44. +1 −1 service/controller/app/resource/appnamespace/resource.go
  45. +1 −1 service/controller/app/resource/catalog/resource.go
  46. +1 −1 service/controller/app/resource/chart/create.go
  47. +2 −2 service/controller/app/resource/chart/current.go
  48. +1 −1 service/controller/app/resource/chart/delete.go
  49. +4 −4 service/controller/app/resource/chart/desired.go
  50. +3 −3 service/controller/app/resource/chart/desired_test.go
  51. +2 −2 service/controller/app/resource/chart/resource.go
  52. +3 −1 service/controller/app/resource/chart/update.go
  53. +110 −7 service/controller/app/resource/chart/update_test.go
  54. +2 −2 service/controller/app/resource/chartcrd/create.go
  55. +1 −1 service/controller/app/resource/chartoperator/create.go
  56. +1 −1 service/controller/app/resource/chartoperator/create_test.go
  57. +1 −1 service/controller/app/resource/chartoperator/delete.go
  58. +1 −1 service/controller/app/resource/chartoperator/resource.go
  59. +2 −2 service/controller/app/resource/clients/resource.go
  60. +1 −1 service/controller/app/resource/configmap/create.go
  61. +1 −1 service/controller/app/resource/configmap/current.go
  62. +1 −1 service/controller/app/resource/configmap/delete.go
  63. +3 −3 service/controller/app/resource/configmap/desired.go
  64. +1 −1 service/controller/app/resource/configmap/desired_test.go
  65. +1 −1 service/controller/app/resource/configmap/resource.go
  66. +1 −1 service/controller/app/resource/configmap/update.go
  67. +1 −1 service/controller/app/resource/secret/create.go
  68. +1 −1 service/controller/app/resource/secret/current.go
  69. +1 −1 service/controller/app/resource/secret/delete.go
  70. +3 −3 service/controller/app/resource/secret/desired.go
  71. +1 −1 service/controller/app/resource/secret/desired_test.go
  72. +1 −1 service/controller/app/resource/secret/resource.go
  73. +1 −1 service/controller/app/resource/secret/update.go
  74. +1 −1 service/controller/app/resource/status/create.go
  75. +2 −2 service/controller/app/resource/tcnamespace/create.go
  76. +1 −1 service/controller/app/resource/validation/create.go
  77. +14 −14 service/controller/app/resources.go
  78. +1 −1 service/controller/catalog/catalog.go
  79. +2 −2 service/controller/catalog/resource/appcatalogentry/create.go
  80. +1 −1 service/controller/catalog/resource/appcatalogentry/resource.go
  81. +2 −2 service/controller/catalog/resources.go
  82. +1 −1 service/internal/indexcache/indexcachetest/cache.go
  83. +10 −10 service/service.go
  84. +2 −2 service/watcher/appvalue/appvalue.go
8 changes: 8 additions & 0 deletions .abs/main.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
replace-app-version-with-git: true
replace-chart-version-with-git: true
generate-metadata: true
chart-dir: ./helm/app-operator
destination: ./build

# CI overwrites this, check .circleci/config.yaml
catalog-base-url: https://giantswarm.github.io/control-plane-catalog/
299 changes: 154 additions & 145 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,165 +1,174 @@
version: 2.1
orbs:
architect: giantswarm/architect@5.2.1
architect: giantswarm/architect@5.11.1

workflows:
build:
jobs:
- architect/go-build:
context: architect
name: go-build
binary: app-operator
filters:
tags:
only: /^v.*/
- architect/go-build:
context: architect
name: go-build
binary: app-operator
filters:
tags:
only: /^v.*/

- architect/push-to-registries:
context: architect
name: push-to-registries
requires:
- go-build
filters:
tags:
only: /^v.*/
- architect/push-to-registries:
context: architect
name: push-to-registries
requires:
- go-build
filters:
tags:
only: /^v.*/

- architect/push-to-app-catalog:
context: architect
name: push-app-operator-to-control-plane-app-catalog
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "app-operator"
requires:
- push-to-registries
filters:
tags:
only: /^v.*/
branches:
ignore:
- main
- master
- architect/push-to-app-catalog:
context: architect
executor: app-build-suite
name: push-app-operator-to-control-plane-app-catalog
app_catalog: control-plane-catalog
app_catalog_test: control-plane-test-catalog
chart: app-operator
requires:
- push-to-registries
filters:
tags:
only: /^v.*/

- architect/integration-test:
context: architect
name: basic-integration-test
install-app-platform: false
setup-script: "integration/setup/setup.sh"
test-dir: "integration/test/app/basic"
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog
branches:
ignore:
- main
- master
- architect/integration-test:
context: architect
name: basic-integration-test
install-app-platform: false
setup-script: integration/setup/setup.sh
test-dir: integration/test/app/basic
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog

- architect/integration-test:
context: architect
name: appcatalogentry-integration-test
setup-script: "integration/setup/setup.sh"
test-dir: "integration/test/catalog/appcatalogentry"
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog
- architect/integration-test:
context: architect
name: appcatalogentry-integration-test
setup-script: integration/setup/setup.sh
test-dir: integration/test/catalog/appcatalogentry
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog

- architect/integration-test:
context: architect
name: watching-configmap-integration-test
setup-script: "integration/setup/setup.sh"
test-dir: "integration/test/watcher/configmap"
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog
- architect/integration-test:
context: architect
name: watching-configmap-integration-test
setup-script: integration/setup/setup.sh
test-dir: integration/test/watcher/configmap
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog

- architect/integration-test:
context: architect
name: workload-cluster-integration-test
setup-script: "integration/setup/setup.sh"
test-dir: "integration/test/app/workload"
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog
- architect/integration-test:
context: architect
name: workload-cluster-integration-test
setup-script: integration/setup/setup.sh
test-dir: integration/test/app/workload
requires:
- go-build
- push-app-operator-to-control-plane-app-catalog

- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-aws-app-collection
app_name: "app-operator"
app_collection_repo: "aws-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
- push-to-registries
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-aws-app-collection
app_name: app-operator
app_collection_repo: aws-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
- push-to-registries
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-azure-app-collection
app_name: "app-operator"
app_collection_repo: "azure-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-azure-app-collection
app_name: app-operator
app_collection_repo: azure-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-vsphere-app-collection
app_name: "app-operator"
app_collection_repo: "vsphere-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-app-operator-to-vsphere-app-collection
app_name: app-operator
app_collection_repo: vsphere-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/


- architect/push-to-app-collection:
name: push-to-cloud-director-app-collection
context: architect
app_name: "app-operator"
app_collection_repo: "cloud-director-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
name: push-to-cloud-director-app-collection
context: architect
app_name: app-operator
app_collection_repo: cloud-director-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: push-to-capa-app-collection
app_name: "app-operator"
app_collection_repo: "capa-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-to-capa-app-collection
app_name: app-operator
app_collection_repo: capa-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: push-to-capz-app-collection
app_name: "app-operator"
app_collection_repo: "capz-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-to-capz-app-collection
app_name: app-operator
app_collection_repo: capz-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: push-to-gcp-app-collection
app_name: "app-operator"
app_collection_repo: "gcp-app-collection"
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: push-to-gcp-app-collection
app_name: app-operator
app_collection_repo: gcp-app-collection
requires:
- push-app-operator-to-control-plane-app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
3 changes: 2 additions & 1 deletion .github/workflows/pre_commit_go.yaml
View file
Original file line number Diff line number Diff line change
@@ -19,9 +19,10 @@ jobs:
go install golang.org/x/tools/cmd/goimports@latest
- name: Install golangci-lint
env:
GOGC: "20"
GOLANGCI_LINT_VERSION: "v1.60.3"
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
sudo sh -s -- -b $GOPATH/bin ${GOLANGCI_LINT_VERSION}
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
env:
GOGC: "20" # keep golangci-lint memory usage in check
4 changes: 2 additions & 2 deletions .github/workflows/zz_generated.check_values_schema.yaml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#
# devctl
#
# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/check_values_schema.yaml.template
# https://github.com/giantswarm/devctl/blob/8960b8810d2fdb97543d84baa8b50ffa40da26a9/pkg/gen/input/workflows/internal/file/check_values_schema.yaml.template
#
name: 'Values and schema'
on:
@@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0

Loading