Skip to content

Commit d199281

Browse files
jelemuxcesmarvin
jelemux
authored and
cesmarvin
committed
Merge branch 'release/v1.8.0' into main
2 parents cabe6c3 + 0614ad5 commit d199281

9 files changed

Lines changed: 68 additions & 18 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.8.0] - 2025-03-31
10+
### Added
11+
- [#87] Add additional print columns and aliases to CRD
12+
13+
### Changed
14+
- [#87] Upgrade Golang to v1.24.1
15+
916
## [v1.7.0] - 2025-01-27
1017
### Added
1118
- [#85] Proxy support for the registry http client in helm. The proxy will be used from the secret `ces-proxy` which will be created by the setup.

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.4 AS builder
2+
FROM golang:1.24.1 AS builder
33

44
ENV GOPRIVATE=github.com/cloudogu/cesapp/v5
55

@@ -35,7 +35,7 @@ RUN make compile-generic
3535
FROM gcr.io/distroless/static:nonroot
3636
LABEL maintainer="hello@cloudogu.com" \
3737
NAME="k8s-component-operator" \
38-
VERSION="1.7.0"
38+
VERSION="1.8.0"
3939

4040
WORKDIR /
4141
COPY --from=builder /workspace/target/k8s-component-operator .

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ github = new GitHub(this, git)
1212
changelog = new Changelog(this)
1313
Docker docker = new Docker(this)
1414
gpg = new Gpg(this, docker)
15-
goVersion = "1.23"
15+
goVersion = "1.24.1"
1616
makefile = new Makefile(this)
1717

1818
// Configuration of repository

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Set these to the desired values
22
ARTIFACT_ID=k8s-component-operator
3-
VERSION=1.7.0
3+
VERSION=1.8.0
44
## Image URL to use all building/pushing image targets
55
IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
6-
GOTAG?=1.23.4
6+
GOTAG?=1.24.1
77
MAKEFILES_VERSION=9.3.2
8-
LINT_VERSION?=v1.61.0
8+
LINT_VERSION?=v1.64.8
99

1010
ADDITIONAL_CLEAN=dist-clean
1111

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/cloudogu/k8s-component-operator
22

3-
go 1.23.1
4-
5-
toolchain go1.23.4
3+
go 1.24.1
64

75
require (
86
github.com/Masterminds/semver/v3 v3.3.1

‎k8s/helm-crd/templates/k8s.cloudogu.com_components.yaml‎

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app: ces
99
app.kubernetes.io/name: k8s-component-operator
@@ -15,27 +15,61 @@ spec:
1515
kind: Component
1616
listKind: ComponentList
1717
plural: components
18+
shortNames:
19+
- comp
1820
singular: component
1921
scope: Namespaced
2022
versions:
21-
- name: v1
23+
- additionalPrinterColumns:
24+
- description: The desired version of the component
25+
jsonPath: .spec.version
26+
name: Spec-Version
27+
type: string
28+
- description: The current version of the component
29+
jsonPath: .status.installedVersion
30+
name: Installed Version
31+
type: string
32+
- description: The current health state of the component
33+
jsonPath: .status.health
34+
name: Health
35+
type: string
36+
- description: The current status of the component
37+
jsonPath: .status.status
38+
name: Status
39+
type: string
40+
- description: The age of the component
41+
jsonPath: .metadata.creationTimestamp
42+
name: Age
43+
type: date
44+
name: v1
2245
schema:
2346
openAPIV3Schema:
2447
description: Component is the Schema for the ces component API
2548
properties:
2649
apiVersion:
27-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
50+
description: |-
51+
APIVersion defines the versioned schema of this representation of an object.
52+
Servers should convert recognized schemas to the latest internal value, and
53+
may reject unrecognized values.
54+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2855
type: string
2956
kind:
30-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
57+
description: |-
58+
Kind is a string value representing the REST resource this object represents.
59+
Servers may infer this from the endpoint the client submits requests to.
60+
Cannot be updated.
61+
In CamelCase.
62+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3163
type: string
3264
metadata:
3365
type: object
3466
spec:
3567
description: ComponentSpec defines the desired state of a component.
3668
properties:
3769
deployNamespace:
38-
description: DeployNamespace is the namespace where the helm chart should be deployed in. This value is optional. If it is empty the operator deploys the helm chart in the namespace where the operator is deployed.
70+
description: |-
71+
DeployNamespace is the namespace where the helm chart should be deployed in.
72+
This value is optional. If it is empty the operator deploys the helm chart in the namespace where the operator is deployed.
3973
type: string
4074
name:
4175
description: Name of the component (e.g. k8s-dogu-operator)
@@ -44,7 +78,9 @@ spec:
4478
description: Namespace of the component (e.g. k8s)
4579
type: string
4680
valuesYamlOverwrite:
47-
description: ValuesYamlOverwrite is a multiline-yaml string that is applied alongside the original values.yaml-file of the component. It can be used to overwrite specific configurations. Lists are overwritten, maps are merged.
81+
description: |-
82+
ValuesYamlOverwrite is a multiline-yaml string that is applied alongside the original values.yaml-file of the component.
83+
It can be used to overwrite specific configurations. Lists are overwritten, maps are merged.
4884
type: string
4985
version:
5086
description: Desired version of the component (e.g. 2.4.48-3)
@@ -54,7 +90,10 @@ spec:
5490
description: ComponentStatus defines the observed state of a Component.
5591
properties:
5692
health:
57-
description: Health describes the health status of the component. A component becomes 'available' if its Status is 'installed', and all its deployments, stateful sets, and daemon sets are available.
93+
description: |-
94+
Health describes the health status of the component.
95+
A component becomes 'available' if its Status is 'installed',
96+
and all its deployments, stateful sets, and daemon sets are available.
5897
type: string
5998
installedVersion:
6099
description: Installed version of the component (e.g. 2.4.48-3)

‎k8s/helm/component-patch-tpl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
values:
33
images:
4-
componentOperator: cloudogu/k8s-component-operator:1.7.0
4+
componentOperator: cloudogu/k8s-component-operator:1.8.0
55
patches:
66
values.yaml:
77
additionalImages:

‎k8s/helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager:
55
image:
66
registry: docker.io
77
repository: cloudogu/k8s-component-operator
8-
tag: 1.7.0
8+
tag: 1.8.0
99
imagePullPolicy: IfNotPresent
1010
env:
1111
logLevel: info

‎pkg/api/v1/ces_component_types.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ type ComponentStatus struct {
8686
// +kubebuilder:object:root=true
8787
// +kubebuilder:subresource:status
8888
// +kubebuilder:metadata:labels=app=ces;app.kubernetes.io/name=k8s-component-operator;k8s.cloudogu.com/component.name=k8s-component-operator-crd
89+
// +kubebuilder:resource:shortName="comp"
90+
// +kubebuilder:printcolumn:name="Spec-Version",type="string",JSONPath=".spec.version",description="The desired version of the component"
91+
// +kubebuilder:printcolumn:name="Installed Version",type="string",JSONPath=".status.installedVersion",description="The current version of the component"
92+
// +kubebuilder:printcolumn:name="Health",type="string",JSONPath=".status.health",description="The current health state of the component"
93+
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.status",description="The current status of the component"
94+
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of the component"
8995

9096
// Component is the Schema for the ces component API
9197
type Component struct {

0 commit comments

Comments
 (0)