Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also 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: pluralsh/deployment-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.5.9
Choose a base ref
...
head repository: pluralsh/deployment-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.5.10
Choose a head ref
  • 8 commits
  • 38 files changed
  • 3 contributors

Commits on Jan 30, 2025

  1. Updated chart to release v0.5.9 (#359) 

    Co-authored-by: michaeljguarino <michaeljguarino@users.noreply.github.com>
    @github-actions @michaeljguarino
    github-actions[bot] and michaeljguarino authored Jan 30, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    1f9a616 View commit details

Commits on Jan 31, 2025

  1. chore: bump console go client (#360) 

    * bump console go client

* fix reconciler_test
    @zreigz
    zreigz authored Jan 31, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    42174f0 View commit details

Commits on Feb 3, 2025

  1. chore: Optimize deployment operator (#361) 

    * optimize service fetching in deployment operator

* gen mocks
    @zreigz
    zreigz authored Feb 3, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    00668e2 View commit details

Commits on Feb 6, 2025

  1. chore: bump golangci-lint-action (#364) 

    * bump golangci-lint-action

* update version in gomod

* tune fips Dockerfile

* revert fips Dockerfile
    @zreigz
    zreigz authored Feb 6, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    f0fdff0 View commit details

Commits on Feb 7, 2025

  1. feat: add namespace inference to the runtime service fetch process (#363 

    )

* add namespace inference to the runtime service fetch process

* gen mocks

* refactor
    @zreigz
    zreigz authored Feb 7, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    0a0cb7c View commit details

  2. chore: optimize stack fetching in deployment operator (#362) 

    * optimize stack fetching in deployment operator

* bump helm/kind-action

* update go client

* update go client

* fix linter
    @zreigz
    zreigz authored Feb 7, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    5a2c8de View commit details

  3. fix: go-fips (#365) 

    * fix go-fips

* update go dependencies

* update go dependencies

* change go toolchain

* go 1.23.2

* toolchain 1.23.2

* toolchain 1.23.2

* change base

* change base

* disable cgo
    @zreigz
    zreigz authored Feb 7, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    42db191 View commit details

Commits on Feb 10, 2025

  1. fetch one level up the owner references (#366)

    @zreigz
    zreigz authored Feb 10, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    f3e102d View commit details
Showing with 613 additions and 429 deletions.
  1. +2 −2 .github/workflows/ci.yaml
  2. +1 −1 .github/workflows/e2e.yaml
  3. +1 −1 Dockerfile
  4. +2 −2 charts/deployment-operator/Chart.yaml
  5. +5 −2 cmd/agent/kubernetes.go
  6. +1 −1 dockerfiles/harness/base.Dockerfile
  7. +1 −1 dockerfiles/harness/base.fips.Dockerfile
  8. +92 −87 go.mod
  9. +212 −186 go.sum
  10. +41 −1 internal/controller/common.go
  11. +65 −3 internal/controller/kubecostextractor_controller.go
  12. +1 −28 internal/controller/vulnerabilityreports_controller.go
  13. +4 −0 pkg/client/cache.go
  14. +58 −5 pkg/client/cluster.go
  15. +10 −5 pkg/client/console.go
  16. +3 −3 pkg/client/service.go
  17. +2 −2 pkg/client/stack.go
  18. +1 −1 pkg/controller/common/consts.go
  19. +9 −8 pkg/controller/service/reconciler.go
  20. +21 −12 pkg/controller/service/reconciler_scraper.go
  21. +2 −2 pkg/controller/service/reconciler_status.go
  22. +4 −4 pkg/controller/service/reconciler_test.go
  23. +1 −1 pkg/controller/service/socket_publisher.go
  24. +1 −1 pkg/controller/service/status_collector.go
  25. +4 −3 pkg/controller/stacks/reconciler.go
  26. +1 −1 pkg/manifests/cache.go
  27. +3 −3 pkg/manifests/template/helm.go
  28. +3 −3 pkg/manifests/template/helm_test.go
  29. +1 −1 pkg/manifests/template/kustomize.go
  30. +6 −6 pkg/manifests/template/kustomize_test.go
  31. +2 −2 pkg/manifests/template/raw.go
  32. +4 −4 pkg/manifests/template/raw_test.go
  33. +2 −2 pkg/manifests/template/template.go
  34. +1 −1 pkg/manifests/template/tpl.go
  35. +5 −5 pkg/manifests/template/tpl_test.go
  36. +5 −5 pkg/manifests/template/utils.go
  37. +7 −7 pkg/manifests/template/utils_test.go
  38. +29 −27 pkg/test/mocks/Client_mock.go
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@ jobs:
with:
go-version-file: go.mod
check-latest: true
- uses: golangci/golangci-lint-action@v3
- uses: golangci/golangci-lint-action@v6
with:
version: v1.60.2
version: v1.63.4
publish:
name: Build and push Agent container
runs-on: ubuntu-20.04
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
go-version-file: go.mod
cache: false
- name: Create kind cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0
- run: kind get clusters
- run: go test -v -race ./pkg/cache/... -tags="e2e"
- run: go test -v -race ./pkg/applier/filters/... -tags="e2e"
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.7-alpine3.20 AS builder
FROM golang:1.23-alpine3.20 AS builder

ARG TARGETARCH

4 changes: 2 additions & 2 deletions charts/deployment-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: deployment-operator
description: creates a new instance of the plural deployment operator
appVersion: 0.5.8
version: 0.5.8
appVersion: 0.5.9
version: 0.5.9
maintainers:
- name: Plural
url: https://www.plural.sh
7 changes: 5 additions & 2 deletions cmd/agent/kubernetes.go
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ import (
"net/http"
"os"
"strings"

cmap "github.com/orcaman/concurrent-map/v2"
"time"

trivy "github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts"
rolloutv1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
roclientset "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned"
cmap "github.com/orcaman/concurrent-map/v2"
"github.com/pluralsh/deployment-operator/cmd/agent/args"
"github.com/pluralsh/deployment-operator/internal/controller"
"github.com/pluralsh/deployment-operator/pkg/cache"
@@ -32,6 +32,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

const serviceIDCacheExpiry = 12 * time.Hour

func initKubeManagerOrDie(config *rest.Config) manager.Manager {
mgr, err := ctrl.NewManager(config, ctrl.Options{
Logger: setupLog,
@@ -252,6 +254,7 @@ func registerKubeReconcilersOrDie(
ExtConsoleClient: extConsoleClient,
Tasks: cmap.New[context.CancelFunc](),
Proxy: enableKubecostProxy,
ServiceIDCache: controller.NewServiceIDCache(serviceIDCacheExpiry),
}).SetupWithManager(manager); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "MetricsAggregate")
}
2 changes: 1 addition & 1 deletion dockerfiles/harness/base.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.19 as builder
FROM golang:1.23-alpine3.20 as builder

ARG TARGETARCH
ARG TARGETOS
2 changes: 1 addition & 1 deletion dockerfiles/harness/base.fips.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ COPY internal ./internal
COPY api ./api


RUN CGO_ENABLED=1 CC=gcc GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a \
RUN GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a \
-ldflags="-s -w -X github.com/pluralsh/deployment-operator/pkg/harness/environment.Version=${VERSION}" \
-o harness \
cmd/harness/*.go
Loading