From 4808b0373584486d46c7f130c542c1b4b64c89b2 Mon Sep 17 00:00:00 2001 From: Gerd Oberlechner Date: Wed, 9 Oct 2024 19:08:52 +0200 Subject: [PATCH] fixes Signed-off-by: Gerd Oberlechner --- .../{exgernal-dns => external-dns}/Chart.yaml | 0 .../templates/clusterrole-external-dns.yaml | 48 +++--- .../clusterrolebinding-external-dns.yaml | 24 +-- .../templates/deployment-external-dns.yaml | 138 +++++++++--------- .../templates/podmonitor-external-dns.yaml | 34 ++--- .../templates/secret-external-dns-azure.yaml | 0 .../serviceaccount-external-dns.yaml | 16 +- .../values.yaml | 0 hypershiftoperator/deploy/helm/values.yaml | 2 +- 9 files changed, 131 insertions(+), 131 deletions(-) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/Chart.yaml (100%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/clusterrole-external-dns.yaml (93%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/clusterrolebinding-external-dns.yaml (96%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/deployment-external-dns.yaml (96%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/podmonitor-external-dns.yaml (95%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/secret-external-dns-azure.yaml (100%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/templates/serviceaccount-external-dns.yaml (96%) rename hypershiftoperator/deploy/helm/charts/{exgernal-dns => external-dns}/values.yaml (100%) diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/Chart.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/Chart.yaml similarity index 100% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/Chart.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/Chart.yaml diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrole-external-dns.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrole-external-dns.yaml similarity index 93% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrole-external-dns.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrole-external-dns.yaml index 89747fe0b..f4d30e382 100644 --- a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrole-external-dns.yaml +++ b/hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrole-external-dns.yaml @@ -1,25 +1,25 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: external-dns -rules: -- apiGroups: - - route.openshift.io - resources: - - '*' - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - endpoints - - services - - nodes - - pods - verbs: - - get - - list +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: external-dns +rules: +- apiGroups: + - route.openshift.io + resources: + - '*' + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - endpoints + - services + - nodes + - pods + verbs: + - get + - list - watch diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrolebinding-external-dns.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrolebinding-external-dns.yaml similarity index 96% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrolebinding-external-dns.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrolebinding-external-dns.yaml index 9b736ccb3..f2cee3164 100644 --- a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/clusterrolebinding-external-dns.yaml +++ b/hypershiftoperator/deploy/helm/charts/external-dns/templates/clusterrolebinding-external-dns.yaml @@ -1,13 +1,13 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - creationTimestamp: null - name: external-dns -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: external-dns -subjects: -- kind: ServiceAccount - name: external-dns +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + creationTimestamp: null + name: external-dns +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: external-dns +subjects: +- kind: ServiceAccount + name: external-dns namespace: hypershift diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/deployment-external-dns.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/deployment-external-dns.yaml similarity index 96% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/deployment-external-dns.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/deployment-external-dns.yaml index 4dfa3cfe1..3a4249ff7 100644 --- a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/deployment-external-dns.yaml +++ b/hypershiftoperator/deploy/helm/charts/external-dns/templates/deployment-external-dns.yaml @@ -1,69 +1,69 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - creationTimestamp: null - name: external-dns - namespace: '{{ .Release.Namespace }}' -spec: - replicas: 1 - selector: - matchLabels: - name: external-dns - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - app: external-dns - hypershift.openshift.io/operator-component: external-dns - name: external-dns - azure.workload.identity/use: true - spec: - containers: - - args: - - --source=service - - --source=openshift-route - - --domain-filter={{ .Values.domain }} - - --provider=azure - - --registry=txt - - --txt-suffix=-external-dns - - --txt-owner-id={{ .Values.txtOwnerId }} - - --label-filter=hypershift.openshift.io/route-visibility!=private - - --interval=1m - - --txt-cache-interval=1h - - --azure-config-file=/etc/provider/credentials - command: - - /ko-app/external-dns - image: {{ .Values.image }} - imagePullPolicy: IfNotPresent - livenessProbe: - failureThreshold: 5 - httpGet: - path: /healthz - port: 7979 - scheme: HTTP - initialDelaySeconds: 60 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 5 - name: external-dns - ports: - - containerPort: 7979 - name: metrics - resources: - requests: - cpu: 5m - memory: 20Mi - securityContext: - privileged: false - readOnlyRootFilesystem: true - volumeMounts: - - mountPath: /etc/provider - name: credentials - priorityClassName: hypershift-operator - serviceAccountName: external-dns - volumes: - - name: credentials - secret: - secretName: external-dns-azure -status: {} +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + name: external-dns + namespace: '{{ .Release.Namespace }}' +spec: + replicas: 1 + selector: + matchLabels: + name: external-dns + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: external-dns + hypershift.openshift.io/operator-component: external-dns + name: external-dns + azure.workload.identity/use: true + spec: + containers: + - args: + - --source=service + - --source=openshift-route + - --domain-filter={{ .Values.domain }} + - --provider=azure + - --registry=txt + - --txt-suffix=-external-dns + - --txt-owner-id={{ .Values.txtOwnerId }} + - --label-filter=hypershift.openshift.io/route-visibility!=private + - --interval=1m + - --txt-cache-interval=1h + - --azure-config-file=/etc/provider/credentials + command: + - /ko-app/external-dns + image: {{ .Values.image }} + imagePullPolicy: IfNotPresent + livenessProbe: + failureThreshold: 5 + httpGet: + path: /healthz + port: 7979 + scheme: HTTP + initialDelaySeconds: 60 + periodSeconds: 60 + successThreshold: 1 + timeoutSeconds: 5 + name: external-dns + ports: + - containerPort: 7979 + name: metrics + resources: + requests: + cpu: 5m + memory: 20Mi + securityContext: + privileged: false + readOnlyRootFilesystem: true + volumeMounts: + - mountPath: /etc/provider + name: credentials + priorityClassName: hypershift-operator + serviceAccountName: external-dns + volumes: + - name: credentials + secret: + secretName: external-dns-azure +status: {} diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/podmonitor-external-dns.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/podmonitor-external-dns.yaml similarity index 95% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/podmonitor-external-dns.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/podmonitor-external-dns.yaml index f7cb1f3c2..a781b2c24 100644 --- a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/podmonitor-external-dns.yaml +++ b/hypershiftoperator/deploy/helm/charts/external-dns/templates/podmonitor-external-dns.yaml @@ -1,17 +1,17 @@ -apiVersion: azmonitoring.coreos.com/v1 -kind: PodMonitor -metadata: - creationTimestamp: null - name: external-dns - namespace: '{{ .Release.Namespace }}' -spec: - jobLabel: component - namespaceSelector: {} - podMetricsEndpoints: - - bearerTokenSecret: - key: "" - interval: 30s - port: metrics - selector: - matchLabels: - name: external-dns +apiVersion: azmonitoring.coreos.com/v1 +kind: PodMonitor +metadata: + creationTimestamp: null + name: external-dns + namespace: '{{ .Release.Namespace }}' +spec: + jobLabel: component + namespaceSelector: {} + podMetricsEndpoints: + - bearerTokenSecret: + key: "" + interval: 30s + port: metrics + selector: + matchLabels: + name: external-dns diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/secret-external-dns-azure.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/secret-external-dns-azure.yaml similarity index 100% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/secret-external-dns-azure.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/secret-external-dns-azure.yaml diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/serviceaccount-external-dns.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/templates/serviceaccount-external-dns.yaml similarity index 96% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/serviceaccount-external-dns.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/templates/serviceaccount-external-dns.yaml index 1f3bff7fa..59583ff6d 100644 --- a/hypershiftoperator/deploy/helm/charts/exgernal-dns/templates/serviceaccount-external-dns.yaml +++ b/hypershiftoperator/deploy/helm/charts/external-dns/templates/serviceaccount-external-dns.yaml @@ -1,8 +1,8 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - creationTimestamp: null - name: external-dns - namespace: '{{ .Release.Namespace }}' - annotations: - azure.workload.identity~1client-id: '{{ .Values.credentials.userAssignedIdentityID }}' +apiVersion: v1 +kind: ServiceAccount +metadata: + creationTimestamp: null + name: external-dns + namespace: '{{ .Release.Namespace }}' + annotations: + azure.workload.identity~1client-id: '{{ .Values.credentials.userAssignedIdentityID }}' diff --git a/hypershiftoperator/deploy/helm/charts/exgernal-dns/values.yaml b/hypershiftoperator/deploy/helm/charts/external-dns/values.yaml similarity index 100% rename from hypershiftoperator/deploy/helm/charts/exgernal-dns/values.yaml rename to hypershiftoperator/deploy/helm/charts/external-dns/values.yaml diff --git a/hypershiftoperator/deploy/helm/values.yaml b/hypershiftoperator/deploy/helm/values.yaml index dbd875a7d..fd018d4fc 100644 --- a/hypershiftoperator/deploy/helm/values.yaml +++ b/hypershiftoperator/deploy/helm/values.yaml @@ -7,7 +7,7 @@ hypershift-operator: image: "" registryOverrides: "" -exgernal-dns: +external-dns: image: "" txtOwnerId: "" domain: ""