Commit 8206780f authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch '382044-remove-cilium-network-policies-from-chart' into 'master' 

chore: remove unsupported ciliumNetworkPolicies

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/320



Merged-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Co-authored-by: default avatarAlan (Maciej) Paruszewski <mparuszewski@gitlab.com>
parents 473b096d 89089398

.gitlab/ci/release.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#   * If there is a new release it will tag the repository with the new release as the `ops-gitlab-net`

#     user

.semantic-release:

  image: node:14

  image: node:18

  stage: release



release-tag:

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 2.39.0

version: 2.40.0

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/README.md

+1 −4
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ 
| prometheus.metrics            | Annotates the service for prometheus auto-discovery. Also denies access to the `/metrics` endpoint from external addresses with Ingress. | `false` |

| networkPolicy.enabled(**DEPRECATED**)         | Enable container network policy | `false` |

| networkPolicy.spec(**DEPRECATED**)            | [Network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) definition | `{ podSelector: { matchLabels: {} }, ingress: [{ from: [{ podSelector: { matchLabels: {} } }, { namespaceSelector: { matchLabels: { app.gitlab.com/managed_by: gitlab } } }] }] }` |

| ciliumNetworkPolicy.enabled(**DEPRECATED**)         | Enable container cilium network policy | `false` |

| ciliumNetworkPolicy.alerts.enabled(**DEPRECATED**)         | Enable alert generation for container cilium network policy | `false` |

