Apiv1beta1

.github/workflows/.goreleaser.yml

@@ -16,6 +16,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
+          check-latest: true
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

.github/workflows/actions.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: commit-check
-        uses: docker://ghcr.io/haproxytech/commit-check:3.0.0
+        uses: docker://ghcr.io/haproxytech/commit-check:3.0.1
         env:
           API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   generate:
@@ -23,6 +23,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
+          check-latest: true
       - name: generating documentation
         run: cd documentation/gen && go run .
       - name: changes
@@ -39,6 +40,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
+          check-latest: true
       - uses: actions/cache@v2
         with:
           path: |
@@ -61,6 +63,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
+          check-latest: true
       - uses: actions/cache@v2
         with:
           path: |
@@ -84,6 +87,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
+          check-latest: true
       - uses: actions/cache@v2
         with:
           path: |
@@ -106,6 +110,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version-file: 'go.mod'
+        check-latest: true
     - uses: actions/cache@v2
       with:
         path: |
@@ -133,6 +138,7 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version-file: 'go.mod'
+        check-latest: true
     - uses: actions/cache@v2
       with:
         path: |

.gitignore

@@ -5,3 +5,4 @@ kubernetes-ingress
 dist/
 .code-generator/
 bin/golangci-lint
+.local/*

.gitlab-ci.yml

@@ -28,6 +28,23 @@ diff:
   script:
     - test -z "$(git diff 2> /dev/null)" || exit "Documentation is not generated, issue \`cd documentation/gen && go run .\` and commit the result"
     - test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" || exit "Documentation created untracked files, cannot proceed"
+diff-crd:
+  stage: diff
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+  image:
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
+    entrypoint: [ "" ]
+  tags:
+    - go
+  before_script:
+    - go version
+    - make cr_generate
+  script:
+    - git diff
+    - test -z "$(git diff 2> /dev/null)" || exit "CRD generation was not generated, issue \`make cr_generate\` and commit the result"
+    - test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" || exit "CRD generation created untracked files, cannot proceed"
 tidy:
   stage: lint
   needs: []
@@ -108,7 +125,7 @@ docker-build:
   tags:
     - go
   before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY_GO
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY_GO
     - go version
     - docker pull -q $CI_REGISTRY_GO/alpine:3
     - docker image tag $CI_REGISTRY_GO/alpine:3 alpine:3
@@ -137,7 +154,7 @@ docker-build-sch:
   tags:
     - go
   before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY_GO
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY_GO
     - go version
     - docker pull -q $CI_REGISTRY_GO/alpine:3
     - docker image tag $CI_REGISTRY_GO/alpine:3 alpine:3
@@ -174,7 +191,7 @@ docker-build-sch:
     exclude:
       - tar/*
   before_script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY_GO
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY_GO
     - docker load -i tar/k8sIC.tar
     - go version
     - go mod download &

Makefile

@@ -25,7 +25,7 @@ doc:
 .PHONY: lint
 lint:
 	cd bin;GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION} sh lint-check.sh
-	bin/golangci-lint run --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0
+	bin/golangci-lint run --timeout 10m --color always --max-issues-per-linter 0 --max-same-issues 0
 
 .PHONY: yaml-lint
 yaml-lint:
@@ -78,8 +78,6 @@ publish:
 .PHONY: cr_generate
 cr_generate:
 	crs/code-generator.sh
-	grep -lir defaultses crs/* | xargs sed -i 's/Defaultses/Defaults/g'
-	grep -lir defaultses crs/* | xargs sed -i 's/defaultses/defaults/g'
 
 .PHONY: gofumpt
 gofumpt:

build/Dockerfile

@@ -33,7 +33,7 @@ RUN mkdir -p /var/run/vars && \
     git diff --quiet > /var/run/vars/GIT_MODIFIED2 || echo '.dirty' > /var/run/vars/GIT_MODIFIED2 && \
     cat /var/run/vars/GIT_MODIFIED1 /var/run/vars/GIT_MODIFIED2 | tr -d '\n' > /var/run/vars/GIT_MODIFIED && \
     CGO_ENABLED=0 go build \
-        -ldflags "-X main.GitRepo=$(cat /var/run/vars/GIT_REPO) -X main.GitTag=$(cat /var/run/vars/GIT_LAST_TAG) -X main.GitCommit=$(cat /var/run/vars/GIT_HEAD_COMMIT) -X main.GitDirty=$(cat /var/run/vars/GIT_MODIFIED) -X \"main.GitCommitDate=$(cat /var/run/vars/GIT_DATE_LAST_COMMIT)\"" \
+        -ldflags "-X pkg.version.GitRepo=$(cat /var/run/vars/GIT_REPO) -X pkg.version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG) -X pkg.version.GitCommit=$(cat /var/run/vars/GIT_HEAD_COMMIT) -X pkg.version.GitDirty=$(cat /var/run/vars/GIT_MODIFIED) -X \"pkg.version.GitCommitDate=$(cat /var/run/vars/GIT_DATE_LAST_COMMIT)\"" \
         -o fs/haproxy-ingress-controller .
 
 FROM haproxytech/haproxy-alpine:2.8

build/Dockerfile.pebble

@@ -35,7 +35,7 @@ RUN mkdir -p /var/run/vars && \
     git diff --quiet > /var/run/vars/GIT_MODIFIED2 || echo '.dirty' > /var/run/vars/GIT_MODIFIED2 && \
     cat /var/run/vars/GIT_MODIFIED1 /var/run/vars/GIT_MODIFIED2 | tr -d '\n' > /var/run/vars/GIT_MODIFIED && \
     CGO_ENABLED=0 go build \
-        -ldflags "-X main.GitRepo=$(cat /var/run/vars/GIT_REPO) -X main.GitTag=$(cat /var/run/vars/GIT_LAST_TAG) -X main.GitCommit=$(cat /var/run/vars/GIT_HEAD_COMMIT) -X main.GitDirty=$(cat /var/run/vars/GIT_MODIFIED) -X \"main.GitCommitDate=$(cat /var/run/vars/GIT_DATE_LAST_COMMIT)\"" \
+        -ldflags "-X pkg.version.GitRepo=$(cat /var/run/vars/GIT_REPO) -X pkg.version.GitTag=$(cat /var/run/vars/GIT_LAST_TAG) -X pkg.version.GitCommit=$(cat /var/run/vars/GIT_HEAD_COMMIT) -X pkg.version.GitDirty=$(cat /var/run/vars/GIT_MODIFIED) -X \"pkg.version.GitCommitDate=$(cat /var/run/vars/GIT_DATE_LAST_COMMIT)\"" \
         -o fs/haproxy-ingress-controller .
 
 FROM haproxytech/haproxy-alpine:2.8

crs/api/core/v1alpha1/global.go

@@ -47,6 +47,7 @@ func (in *GlobalSpec) DeepCopyInto(out *GlobalSpec) {
 		out.LogTargets = make([]*models.LogTarget, len(in.LogTargets))
 		for i, v := range in.LogTargets {
 			b, _ := v.MarshalBinary()
+			out.LogTargets[i] = &models.LogTarget{}
 			_ = out.LogTargets[i].UnmarshalBinary(b)
 		}
 	}

crs/api/core/v1alpha2/global.go

@@ -47,6 +47,7 @@ func (in *GlobalSpec) DeepCopyInto(out *GlobalSpec) {
 		out.LogTargets = make([]*models.LogTarget, len(in.LogTargets))
 		for i, v := range in.LogTargets {
 			b, _ := v.MarshalBinary()
+			out.LogTargets[i] = &models.LogTarget{}
 			_ = out.LogTargets[i].UnmarshalBinary(b)
 		}
 	}

crs/api/ingress/v1/backend.go

@@ -0,0 +1,56 @@
+// Copyright 2019 HAProxy Technologies
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package v1
+
+import (
+	"github.com/haproxytech/client-native/v5/models"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
+
+// Backend is a specification for a Backend resource
+type Backend struct {
+	Spec              BackendSpec `json:"spec"`
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+}
+
+// BackendSpec defines the desired state of Backend
+type BackendSpec struct {
+	Config *models.Backend `json:"config"`
+}
+
+// DeepCopyInto deepcopying  the receiver into out. in must be non-nil.
+func (in *BackendSpec) DeepCopyInto(out *BackendSpec) {
+	*out = *in
+	if in.Config != nil {
+		b, _ := in.Config.MarshalBinary()
+		_ = out.Config.UnmarshalBinary(b)
+	}
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// BackendList is a list of Backend resources
+type BackendList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+
+	Items []Backend `json:"items"`
+}

crs/api/ingress/v1/defaults.go

@@ -0,0 +1,56 @@
+// Copyright 2019 HAProxy Technologies
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package v1
+
+import (
+	"github.com/haproxytech/client-native/v5/models"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
+
+// Defaults is a specification for a Defaults resource
+type Defaults struct {
+	Spec              DefaultsSpec `json:"spec"`
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+}
+
+// DefaultsSpec defines the desired state of Defaults
+type DefaultsSpec struct {
+	Config *models.Defaults `json:"config"`
+}
+
+// DeepCopyInto deepcopying  the receiver into out. in must be non-nil.
+func (in *DefaultsSpec) DeepCopyInto(out *DefaultsSpec) {
+	*out = *in
+	if in.Config != nil {
+		b, _ := in.Config.MarshalBinary()
+		_ = out.Config.UnmarshalBinary(b)
+	}
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// DefaultsList is a list of Defaults resources
+type DefaultsList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+
+	Items []Defaults `json:"items"`
+}

crs/api/ingress/v1/doc.go

@@ -0,0 +1,5 @@
+// Package v1 contains the core v1 API group
+//
+// +k8s:deepcopy-gen=package
+// +groupName=ingress.v1.haproxy.org
+package v1

crs/api/ingress/v1/global.go

@@ -0,0 +1,69 @@
+// Copyright 2019 HAProxy Technologies
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package v1
+
+import (
+	"github.com/haproxytech/client-native/v5/models"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:metadata:annotations="haproxy.org/client-native=v5.0.3"
+// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.default_path)", message="spec.config.default_path is set by ingress controller internally"
+// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.master__dash__worker)", message="spec.config.master-worker is set by ingress controller internally"
+// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.pidfile)", message="spec.config.pidfile is set by ingress controller internally"
+// +kubebuilder:validation:XValidation:rule="!has(self.spec.config.localpeer)", message="spec.config.localpeer is set by ingress controller internally"
+
+// Global is a specification for a Global resource
+type Global struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec GlobalSpec `json:"spec"`
+}
+
+// GlobalSpec defines the desired state of Global
+type GlobalSpec struct {
+	Config     *models.Global    `json:"config"`
+	LogTargets models.LogTargets `json:"log_targets,omitempty"` //nolint:tagliatelle
+}
+
+// DeepCopyInto deepcopying  the receiver into out. in must be non-nil.
+func (in *GlobalSpec) DeepCopyInto(out *GlobalSpec) {
+	if in.Config != nil {
+		b, _ := in.Config.MarshalBinary()
+		_ = out.Config.UnmarshalBinary(b)
+	}
+	if in.LogTargets != nil {
+		out.LogTargets = make([]*models.LogTarget, len(in.LogTargets))
+		for i, v := range in.LogTargets {
+			b, _ := v.MarshalBinary()
+			out.LogTargets[i] = &models.LogTarget{}
+			_ = out.LogTargets[i].UnmarshalBinary(b)
+		}
+	}
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// GlobalList is a list of Global resources
+type GlobalList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+
+	Items []Global `json:"items"`
+}