Merge branch 'main' into k8s-terraform

.github/workflows/integration_test.yaml

@@ -39,8 +39,8 @@ jobs:
     strategy:
       matrix:
         arch:
-        - {id: amd64, builder-label: ubuntu-22.04, tester-arch: x64}
-        - {id: arm64, builder-label: ARM64,        tester-arch: ARM64}
+        - {id: amd64, builder-label: ubuntu-22.04, tester-arch: AMD64}  # built on azure
+        - {id: arm64, builder-label: ARM64,        tester-arch: ARM64}  # built on self-hosted
         suite: [k8s, etcd, ceph]
         exclude:
         - {arch: {id: arm64}, suite: ceph}
@@ -56,6 +56,7 @@ jobs:
       provider: lxd
       self-hosted-runner: true
       self-hosted-runner-arch: ${{ matrix.arch.tester-arch }}
+      self-hosted-runner-label: large
       test-timeout: 120
       test-tox-env: integration-${{ matrix.suite }}
       trivy-fs-enabled: false

charms/worker/k8s/charmcraft.yaml

@@ -68,11 +68,11 @@ bases:
       architectures: [arm64]
 config:
   options:
-    annotations:
+    cluster-annotations:
       type: string
       default: ""
       description: |
-        Annotations is a space separated list of (key/value) pairs)  that can be
+        Space-separated list of (key/value) pairs) that can be
         used to add arbitrary metadata configuration to the Canonical
         Kubernetes cluster. For more information, see the upstream Canonical
         Kubernetes documentation about annotations:
@@ -224,6 +224,17 @@ config:
           runtime-config=batch/v2alpha1=true profiling=true
         will result in kube-apiserver being run with the following options:
           --runtime-config=batch/v2alpha1=true --profiling=true
+    kube-apiserver-extra-sans:
+      type: string
+      default: ""
+      description: |
+        Space separated list of extra Subject Alternative Names for the kube-apiserver
+        self-signed certificates.
+
+        Examples:
+          - "kubernetes"
+          - "kubernetes.default.svc"
+          - "kubernetes.default.svc.cluster.local"
     kube-controller-manager-extra-args:
       type: string
       default: ""

charms/worker/k8s/requirements.txt

@@ -7,7 +7,7 @@ ops.interface_aws @ git+https://github.com/charmed-kubernetes/interface-aws-inte
 ops.interface_gcp @ git+https://github.com/charmed-kubernetes/interface-gcp-integration@main#subdirectory=ops
 ops.interface_azure @ git+https://github.com/charmed-kubernetes/interface-azure-integration@main#subdirectory=ops
 cosl==0.0.43
-ops==2.17.0
+ops==2.17.1
 pydantic==1.10.19
 PyYAML==6.0.2
 tomli ==2.1.0
@@ -16,3 +16,4 @@ typing_extensions==4.12.2
 websocket-client==1.8.0
 poetry-core==1.9.1
 lightkube==0.15.5
+httpx==0.27.2