| ciliumNetworkPolicy.spec(**DEPRECATED**)            | [Cilium network policy](https://docs.cilium.io/en/v1.8/concepts/kubernetes/policy/#ciliumnetworkpolicy/) definition | `{ endpointSelector: {}, ingress: [{ fromEndpoints: [{ matchLabels: { app.gitlab.com/managed_by: gitlab } }] }] }` |

| persistence.enabled           | Allow a [persistent volume claim](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims) (PVC) to be mounted as a volume. <br/> **Warning:** Auto-created PVCs are deleted any time `persistence.enabled` is set to `false`. | `false` |

| persistence.volumes[].name         | The name of the volume. | `data` |

| persistence.volumes[].mount.path         | The mount path in the deployment containers. | `/pvc-mount` |

assets/auto-deploy-app/templates/cilium-network-policy.yaml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{{- if .Values.ciliumNetworkPolicy.enabled -}}

apiVersion: cilium.io/v2

kind: CiliumNetworkPolicy

metadata:

  name: {{ template "fullname" . }}

{{- if .Values.ciliumNetworkPolicy.alerts.enabled }}

  annotations:

    "app.gitlab.com/alert": "true"

{{- end }}

  labels:

    app.gitlab.com/proj: {{ .Values.gitlab.projectID | quote }}

{{ include "sharedlabels" . | indent 4}}

spec:

{{ toYaml .Values.ciliumNetworkPolicy.spec | indent 2 }}

{{- end -}}

assets/auto-deploy-app/test/go.mod

+0 −42
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ module gitlab.com/gitlab-org/charts/auto-deploy-app/test 
go 1.18



require (

	github.com/cilium/cilium v1.8.1

	github.com/gruntwork-io/terratest v0.40.22

	github.com/stretchr/testify v1.8.0

	gopkg.in/yaml.v3 v3.0.1
@@ -13,32 +12,18 @@ require ( 


require (

	cloud.google.com/go/compute v1.10.0 // indirect

	github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e // indirect

	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect

	github.com/aws/aws-sdk-go v1.44.107 // indirect

	github.com/beorn7/perks v1.0.1 // indirect

	github.com/boombuler/barcode v1.0.1 // indirect

	github.com/cespare/xxhash/v2 v2.1.1 // indirect

	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/emicklei/go-restful/v3 v3.9.0 // indirect

	github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52 // indirect

	github.com/ghodss/yaml v1.0.0 // indirect

	github.com/go-errors/errors v1.4.2 // indirect

	github.com/go-logr/logr v1.2.3 // indirect

	github.com/go-ole/go-ole v1.2.1 // indirect

	github.com/go-openapi/analysis v0.19.10 // indirect

	github.com/go-openapi/errors v0.19.3 // indirect

	github.com/go-openapi/jsonpointer v0.19.5 // indirect

	github.com/go-openapi/jsonreference v0.20.0 // indirect

	github.com/go-openapi/loads v0.19.5 // indirect

	github.com/go-openapi/runtime v0.19.4 // indirect

	github.com/go-openapi/spec v0.19.6 // indirect

	github.com/go-openapi/strfmt v0.19.4 // indirect

	github.com/go-openapi/swag v0.22.3 // indirect

	github.com/go-openapi/validate v0.19.5 // indirect

	github.com/go-sql-driver/mysql v1.6.0 // indirect

	github.com/go-stack/stack v1.8.0 // indirect

	github.com/gogo/protobuf v1.3.2 // indirect

	github.com/golang/protobuf v1.5.2 // indirect

	github.com/google/gnostic v0.6.9 // indirect
@@ -47,49 +32,26 @@ require ( 
	github.com/gruntwork-io/go-commons v0.13.3 // indirect

	github.com/hashicorp/errwrap v1.1.0 // indirect

	github.com/hashicorp/go-multierror v1.1.1 // indirect

	github.com/hashicorp/hcl v1.0.0 // indirect

	github.com/imdario/mergo v0.3.13 // indirect

	github.com/jmespath/go-jmespath v0.4.0 // indirect

	github.com/josharian/intern v1.0.0 // indirect

	github.com/json-iterator/go v1.1.12 // indirect

	github.com/kr/pretty v0.2.0 // indirect

	github.com/kr/text v0.2.0 // indirect

	github.com/magiconair/properties v1.8.5 // indirect

	github.com/mailru/easyjson v0.7.7 // indirect

	github.com/mattn/go-zglob v0.0.3 // indirect

	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect

	github.com/miekg/dns v1.1.31 // indirect

	github.com/mitchellh/go-homedir v1.1.0 // indirect

	github.com/mitchellh/mapstructure v1.1.2 // indirect

	github.com/moby/spdystream v0.2.0 // indirect

	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

	github.com/modern-go/reflect2 v1.0.2 // indirect

	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

	github.com/pelletier/go-toml v1.4.0 // indirect

	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect

	github.com/pmezard/go-difflib v1.0.0 // indirect

	github.com/pquerna/otp v1.3.0 // indirect

	github.com/prometheus/client_golang v1.2.0 // indirect

	github.com/prometheus/client_model v0.2.0 // indirect

	github.com/prometheus/common v0.7.0 // indirect

	github.com/prometheus/procfs v0.0.5 // indirect

	github.com/russross/blackfriday/v2 v2.1.0 // indirect

	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect

	github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 // indirect

	github.com/sirupsen/logrus v1.8.1 // indirect

	github.com/spf13/afero v1.2.2 // indirect

	github.com/spf13/cast v1.3.0 // indirect

	github.com/spf13/jwalterweatherman v1.0.0 // indirect

	github.com/spf13/pflag v1.0.5 // indirect

	github.com/spf13/viper v1.6.1 // indirect

	github.com/subosito/gotenv v1.2.0 // indirect

	github.com/urfave/cli/v2 v2.17.1 // indirect

	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect

	go.mongodb.org/mongo-driver v1.3.0 // indirect

	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect

	golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect

	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect

	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect

	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect

	golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect

	golang.org/x/text v0.3.7 // indirect
@@ -97,10 +59,8 @@ require ( 
	google.golang.org/appengine v1.6.7 // indirect

	google.golang.org/protobuf v1.28.1 // indirect

	gopkg.in/inf.v0 v0.9.1 // indirect

	gopkg.in/ini.v1 v1.51.0 // indirect

	gopkg.in/yaml.v2 v2.4.0 // indirect

	k8s.io/client-go v0.25.2 // indirect

	k8s.io/klog v1.0.0 // indirect

	k8s.io/klog/v2 v2.80.1 // indirect

	k8s.io/kube-openapi v0.0.0-20220928191237-829ce0c27909 // indirect

	k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect
@@ -108,5 +68,3 @@ require ( 
	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

	sigs.k8s.io/yaml v1.3.0 // indirect

)
 


replace github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b