Skip to content

Commit

Permalink
operator: Upgrade k8s.io, sigs.k8s.io and openshift deps (#11718)
Browse files Browse the repository at this point in the history
  • Loading branch information
@periklis
periklis committed Jan 22, 2024
1 parent 0ed536c commit 71d3ab8
Show file tree
Hide file tree
Showing 36 changed files with 1,124 additions and 401 deletions.
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
View file
@@ -1,5 +1,6 @@
## Main

- [11718](https://github.com/grafana/loki/pull/11718) **periklis**: Upgrade k8s.io, sigs.k8s.io and openshift deps
- [11671](https://github.com/grafana/loki/pull/11671) **JoaoBraveCoding**: Update mixins to fix structured metadata dashboards
- [11624](https://github.com/grafana/loki/pull/11624) **xperimental**: React to changes in ConfigMap used for storage CA
- [11481](https://github.com/grafana/loki/pull/11481) **JoaoBraveCoding**: Adds AWS STS support
Expand Down
2 changes: 1 addition & 1 deletion operator/apis/loki/go.mod
View file
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.8.2
k8s.io/api v0.26.9
k8s.io/apimachinery v0.26.9
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/controller-runtime v0.14.5
)

Expand Down
4 changes: 2 additions & 2 deletions operator/apis/loki/go.sum
View file
Expand Up @@ -82,8 +82,8 @@ k8s.io/apimachinery v0.26.9 h1:5yAV9cFR7Z4gIorKcAjWnx4uxtxiFsERwq4Pvmx0CCg=
k8s.io/apimachinery v0.26.9/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 h1:xMMXJlJbsU8w3V5N2FLDQ8YgU8s1EoULdbQBcAeNJkY=
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
Expand Down
218 changes: 109 additions & 109 deletions operator/apis/loki/v1beta1/rulerconfig_types_test.go
View file
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/grafana/loki/operator/apis/loki/v1beta1"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)

func TestConvertToV1_RulerConfig(t *testing.T) {
Expand Down Expand Up @@ -79,19 +79,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path"),
ServerName: pointer.String("server"),
CertPath: pointer.String("/tls/cert/path"),
KeyPath: pointer.String("/tls/key/path"),
CAPath: ptr.To("/tls/ca/path"),
ServerName: ptr.To("server"),
CertPath: ptr.To("/tls/cert/path"),
KeyPath: ptr.To("/tls/key/path"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type"),
Credentials: pointer.String("creds"),
CredentialsFile: pointer.String("creds-file"),
Type: ptr.To("type"),
Credentials: ptr.To("creds"),
CredentialsFile: ptr.To("creds-file"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user"),
Password: pointer.String("pass"),
Username: ptr.To("user"),
Password: ptr.To("pass"),
},
},
},
Expand Down Expand Up @@ -175,19 +175,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -234,19 +234,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -322,19 +322,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path"),
ServerName: pointer.String("server"),
CertPath: pointer.String("/tls/cert/path"),
KeyPath: pointer.String("/tls/key/path"),
CAPath: ptr.To("/tls/ca/path"),
ServerName: ptr.To("server"),
CertPath: ptr.To("/tls/cert/path"),
KeyPath: ptr.To("/tls/key/path"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type"),
Credentials: pointer.String("creds"),
CredentialsFile: pointer.String("creds-file"),
Type: ptr.To("type"),
Credentials: ptr.To("creds"),
CredentialsFile: ptr.To("creds-file"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user"),
Password: pointer.String("pass"),
Username: ptr.To("user"),
Password: ptr.To("pass"),
},
},
},
Expand Down Expand Up @@ -418,19 +418,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -477,19 +477,19 @@ func TestConvertToV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -593,19 +593,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path"),
ServerName: pointer.String("server"),
CertPath: pointer.String("/tls/cert/path"),
KeyPath: pointer.String("/tls/key/path"),
CAPath: ptr.To("/tls/ca/path"),
ServerName: ptr.To("server"),
CertPath: ptr.To("/tls/cert/path"),
KeyPath: ptr.To("/tls/key/path"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type"),
Credentials: pointer.String("creds"),
CredentialsFile: pointer.String("creds-file"),
Type: ptr.To("type"),
Credentials: ptr.To("creds"),
CredentialsFile: ptr.To("creds-file"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user"),
Password: pointer.String("pass"),
Username: ptr.To("user"),
Password: ptr.To("pass"),
},
},
},
Expand Down Expand Up @@ -689,19 +689,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -748,19 +748,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1.AlertManagerClientConfig{
TLS: &v1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -836,19 +836,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path"),
ServerName: pointer.String("server"),
CertPath: pointer.String("/tls/cert/path"),
KeyPath: pointer.String("/tls/key/path"),
CAPath: ptr.To("/tls/ca/path"),
ServerName: ptr.To("server"),
CertPath: ptr.To("/tls/cert/path"),
KeyPath: ptr.To("/tls/key/path"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type"),
Credentials: pointer.String("creds"),
CredentialsFile: pointer.String("creds-file"),
Type: ptr.To("type"),
Credentials: ptr.To("creds"),
CredentialsFile: ptr.To("creds-file"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user"),
Password: pointer.String("pass"),
Username: ptr.To("user"),
Password: ptr.To("pass"),
},
},
},
Expand Down Expand Up @@ -932,19 +932,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down Expand Up @@ -991,19 +991,19 @@ func TestConvertFromV1_RulerConfig(t *testing.T) {
},
Client: &v1beta1.AlertManagerClientConfig{
TLS: &v1beta1.AlertManagerClientTLSConfig{
CAPath: pointer.String("/tls/ca/path-1"),
ServerName: pointer.String("server-1"),
CertPath: pointer.String("/tls/cert/path-1"),
KeyPath: pointer.String("/tls/key/path-1"),
CAPath: ptr.To("/tls/ca/path-1"),
ServerName: ptr.To("server-1"),
CertPath: ptr.To("/tls/cert/path-1"),
KeyPath: ptr.To("/tls/key/path-1"),
},
HeaderAuth: &v1beta1.AlertManagerClientHeaderAuth{
Type: pointer.String("type-1"),
Credentials: pointer.String("creds-1"),
CredentialsFile: pointer.String("creds-file-1"),
Type: ptr.To("type-1"),
Credentials: ptr.To("creds-1"),
CredentialsFile: ptr.To("creds-file-1"),
},
BasicAuth: &v1beta1.AlertManagerClientBasicAuth{
Username: pointer.String("user-1"),
Password: pointer.String("pass-1"),
Username: ptr.To("user-1"),
Password: ptr.To("pass-1"),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.5.0
createdAt: "2024-01-10T18:25:00Z"
createdAt: "2024-01-19T14:20:59Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down

0 comments on commit 71d3ab8

Please sign in to comment.